remove unused 'nodeset' abstraction

diff --git a/lib/circogen/CMakeLists.txt b/lib/circogen/CMakeLists.txt
index 7aa09faaf794ec86880748d853fd7831be622c1e..1ba68fb755d1e453e4e103af23f8f3938dd1b2db 100644 (file)
--- a/lib/circogen/CMakeLists.txt
+++ b/lib/circogen/CMakeLists.txt
@@ -11,7 +11,6 @@ add_library(circogen STATIC
     deglist.h
     edgelist.h
     nodelist.h
-    nodeset.h
 
     # Source files
     block.c
@@ -23,7 +22,6 @@ add_library(circogen STATIC
     deglist.c
     edgelist.c
     nodelist.c
-    nodeset.c
 )
 
 target_include_directories(circogen PRIVATE

diff --git a/lib/circogen/Makefile.am b/lib/circogen/Makefile.am
index 364bb130709851a13d71ca8fd274cd1f7ed85580..f8e77601d870552264db4e42733f5c165826861b 100644 (file)
--- a/lib/circogen/Makefile.am
+++ b/lib/circogen/Makefile.am
@@ -16,12 +16,11 @@ AM_CFLAGS = -DNEATOGEN_EXPORTS=1
 endif
 
 noinst_HEADERS = block.h blockpath.h blocktree.h circo.h \
-       circpos.h circular.h deglist.h edgelist.h nodelist.h \
-       nodeset.h 
+       circpos.h circular.h deglist.h edgelist.h nodelist.h
 noinst_LTLIBRARIES = libcircogen_C.la
 
 libcircogen_C_la_SOURCES = circularinit.c nodelist.c block.c edgelist.c \
        circular.c deglist.c blocktree.c blockpath.c \
-       circpos.c nodeset.c
+       circpos.c
 
 EXTRA_DIST = gvcircogen.vcxproj*

diff --git a/lib/circogen/blockpath.c b/lib/circogen/blockpath.c
index 33fc7080dad94dcdacfc9d8643b1df1bd63d710d..8e26a20502f525c98490db03cfebea85f623994d 100644 (file)
--- a/lib/circogen/blockpath.c
+++ b/lib/circogen/blockpath.c
@@ -11,7 +11,6 @@
 
 #include       <circogen/blockpath.h>
 #include       <circogen/edgelist.h>
-#include       <circogen/nodeset.h>
 #include       <circogen/deglist.h>
 #include       <stddef.h>
 

diff --git a/lib/circogen/gvcircogen.vcxproj b/lib/circogen/gvcircogen.vcxproj
index fc42f2d0f3336dcda3613d7a0cda9ac38f35c531..f9a716984a517dc28690307e346fbeed41ccc1de 100644 (file)
--- a/lib/circogen/gvcircogen.vcxproj
+++ b/lib/circogen/gvcircogen.vcxproj
@@ -85,7 +85,6 @@
     <ClInclude Include="deglist.h" />
     <ClInclude Include="edgelist.h" />
     <ClInclude Include="nodelist.h" />
-    <ClInclude Include="nodeset.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="block.c" />
@@ -97,7 +96,6 @@
     <ClCompile Include="deglist.c" />
     <ClCompile Include="edgelist.c" />
     <ClCompile Include="nodelist.c" />
-    <ClCompile Include="nodeset.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/lib/circogen/gvcircogen.vcxproj.filters b/lib/circogen/gvcircogen.vcxproj.filters
index 360b88cca0cba56caff76f98150c9406197c1978..eec296e3e455251902ab99b3ba5c0492f9376a19 100644 (file)
--- a/lib/circogen/gvcircogen.vcxproj.filters
+++ b/lib/circogen/gvcircogen.vcxproj.filters
@@ -42,9 +42,6 @@
     <ClInclude Include="nodelist.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="nodeset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="block.c">
@@ -74,8 +71,5 @@
     <ClCompile Include="nodelist.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="nodeset.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/lib/circogen/nodeset.c b/lib/circogen/nodeset.c
deleted file mode 100644 (file)
index 616154c..0000000
--- a/lib/circogen/nodeset.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Details at https://graphviz.org
- *************************************************************************/
-
-
-#include <circogen/nodeset.h>
-
-
-static nsitem_t *mkItem(Dt_t * d, nsitem_t * obj, Dtdisc_t * disc)
-{
-    nsitem_t *ap = GNEW(nsitem_t);
-
-    ap->np = obj->np;
-    return ap;
-}
-
-static void freeItem(Dt_t * d, nsitem_t * obj, Dtdisc_t * disc)
-{
-    free(obj);
-}
-
-static int
-cmpItem(Dt_t * d, Agnode_t ** key1, Agnode_t ** key2, Dtdisc_t * disc)
-{
-    if (*key1 > *key2)
-       return 1;
-    else if (*key1 < *key2)
-       return -1;
-    else
-       return 0;
-}
-
-static Dtdisc_t nodeDisc = {
-    offsetof(nsitem_t, np),    /* key */
-    sizeof(Agnode_t *),                /* size */
-    offsetof(nsitem_t, link),  /* link */
-    (Dtmake_f) mkItem,
-    (Dtfree_f) freeItem,
-    (Dtcompar_f) cmpItem,
-    (Dthash_f) 0,
-    (Dtmemory_f) 0,
-    (Dtevent_f) 0
-};
-
-/* mkNodeset:
- * Creates an empty node set.
- */
-nodeset_t *mkNodeset()
-{
-    nodeset_t *s = dtopen(&nodeDisc, Dtoset);
-    return s;
-}
-
-/* freeNodeset:
- * Deletes a node set, deleting all items as well.
- * It does not delete the nodes.
- */
-void freeNodeset(nodeset_t * s)
-{
-    if (s != NULL)
-       dtclose(s);
-}
-
-/* clearNodeset:
- * Remove all items from a node set.
- */
-void clearNodeset(nodeset_t * s)
-{
-    dtclear(s);
-}
-
-/* insertNodeset:
- * Add a node into the nodeset.
- */
-void insertNodeset(nodeset_t * ns, Agnode_t * n)
-{
-    nsitem_t key;
-
-    key.np = n;
-    dtinsert(ns, &key);
-}
-
-void removeNodeset(nodeset_t * ns, Agnode_t * n)
-{
-    nsitem_t key;
-
-    key.np = n;
-    dtdelete(ns, &key);
-}
-
-/* sizeNodeset:
- * Report on the nodeset size.
- */
-int sizeNodeset(nodeset_t * ns)
-{
-    return dtsize(ns);
-}
-
-/* As the node set is a Dt_t, traversal is done using standard
- * functions from libcdt.
- */
-
-void printNodeset(nodeset_t * ns)
-{
-    nsitem_t *ip;
-    for (ip = dtfirst(ns); ip; ip = dtnext(ns, ip)) {
-       fprintf(stderr, "%s", agnameof(ip->np));
-    }
-    fputs("\n", stderr);
-}

diff --git a/lib/circogen/nodeset.h b/lib/circogen/nodeset.h
deleted file mode 100644 (file)
index 447d6ae..0000000
--- a/lib/circogen/nodeset.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Details at https://graphviz.org
- *************************************************************************/
-
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include  <render.h>
-
-    typedef struct {
-       Dtlink_t link;
-       Agnode_t *np;
-    } nsitem_t;
-
-    typedef Dt_t nodeset_t;
-
-    extern nodeset_t *mkNodeset(void);
-    extern void freeNodeset(nodeset_t *);
-    extern void clearNodeset(nodeset_t *);
-    extern void insertNodeset(nodeset_t * ns, Agnode_t * n);
-    extern void removeNodeset(nodeset_t *, Agnode_t * n);
-    extern int sizeNodeset(nodeset_t * ns);
-
-#ifdef DEBUG
-    extern void printNodeset(nodeset_t *);
-#endif
-
-#ifdef __cplusplus
-}
-#endif