gEDA-cvs: branch: master updated (1.1.2.20070818-223-g5852e53)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  5852e531717ba947b7acca39e50f71edd5921f06 (commit)
      from  7c82238f3b2433607f8af6c873af99a642f05409 (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
=========

 libgeda/src/o_attrib.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)


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

commit 5852e531717ba947b7acca39e50f71edd5921f06
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Date:   Sat Dec 29 09:49:46 2007 -0500

    Fix problem where changing slot= would not update pins
    
    Known to break spice-sdb's slotted component handling, however users
    are much more likely to encounter the former breakage.  Original patch
    removed the offending code, but this patch just #if's it out for now.

:100644 100644 f520b8d... 4d5a1d0... M	libgeda/src/o_attrib.c

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

commit 5852e531717ba947b7acca39e50f71edd5921f06
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Date:   Sat Dec 29 09:49:46 2007 -0500

    Fix problem where changing slot= would not update pins
    
    Known to break spice-sdb's slotted component handling, however users
    are much more likely to encounter the former breakage.  Original patch
    removed the offending code, but this patch just #if's it out for now.

diff --git a/libgeda/src/o_attrib.c b/libgeda/src/o_attrib.c
index f520b8d..4d5a1d0 100644
--- a/libgeda/src/o_attrib.c
+++ b/libgeda/src/o_attrib.c
@@ -1664,13 +1664,10 @@ void o_attrib_slot_update(TOPLEVEL *toplevel, OBJECT *object)
   OBJECT *o_slot_attrib;
   OBJECT *o_pin_object;
   OBJECT *o_pinnum_object;
-  OBJECT *o_pinseq_object;
   char *string;
   char *slotdef;
   int slot;
   int pin_counter;    /* Internal pin counter private to this fcn. */
-  char *new_pinseq;   /* New pinseq = (slot*(number of pins -1) + pin_count */
-  int numpins;        /* Total number of pins on this slot */
   char* current_pin;  /* text from slotdef= to be made into pinnumber= */
   char* cptr;         /* char pointer pointing to pinnumbers in slotdef=#:#,#,# string */
 
@@ -1750,6 +1747,13 @@ void o_attrib_slot_update(TOPLEVEL *toplevel, OBJECT *object)
       	g_free(string);
       }
 
+/* This block of code is commented out since it breaks slotting in general. */
+/* A better way should be found for spice-sdb's use. */
+#if 0 
+  /* these variables are used in this block and should be moved above */
+  char *new_pinseq;   /* New pinseq = (slot*(number of pins -1) + pin_count */
+  int numpins;        /* Total number of pins on this slot */
+  OBJECT *o_pinseq_object;
 
       /* Now update pinseq= attrib on this part. */
       /* Algorithm:
@@ -1795,6 +1799,7 @@ void o_attrib_slot_update(TOPLEVEL *toplevel, OBJECT *object)
       if (string) {
       	g_free(string);
       }
+#endif /* commented out since it breaks slotting */
       
       pin_counter++;
     } else {




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