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

[git@xxxxxxxxxx]

The branch, master has been updated
       via  474ae8d2851fb56fd1ee555f6f96dc38a0912c4c (commit)
      from  938097a4eb242552585b3a1c5554282b059dc04e (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/toporouter.c |   21 +++------------------
 1 files changed, 3 insertions(+), 18 deletions(-)


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

commit 474ae8d2851fb56fd1ee555f6f96dc38a0912c4c
Author: anthonix <anthonix@anthonix-desktop.(none)>
Commit: anthonix <anthonix@anthonix-desktop.(none)>

    Toporouter: Workaround for older GLib

:100644 100644 743375d... a2b385e... M	src/toporouter.c

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

commit 474ae8d2851fb56fd1ee555f6f96dc38a0912c4c
Author: anthonix <anthonix@anthonix-desktop.(none)>
Commit: anthonix <anthonix@anthonix-desktop.(none)>

    Toporouter: Workaround for older GLib

diff --git a/src/toporouter.c b/src/toporouter.c
index 743375d..a2b385e 100644
--- a/src/toporouter.c
+++ b/src/toporouter.c
@@ -1044,32 +1044,17 @@ struct _GHashNode
 {
   gpointer   key;
   gpointer   value;
-
-  /* If key_hash == 0, node is not in use
-   * If key_hash == 1, node is a tombstone
-   * If key_hash >= 2, node contains data */
-  guint      key_hash;
+  GHashNode *next;
 };
 
 struct _GHashTable
 {
   gint             size;
-  gint             mod;
-  guint            mask;
   gint             nnodes;
-  gint             noccupied;  /* nnodes + tombstones */
-  GHashNode       *nodes;
+  GHashNode      **nodes;
   GHashFunc        hash_func;
   GEqualFunc       key_equal_func;
   volatile gint    ref_count;
-#ifndef G_DISABLE_ASSERT
-  /*
-   * Tracks the structure of the hash table, not its contents: is only
-   * incremented when a node is added or removed (is not incremented
-   * when the key or data of a node is modified).
-   */
-  int              version;
-#endif
   GDestroyNotify   key_destroy_func;
   GDestroyNotify   value_destroy_func;
 };
@@ -1087,7 +1072,7 @@ g_hash_table_get_keys (GHashTable *hash_table)
     {
       GHashNode *node = &hash_table->nodes [i];
 
-      if (node->key_hash > 1)
+      if (node->key)
         retval = g_list_prepend (retval, node->key);
     }
 




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