gEDA-cvs: CVS update: f_image.nw

[cvspsrv@xxxxxxxx]

  User: danmc   
  Date: 05/02/20 22:04:44

  Modified:    .        f_image.nw g_rc.nw o_picture.nw o_text_basic.nw
  Log:
  fix some format string/type mismatches, format string/# of arg mismatches,
  
  /* within comments, unused variables, and undeclared variable bugs.
  
  
  
  
  Revision  Changes    Path
  1.8       +1 -1      eda/geda/devel/libgeda/noweb/f_image.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: f_image.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/libgeda/noweb/f_image.nw,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- f_image.nw	19 Feb 2005 23:27:32 -0000	1.7
  +++ f_image.nw	21 Feb 2005 03:04:43 -0000	1.8
  @@ -168,7 +168,7 @@
   	case(OBJ_PICTURE):
             /* FIXME: Implement this */
   	  fprintf(stderr, "f_image_write_objects: o_picture_image_write not implemented yet\n");
  -	  out = NULL;
  +	  /* out = NULL; */
   	  /* out = (char *) o_picture_image_write(w_current, o_current,
   	     origin_x, origin_y, color_mode); */
   	  break;
  
  
  
  1.12      +0 -2      eda/geda/devel/libgeda/noweb/g_rc.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: g_rc.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/libgeda/noweb/g_rc.nw,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- g_rc.nw	18 Feb 2005 22:26:48 -0000	1.11
  +++ g_rc.nw	21 Feb 2005 03:04:43 -0000	1.12
  @@ -792,8 +792,6 @@
   SCM
   g_rc_font_directory(SCM path)
   {
  -  int ret;
  -  struct stat buf;
     char *string;
   
     SCM_ASSERT (SCM_NIMP (path) && SCM_STRINGP (path), path,
  
  
  
  1.2       +6 -7      eda/geda/devel/libgeda/noweb/o_picture.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_picture.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/libgeda/noweb/o_picture.nw,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- o_picture.nw	19 Feb 2005 23:27:32 -0000	1.1
  +++ o_picture.nw	21 Feb 2005 03:04:43 -0000	1.2
  @@ -98,13 +98,12 @@
     int width, height, angle;
     gchar mirrored, embedded;
     int num_conv;
  -  double ratio;
     gchar type;
     gchar buffer[MAX_TEXT_LINE_LENGTH]; 
     gchar *filename;
     GdkPixbuf *pixbuf;
   
  -  num_conv = sscanf(buf, "%c %d %d %d %d %d %d %d\n",
  +  num_conv = sscanf(buf, "%c %d %d %d %d %d %c %c\n",
   	 &type, &x1, &y1, &width, &height, &angle, &mirrored, &embedded);
   
     if (num_conv != 8) {
  @@ -120,18 +119,18 @@
     }
   
     if ( (mirrored > 1) || (mirrored < 0)) {
  -    fprintf(stderr, "Found a picture with a wrong 'mirrored' parameter: %s.\n",
  +    fprintf(stderr, "Found a picture with a wrong 'mirrored' parameter: %c.\n",
   	    mirrored);
  -    s_log_message("Found a picture with a wrong 'mirrored' parameter: %s.\n",
  +    s_log_message("Found a picture with a wrong 'mirrored' parameter: %c.\n",
   	    mirrored);
       s_log_message("Setting mirrored to 0\n");
       mirrored = 0;
     }
   
     if ( (embedded > 1) || (embedded < 0)) {
  -    fprintf(stderr, "Found a picture with a wrong 'embedded' parameter: %s.\n",
  +    fprintf(stderr, "Found a picture with a wrong 'embedded' parameter: %c.\n",
   	    mirrored);
  -    s_log_message("Found a picture with a wrong 'embedded' parameter: %s.\n",
  +    s_log_message("Found a picture with a wrong 'embedded' parameter: %c.\n",
   	    mirrored);
       s_log_message("Setting mirrored to 0\n");
       mirrored = 0;
  @@ -361,7 +360,7 @@
   }
   
   /* Clean w_current variables */
  -/* FIXME: This should be done when canceling the action.
  +/* FIXME: This should be done when canceling the action. */
   /* Pixbuf filename is not freed because we want to remember the last directory */
   /*
   if (w_current->current_pixbuf != NULL) {
  
  
  
  1.21      +1 -1      eda/geda/devel/libgeda/noweb/o_text_basic.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: o_text_basic.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/libgeda/noweb/o_text_basic.nw,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- o_text_basic.nw	4 Feb 2005 22:37:06 -0000	1.20
  +++ o_text_basic.nw	21 Feb 2005 03:04:43 -0000	1.21
  @@ -578,7 +578,7 @@
     }
   
     if ( access(temp_string, R_OK) != 0 ) {
  -    s_log_message("Could not find character %c definition\n",needed_char, temp_string);
  +    s_log_message("Could not find character %c definition.  %s\n",needed_char, temp_string);
       free(temp_string);
       temp_string = g_strdup_printf("%s%cquest.sym", w_current->font_directory, G_DIR_SEPARATOR);
       if ( access(temp_string, R_OK) != 0 ) {