From 964132eb5ca7699e8bcfd2ab7a5a8adb0add91f7 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Fri, 17 Dec 2021 21:08:59 -0800 Subject: [PATCH] remove unused 'nodeset' abstraction --- lib/circogen/CMakeLists.txt | 2 - lib/circogen/Makefile.am | 5 +- lib/circogen/blockpath.c | 1 - lib/circogen/gvcircogen.vcxproj | 2 - lib/circogen/gvcircogen.vcxproj.filters | 6 -- lib/circogen/nodeset.c | 116 ------------------------ lib/circogen/nodeset.h | 39 -------- 7 files changed, 2 insertions(+), 169 deletions(-) delete mode 100644 lib/circogen/nodeset.c delete mode 100644 lib/circogen/nodeset.h diff --git a/lib/circogen/CMakeLists.txt b/lib/circogen/CMakeLists.txt index 7aa09faaf..1ba68fb75 100644 --- 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 364bb1307..f8e77601d 100644 --- 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 33fc7080d..8e26a2050 100644 --- a/lib/circogen/blockpath.c +++ b/lib/circogen/blockpath.c @@ -11,7 +11,6 @@ #include #include -#include #include #include diff --git a/lib/circogen/gvcircogen.vcxproj b/lib/circogen/gvcircogen.vcxproj index fc42f2d0f..f9a716984 100644 --- a/lib/circogen/gvcircogen.vcxproj +++ b/lib/circogen/gvcircogen.vcxproj @@ -85,7 +85,6 @@ - @@ -97,7 +96,6 @@ - diff --git a/lib/circogen/gvcircogen.vcxproj.filters b/lib/circogen/gvcircogen.vcxproj.filters index 360b88cca..eec296e3e 100644 --- a/lib/circogen/gvcircogen.vcxproj.filters +++ b/lib/circogen/gvcircogen.vcxproj.filters @@ -42,9 +42,6 @@ Header Files - - Header Files - @@ -74,8 +71,5 @@ Source Files - - Source Files - \ No newline at end of file diff --git a/lib/circogen/nodeset.c b/lib/circogen/nodeset.c deleted file mode 100644 index 616154c51..000000000 --- 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 - - -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 index 447d6aea8..000000000 --- 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 - - 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 -- 2.50.1