gEDA-cvs: branch: master updated (1.1.2.20070818-47-gd0d00ac)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  d0d00ac3599befcfcf25ae498dc17f6cc241b7da (commit)
      from  8b6effd2eb18816e62b3a19a532d6c308ee3fdd2 (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/include/prototype.h |    1 -
 libgeda/src/o_attrib.c      |   65 -------------------------------------------
 2 files changed, 0 insertions(+), 66 deletions(-)


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

commit d0d00ac3599befcfcf25ae498dc17f6cc241b7da
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sat Sep 8 13:13:38 2007 +0100

    Remove auto-uref code which was #ifdef'd out. its no longer used.

:100644 100644 835290f... 9e1aefa... M	libgeda/include/prototype.h
:100644 100644 41acaa9... c24e3ba... M	libgeda/src/o_attrib.c

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

commit d0d00ac3599befcfcf25ae498dc17f6cc241b7da
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sat Sep 8 13:13:38 2007 +0100

    Remove auto-uref code which was #ifdef'd out. its no longer used.

diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index 835290f..9e1aefa 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -150,7 +150,6 @@ void o_arc_print_center(TOPLEVEL *toplevel, FILE *fp, int x, int y, int radius,
 void o_arc_print_phantom(TOPLEVEL *toplevel, FILE *fp, int x, int y, int radius, int angle1, int angle2, int color, int arc_width, int length, int space, int origin_x, int origin_y);
 
 /* o_attrib.c */
-void o_attrib_update_urefBM(TOPLEVEL *toplevel, OBJECT *o_current);
 ATTRIB *o_attrib_search(ATTRIB *list, OBJECT *item);
 ATTRIB *o_attrib_return_tail(ATTRIB *head);
 ATTRIB *add_attrib_head(OBJECT *parent);
diff --git a/libgeda/src/o_attrib.c b/libgeda/src/o_attrib.c
index 41acaa9..c24e3ba 100644
--- a/libgeda/src/o_attrib.c
+++ b/libgeda/src/o_attrib.c
@@ -61,67 +61,6 @@
  *  return pointer from attrib_list
  */
 
-/*! \brief Update an attribute's uref.
- *  \par Function Description
- *  Update an attribute's uref.
- *
- *  \param [in] toplevel  The TOPLEVEL object
- *  \param [in] o_current  The object to update.
- *
- *  \note
- *   Martin Benes' auto uref renumber code
- */
-void o_attrib_update_urefBM (TOPLEVEL *toplevel, OBJECT *o_current)
-{
-  OBJECT *list_head,*obj;
-  char *uref;
-  int i = -1, name_conflict,len;
-  char *index_list;
-  int index_list_len=1;
-
-  if (strncmp(o_current->text->string,"uref=",5))  /* deprecated */
-    return;
-
-  len=strlen(o_current->text->string);
-  uref=g_malloc(len+10);
-  strcpy(uref,o_current->text->string);
-
-  while (o_current->text->string[len-1]<='9' && 
-	 o_current->text->string[len-1]>='0')
-    --len;
-
-  list_head=return_head(o_current);
-  for (obj=list_head->next;obj;obj=obj->next) {
-    if (obj->type==OBJ_TEXT && obj->attribute)
-      ++index_list_len;
-  }
-
-  index_list=calloc(index_list_len,1); /* convert to g_new maybe... */
-  name_conflict=0;
-
-  for (obj=list_head->next;obj;obj=obj->next) {
-    if (obj->type==OBJ_TEXT && obj->attribute && obj!=o_current) {
-      if (strncmp(uref,obj->text->string,len)==0) {
-	if (strcmp(uref+len,obj->text->string+len)==0) {
-	  name_conflict=1;
-	}
-	i=atoi(obj->text->string+len);
-	if (i<index_list_len)
-	  index_list[i]=1;
-      }
-    }
-  }
-
-  if (name_conflict) {
-    for (i=0;index_list[i];++i);
-    sprintf(uref+len,"%d", i);
-    g_free(o_current->text->string);
-    o_current->text->string=uref;
-    o_text_recreate(toplevel, o_current);
-  }
-
-  g_free(index_list);
-}
 
 /*! \brief Search for an item in an attribute list.
  *  \par Function Description
@@ -378,10 +317,6 @@ void o_attrib_attach(TOPLEVEL *toplevel, OBJECT *parent_list,
           /* can't do this here since just selecting something */
           /* will cause this to be set */
           /* toplevel->page_current->CHANGED=1;*/
-
-#ifdef MARTIN_BENES
-          o_attrib_update_urefBM (toplevel, o_current);
-#endif
         }
       } else {
         fprintf(stderr, "You cannot attach non text items as attributes!\n");




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