gEDA-cvs: pcb.git: branch: master updated (ee6ee887ba99da8d4a6c1e5929086fc75ac63423)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  ee6ee887ba99da8d4a6c1e5929086fc75ac63423 (commit)
       via  0f771229dea662aedb0793f436554cf4f0cb245b (commit)
      from  6878692f1e13a09a7191c8f9cf09e05c403fbe33 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/gts/boolean.c |    2 ++
 src/gts/split.c   |    9 +++++++++
 src/gts/surface.c |    6 ++++++
 src/report.c      |    2 +-
 4 files changed, 18 insertions(+), 1 deletions(-)


=================
 Commit Messages
=================

commit 0f771229dea662aedb0793f436554cf4f0cb245b
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>

    Remove some unused variables
    
    Remove some unused variables.  On some others which are only conditionally used, then
    only conditionally declare them.  Same for some functions.  This clears out some of the
    compiler warning clutter.

:100644 100644 faa051e... 8b76d42... M	src/gts/boolean.c
:100644 100644 c63516c... 8283e17... M	src/gts/split.c
:100644 100644 f5adfaa... 34c5cbe... M	src/gts/surface.c
:100644 100644 98b4f23... 974c0be... M	src/report.c

=========
 Changes
=========

commit 0f771229dea662aedb0793f436554cf4f0cb245b
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>

    Remove some unused variables
    
    Remove some unused variables.  On some others which are only conditionally used, then
    only conditionally declare them.  Same for some functions.  This clears out some of the
    compiler warning clutter.

diff --git a/src/gts/boolean.c b/src/gts/boolean.c
index faa051e..8b76d42 100644
--- a/src/gts/boolean.c
+++ b/src/gts/boolean.c
@@ -1396,6 +1396,7 @@ static void triangulate_loop (GtsSegment * start,
   NEXT (s) = NULL;
 }
 
+#ifdef CHECK_ORIENTED
 static void check_object (GtsObject * o)
 {
   g_assert (o->reserved == NULL);
@@ -1432,6 +1433,7 @@ static void check_boundary_interior_triangulation (GSList * boundary,
   g_slist_foreach (boundary, (GFunc) check_boundary, surface);
   g_slist_foreach (interior, (GFunc) check_interior, surface);
 }
+#endif /*ifdef CHECK_ORIENTED */
 
 static void merge_duplicate (GtsEdge * e)
 {
diff --git a/src/gts/split.c b/src/gts/split.c
index c63516c..8283e17 100644
--- a/src/gts/split.c
+++ b/src/gts/split.c
@@ -531,6 +531,8 @@ static gboolean edge_collapse_is_valid (GtsEdge * e)
 }
 #endif /* DEBUG */
 
+/* Not currently used.  May be useful for some debug code */
+#ifdef DEBUG
 static void print_split (GtsSplit * vs, FILE * fptr)
 {
   guint j;
@@ -549,6 +551,7 @@ static void print_split (GtsSplit * vs, FILE * fptr)
     cf++;
   }
 }
+#endif
 
 /**
  * gts_split_collapse:
@@ -864,6 +867,7 @@ void gts_split_expand (GtsSplit * vs,
   }
 }
 
+#ifndef DYNAMIC_SPLIT
 static void cface_neighbors (GtsSplitCFace * cf,
 			     GtsEdge * e,
 			     GtsVertex * v1,
@@ -899,6 +903,7 @@ static void cface_neighbors (GtsSplitCFace * cf,
   }
   *a = NULL;
 }
+#endif /*ifndef DYNAMIC_SPLIT */
 
 /**
  * gts_split_new:
@@ -919,9 +924,11 @@ GtsSplit * gts_split_new (GtsSplitClass * klass,
 {
   GtsSplit * vs;
   GtsVertex * v1, * v2;
+#ifndef DYNAMIC_SPLIT
   GtsEdge * e;
   GSList * i;
   GtsSplitCFace * cf;
+#endif
 
   g_return_val_if_fail (klass != NULL, NULL);
   g_return_val_if_fail (v != NULL, NULL);
@@ -1102,6 +1109,7 @@ guint gts_split_height (GtsSplit * root)
   return height + 1;
 }
 
+#ifndef DYNAMIC_SPLIT
 static gboolean list_array_are_identical (GSList * list, 
 					  gpointer * array,
 					  gpointer excluded)
@@ -1122,6 +1130,7 @@ static gboolean list_array_are_identical (GSList * list,
   }
   return TRUE;
 }
+#endif /* ifndef DYNAMIC_SPLIT */
 
 #ifndef NEW
 gboolean gts_split_is_collapsable (GtsSplit * vs)
diff --git a/src/gts/surface.c b/src/gts/surface.c
index f5adfaa..34c5cbe 100644
--- a/src/gts/surface.c
+++ b/src/gts/surface.c
@@ -1557,6 +1557,11 @@ static GtsVertex * edge_collapse (GtsEdge * e,
   return mid;
 }
 
+/*
+ * I don't see where this code is ever used, but keep it for a bit 
+ * in case it is needed for debugging
+ */
+#ifdef GTS_NEED_UPDATE_CLOSEST_NEIGHBORS
 static void update_closest_neighbors (GtsVertex * v, GtsEHeap * heap)
 {
   GSList * i = v->segments;
@@ -1570,6 +1575,7 @@ static void update_closest_neighbors (GtsVertex * v, GtsEHeap * heap)
     i = i->next;
   }
 }
+#endif
 
 static void update_2nd_closest_neighbors (GtsVertex * v, GtsEHeap * heap)
 {
diff --git a/src/report.c b/src/report.c
index 98b4f23..974c0be 100644
--- a/src/report.c
+++ b/src/report.c
@@ -585,7 +585,7 @@ static int
 ReportAllNetLengths (int argc, char **argv, int x, int y)
 {
   enum { Upcb, Umm, Umil, Uin } units;
-  int ni, nei;
+  int ni;
   int found;
   double length;
 




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs