cosmetics, untabified.

2004-11-23  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpparasitelist.c: cosmetics, untabified.

	* libgimpbase/gimpparasiteio.[ch]: added g_return_if_fail()'s
	to all functions.

	(gimp_pixpipe_params_parse): changed "gchar*" param to "const
	gchar*" (sortof API change, but these files are most probably only
	used by GIMP itself). Still uses strtok() on the internal copy,
	but at least not on the passed string.

	* plug-ins/common/csource.c
	* plug-ins/common/gif.c
	* plug-ins/common/gih.c
	* plug-ins/common/jpeg.c
	* plug-ins/common/png.c
	* plug-ins/common/tiff.c: use parasite getters instead of
	accessing the scruct members directly. Always use g_strndup()
	instead of just g_strdup() to get strings stored in parasites
	because there is no guarantee that they are nul-terminated.

ChangeLog

@@ -1,3 +1,25 @@
+2004-11-23  Michael Natterer  <mitch@gimp.org>
+
+	* app/core/gimpparasitelist.c: cosmetics, untabified.
+
+	* libgimpbase/gimpparasiteio.[ch]: added g_return_if_fail()'s
+	to all functions. 
+
+	(gimp_pixpipe_params_parse): changed "gchar*" param to "const
+	gchar*" (sortof API change, but these files are most probably only
+	used by GIMP itself). Still uses strtok() on the internal copy,
+	but at least not on the passed string.
+
+	* plug-ins/common/csource.c
+	* plug-ins/common/gif.c
+	* plug-ins/common/gih.c
+	* plug-ins/common/jpeg.c
+	* plug-ins/common/png.c
+	* plug-ins/common/tiff.c: use parasite getters instead of
+	accessing the scruct members directly. Always use g_strndup()
+	instead of just g_strdup() to get strings stored in parasites
+	because there is no guarantee that they are nul-terminated.
+
 2004-11-23  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/imagemap/imap_file.c (do_file_save_as_dialog): do

app/core/gimpparasitelist.c

