gEDA-cvs: CVS update: o_misc.nw

[cvspsrv@xxxxxxxx]

  User: werner  
  Date: 05/02/25 16:00:54

  Modified:    .        o_misc.nw
  Log:
  autonumber text fixed, wrong variable initialization
  
  
  
  
  Revision  Changes    Path
  1.33      +12 -10    eda/geda/devel/gschem/noweb/o_misc.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_misc.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gschem/noweb/o_misc.nw,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -b -r1.32 -r1.33
  --- o_misc.nw	22 Feb 2005 18:00:05 -0000	1.32
  +++ o_misc.nw	25 Feb 2005 21:00:53 -0000	1.33
  @@ -1074,7 +1074,6 @@
   int used_list[4096];
   void find_max(TOPLEVEL * w_current, OBJECT * o_list, char *stext)
   {
  -
     OBJECT *o_current = NULL;
     char *attrib = NULL;
     int count = 0;
  @@ -1082,10 +1081,8 @@
     char *current_filename = NULL;
     int page_control = 0;
     int pcount = 0;
  -
     int l, m;
   
  -
     if (o_list == NULL)
       return;
   
  @@ -1168,8 +1165,6 @@
   
     o_current = o_list;
     while (o_current != NULL) {
  -
  -
       if (o_current->type == OBJ_COMPLEX) {
   
         parent = w_current->page_current;
  @@ -1218,6 +1213,9 @@
                 used_count++;
               }
   
  +	    /* printf("autonumber_text: used_count %d, current_max %d\n",
  +	       used_count,current_max);*/
  +
   	    ss = g_strdup_printf("%s%d", stext, current_max++);
   	    /*            printf("%s\n", ss); */
   	    o_current->text->string =
  @@ -1229,8 +1227,6 @@
   	    o_text_draw(w_current, o_current);
   	    w_current->page_current->CHANGED = 1;
   	  }
  -
  -
   	}
         }
       }
  @@ -1252,11 +1248,15 @@
   o_edit_autonumber_text(TOPLEVEL * w_current, OBJECT * o_list, char *stext)
   {
     int i, tmp,sorted=0;
  -  int current_max = 0; /* AVH 8/18/2002 changed to 0, so 1 would be used */
  -  int used_count = 0;
  +
  +  current_max = 0; /* these are global variables, (Werner) */
  +  used_count = 0;
   
     find_max(w_current, o_list, stext);
   
  +  /*  printf("o_edit_autonumber_text: used_count %d, current_max %d\n",
  +      used_count,current_max);*/
  +
     if ((used_count < 4094)&&(used_count > 0)) {
       while (!sorted) {
         sorted = 1;
  @@ -1280,7 +1280,9 @@
     used_list[used_count] = 1000000;
     used_count = 0;
   
  -  /*    printf("max: %d\n", current_max); */
  +  /*  printf("o_edit_autonumber_text: used_count %d, current_max %d\n",
  +      used_count,current_max);*/
  +
     autonumber_text(w_current, o_list, stext);
     o_redraw_all(w_current);