@@ -125,11 +125,8 @@ gimp_parasite_list_get_type (void)
 static void
 gimp_parasite_list_class_init (GimpParasiteListClass *klass)
 {
-  GObjectClass    *object_class;
-  GimpObjectClass *gimp_object_class;
-
-  object_class      = G_OBJECT_CLASS (klass);
-  gimp_object_class = GIMP_OBJECT_CLASS (klass);
+  GObjectClass    *object_class      = G_OBJECT_CLASS (klass);
+  GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
 
   parent_class = g_type_class_peek_parent (klass);
 
@@ -197,11 +194,8 @@ gimp_parasite_list_get_memsize_foreach (gpointer key,
                                         gpointer p,
                                         gpointer m)
 {
-  GimpParasite *parasite;
-  gint64       *memsize;
-
-  parasite = (GimpParasite *) p;
-  memsize  = (gint64 *) m;
+  GimpParasite *parasite = p;
+  gint64       *memsize  = m;
 
   *memsize += (sizeof (GimpParasite) +
                strlen (parasite->name) + 1 +
@@ -212,11 +206,9 @@ static gint64
 gimp_parasite_list_get_memsize (GimpObject *object,
                                 gint64     *gui_size)
 {
-  GimpParasiteList *list;
+  GimpParasiteList *list    = GIMP_PARASITE_LIST (object);
   gint64            memsize = 0;
 
-  list = GIMP_PARASITE_LIST (object);
-
   if (list->table)
     {
       memsize += gimp_g_hash_table_get_memsize (list->table);
@@ -440,7 +432,7 @@ gimp_parasite_list_find (GimpParasiteList *list,
 
   if (list->table)
     return (GimpParasite *) g_hash_table_lookup (list->table, name);
-  else
+
   return NULL;
 }
 
@@ -465,8 +457,7 @@ parasite_serialize (const gchar      *key,
                    gimp_parasite_name (parasite),
                    gimp_parasite_flags (parasite));
 
-  /*
-   * the current methodology is: never move the parasiterc from one
+  /* the current methodology is: never move the parasiterc from one
    * system to another. If you want to do this you should probably
    * write out parasites which contain any non-alphanumeric(+some)
    * characters as \xHH sequences altogether.

libgimpbase/gimpparasiteio.c

@@ -41,6 +41,8 @@ gimp_pixpipe_params_init (GimpPixPipeParams *params)
 {
   gint i;
 
+  g_return_if_fail (params != NULL);
+
   params->step       = 100;
   params->ncells     = 1;
   params->cellwidth  = 1;
@@ -61,13 +63,19 @@ gimp_pixpipe_params_init (GimpPixPipeParams *params)
 }
 
 void
-gimp_pixpipe_params_parse (gchar            *string,
+gimp_pixpipe_params_parse (const gchar       *string,
 			   GimpPixPipeParams *params)
 {
+  gchar *copy;
   gchar *p, *q, *r;
   gint   i;
 
-  q = string;
+  g_return_if_fail (string != NULL);
+  g_return_if_fail (params != NULL);
+
+  copy = g_strdup (string);
+
+  q = copy;
   while ((p = strtok (q, " \r\n")) != NULL)
     {
       q = NULL;
@@ -145,16 +153,21 @@ gimp_pixpipe_params_parse (gchar            *string,
       if (r)
 	*r = ':';
     }
+
+  g_free (copy);
 }
 
 gchar *
 gimp_pixpipe_params_build (GimpPixPipeParams *params)
 {
-  GString *s = g_string_new (NULL);
+  GString *s;
   gchar   *str;
-
   gint     i;
 
+  g_return_val_if_fail (params != NULL, NULL);
+
+  s = g_string_new (NULL);
+
   g_string_printf (s, "ncells:%d cellwidth:%d cellheight:%d "
                    "step:%d dim:%d cols:%d rows:%d placement:%s",
                    params->ncells, params->cellwidth, params->cellheight,

libgimpbase/gimpparasiteio.h

@@ -59,7 +59,7 @@ typedef struct
 void    gimp_pixpipe_params_init  (GimpPixPipeParams *params);
 
 /* Parse a string into a GimpPixPipeParams */
-void    gimp_pixpipe_params_parse (gchar             *parameters,
+void    gimp_pixpipe_params_parse (const gchar       *parameters,
 				   GimpPixPipeParams *params);
 
 /* Build a string representation of GimpPixPipeParams */

plug-ins/common/csource.c

@@ -158,7 +158,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (image_ID, "gimp-comment");
       if (parasite)
 	{
-	  config.comment = g_strdup (parasite->data);
+	  config.comment = g_strndup (gimp_parasite_data (parasite),
+                                      gimp_parasite_data_size (parasite));
 	  gimp_parasite_free (parasite);
 	}
       x = config.comment;

plug-ins/common/gif.c

@@ -1316,24 +1316,19 @@ save_dialog (gint32 image_ID)
 
   g_object_unref (text_buffer);
 
-  if (globalcomment != NULL)
-    {
+  if (globalcomment)
     g_free (globalcomment);
-    }
+
 #ifdef FACEHUGGERS
   GIF2_CMNT = gimp_image_parasite_find (image_ID, "gimp-comment");
   if (GIF2_CMNT)
-    {
-      globalcomment = g_malloc (GIF2_CMNT->size+1);
-      memcpy (globalcomment, GIF2_CMNT->data, GIF2_CMNT->size);
-      globalcomment[GIF2_CMNT->size] = 0;
-    }
+    globalcomment = g_strndup (gimp_parasite_data (GIF2_CMNT),
+                               gimp_parasite_data_size (GIF2_CMNT));
   else
-    {
 #endif
     globalcomment = gimp_get_default_comment ();
+
 #ifdef FACEHUGGERS
-    }
   gimp_parasite_free (GIF2_CMNT);
 #endif
 

plug-ins/common/gih.c

@@ -349,7 +349,8 @@ run (const gchar      *name,
 	    gimp_image_parasite_find (orig_image_ID,
 				      "gimp-brush-pipe-parameters");
 	  if (pipe_parasite)
-	    gimp_pixpipe_params_parse (pipe_parasite->data, &gihparams);
+	    gimp_pixpipe_params_parse (gimp_parasite_data (pipe_parasite),
+                                       &gihparams);
 
 	  if (!gih_save_dialog (image_ID))
 	    status = GIMP_PDB_CANCEL;
@@ -398,7 +399,8 @@ run (const gchar      *name,
 				      "gimp-brush-pipe-parameters");
 	  gimp_pixpipe_params_init (&gihparams);
 	  if (pipe_parasite)
-	    gimp_pixpipe_params_parse (pipe_parasite->data, &gihparams);
+	    gimp_pixpipe_params_parse (gimp_parasite_data (pipe_parasite),
+                                       &gihparams);
 	  break;
 	}
 

plug-ins/common/jpeg.c

@@ -546,7 +546,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment");
       if (parasite)
         {
-          image_comment = g_strdup (parasite->data);
+          image_comment = g_strndup (gimp_parasite_data (parasite),
+                                     gimp_parasite_data_size (parasite));
           gimp_parasite_free (parasite);
         }
 
@@ -555,7 +556,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (orig_image_ID, "exif-data");
       if (parasite)
         {
-          exif_data = exif_data_new_from_data (parasite->data, parasite->size);
+          exif_data = exif_data_new_from_data (gimp_parasite_data (parasite),
+                                               gimp_parasite_data_size (parasite));
           gimp_parasite_free (parasite);
         }
 

plug-ins/common/png.c

@@ -1299,7 +1299,7 @@ save_image (const gchar *filename,
       parasite = gimp_image_parasite_find (orig_image_ID, "gamma");
       if (parasite)
 	{
-          gamma = g_ascii_strtod (parasite->data, NULL);
+          gamma = g_ascii_strtod (gimp_parasite_data (parasite), NULL);
 	  gimp_parasite_free (parasite);
 	}
 

plug-ins/common/tiff.c

@@ -329,7 +329,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (orig_image, "gimp-comment");
       if (parasite)
         {
-          image_comment = g_strdup (parasite->data);
+          image_comment = g_strndup (gimp_parasite_data (parasite),
+                                     gimp_parasite_data_size (parasite));
           gimp_parasite_free (parasite);
         }
 
@@ -342,10 +343,10 @@ run (const gchar      *name,
           parasite = gimp_image_parasite_find (orig_image, "tiff-save-options");
           if (parasite)
             {
-              tsvals.compression =
-                ((TiffSaveVals *) parasite->data)->compression;
-              tsvals.save_transp_pixels =
-                ((TiffSaveVals *) parasite->data)->save_transp_pixels;
+              const TiffSaveVals *pvals = gimp_parasite_data (parasite);
+
+              tsvals.compression        = pvals->compression;
+              tsvals.save_transp_pixels = pvals->save_transp_pixels;
             }
           gimp_parasite_free (parasite);
 
@@ -386,10 +387,10 @@ run (const gchar      *name,
           parasite = gimp_image_parasite_find (orig_image, "tiff-save-options");
           if (parasite)
             {
-              tsvals.compression =
-                ((TiffSaveVals *) parasite->data)->compression;
-              tsvals.save_transp_pixels =
-                ((TiffSaveVals *) parasite->data)->save_transp_pixels;
+              const TiffSaveVals *pvals = gimp_parasite_data (parasite);
+
+              tsvals.compression        = pvals->compression;
+              tsvals.save_transp_pixels = pvals->save_transp_pixels;
             }
           gimp_parasite_free (parasite);
           break;

plug-ins/jpeg/jpeg-load.c

@@ -546,7 +546,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment");
       if (parasite)
         {
-          image_comment = g_strdup (parasite->data);
+          image_comment = g_strndup (gimp_parasite_data (parasite),
+                                     gimp_parasite_data_size (parasite));
           gimp_parasite_free (parasite);
         }
 
@@ -555,7 +556,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (orig_image_ID, "exif-data");
       if (parasite)
         {
-          exif_data = exif_data_new_from_data (parasite->data, parasite->size);
+          exif_data = exif_data_new_from_data (gimp_parasite_data (parasite),
+                                               gimp_parasite_data_size (parasite));
           gimp_parasite_free (parasite);
         }
 

plug-ins/jpeg/jpeg-load.h

@@ -546,7 +546,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment");
       if (parasite)
         {
-          image_comment = g_strdup (parasite->data);
+          image_comment = g_strndup (gimp_parasite_data (parasite),
+                                     gimp_parasite_data_size (parasite));
           gimp_parasite_free (parasite);
         }
 
@@ -555,7 +556,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (orig_image_ID, "exif-data");
       if (parasite)
         {
-          exif_data = exif_data_new_from_data (parasite->data, parasite->size);
+          exif_data = exif_data_new_from_data (gimp_parasite_data (parasite),
+                                               gimp_parasite_data_size (parasite));
           gimp_parasite_free (parasite);
         }
 

plug-ins/jpeg/jpeg-save.c

@@ -546,7 +546,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment");
       if (parasite)
         {
-          image_comment = g_strdup (parasite->data);
+          image_comment = g_strndup (gimp_parasite_data (parasite),
+                                     gimp_parasite_data_size (parasite));
           gimp_parasite_free (parasite);
         }
 
@@ -555,7 +556,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (orig_image_ID, "exif-data");
       if (parasite)
         {
-          exif_data = exif_data_new_from_data (parasite->data, parasite->size);
+          exif_data = exif_data_new_from_data (gimp_parasite_data (parasite),
+                                               gimp_parasite_data_size (parasite));
           gimp_parasite_free (parasite);
         }
 

plug-ins/jpeg/jpeg-save.h

@@ -546,7 +546,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment");
       if (parasite)
         {
-          image_comment = g_strdup (parasite->data);
+          image_comment = g_strndup (gimp_parasite_data (parasite),
+                                     gimp_parasite_data_size (parasite));
           gimp_parasite_free (parasite);
         }
 
@@ -555,7 +556,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (orig_image_ID, "exif-data");
       if (parasite)
         {
-          exif_data = exif_data_new_from_data (parasite->data, parasite->size);
+          exif_data = exif_data_new_from_data (gimp_parasite_data (parasite),
+                                               gimp_parasite_data_size (parasite));
           gimp_parasite_free (parasite);
         }
 

plug-ins/jpeg/jpeg.c

@@ -546,7 +546,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment");
       if (parasite)
         {
-          image_comment = g_strdup (parasite->data);
+          image_comment = g_strndup (gimp_parasite_data (parasite),
+                                     gimp_parasite_data_size (parasite));
           gimp_parasite_free (parasite);
         }
 
@@ -555,7 +556,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (orig_image_ID, "exif-data");
       if (parasite)
         {
-          exif_data = exif_data_new_from_data (parasite->data, parasite->size);
+          exif_data = exif_data_new_from_data (gimp_parasite_data (parasite),
+                                               gimp_parasite_data_size (parasite));
           gimp_parasite_free (parasite);
         }
 

plug-ins/jpeg/jpeg.h

@@ -546,7 +546,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (orig_image_ID, "gimp-comment");
       if (parasite)
         {
-          image_comment = g_strdup (parasite->data);
+          image_comment = g_strndup (gimp_parasite_data (parasite),
+                                     gimp_parasite_data_size (parasite));
           gimp_parasite_free (parasite);
         }
 
@@ -555,7 +556,8 @@ run (const gchar      *name,
       parasite = gimp_image_parasite_find (orig_image_ID, "exif-data");
       if (parasite)
         {
-          exif_data = exif_data_new_from_data (parasite->data, parasite->size);
+          exif_data = exif_data_new_from_data (gimp_parasite_data (parasite),
+                                               gimp_parasite_data_size (parasite));
           gimp_parasite_free (parasite);
         }