Consolidate data types

1 files changed, 35 insertions, 35 deletions

diff --git a/src/generators.c b/src/generators.c
index fdea806..d64f5b2 100644
--- a/src/generators.c
+++ b/src/generators.c
@@ -36,11 +36,11 @@
 
 
 
-static char *
-make_thumbnail_string (TGallerySetup *setup, unsigned int item_index, const char *imgname)
+static gchar *
+make_thumbnail_string (TGallerySetup *setup, unsigned int item_index, const gchar *imgname)
 {
-  char *s;
-  char *num;
+  gchar *s;
+  gchar *num;
 
   s = g_strdup (setup->thumbnail_name_format);
   str_replace (&s, "%s", imgname);
@@ -60,18 +60,18 @@ generate_image (TGallerySetup *setup,
                 TAlbum *items,
                 TIndexItem *item,
                 unsigned int item_index,
-                const char *dst_dir,
+                const gchar *dst_dir,
                 gboolean update_when_necessary)
 {
   unsigned long new_w, new_h;
   unsigned long thumb_w, thumb_h;
-  char *thumb_dst;
-  char *big_dst;
-  char *big_src;
-  char *orig_dst;
-  char *img_src_full;
-  char *thumb_src_full;
-  char *s1;
+  gchar *thumb_dst;
+  gchar *big_dst;
+  gchar *big_src;
+  gchar *orig_dst;
+  gchar *img_src_full;
+  gchar *thumb_src_full;
+  gchar *s1;
   int bigq;
   gboolean res;
 
@@ -211,15 +211,15 @@ generate_image (TGallerySetup *setup,
  */
 gboolean
 write_html_album (TGallerySetup *setup,
-                  const char *template_src,
-                  const char *dst,
+                  const gchar *template_src,
+                  const gchar *dst,
                   TAlbum *items)
 {
   FILE *fin;
   FILE *fout;
-  char *line;
-  char *block;
-  char *s1, *s2, *s3, *s4, *s5;
+  gchar *line;
+  gchar *block;
+  gchar *s1, *s2, *s3, *s4, *s5;
   TAlbum *parent;
   TIndexItem *item;
   TIndexItem *tmp_item;
@@ -288,14 +288,14 @@ write_html_album (TGallerySetup *setup,
   s2 = setup->use_inpage_links ? g_strdup_printf ("#i%d", old_parent_item_index) : g_strdup ("");
   replace_table_add_key_printf (global_replace_table, "GO_UP_LINK", "%s%s%s", s3, setup->index_file_name, s2);
   g_free (s2);
-  free (s3);
+  g_free (s3);
 
   while (parent) {
     s3 = make_string ("../", level);
     s4 = g_strdup (parent->ID);
     s5 = setup->use_inpage_links ? g_strdup_printf ("#i%d", old_parent_item_index) : g_strdup ("");
     s2 = g_strdup_printf ("<a href=\"%s%s%s\">%s</a> &gt; %s", s3, setup->index_file_name, s5, s4, s1);
-    free (s3);
+    g_free (s3);
     g_free (s1);
     g_free (s4);
     g_free (s5);
@@ -315,7 +315,7 @@ write_html_album (TGallerySetup *setup,
   /*  Supportfiles path  */
   s1 = make_string ("../", level - 1);
   replace_table_add_key (global_replace_table, "TEMPLATES_PATH", setup->support_files_use_common_root ? s1 : "");
-  free (s1);
+  g_free (s1);
 
   /*  META tags  */
   s1 = g_strdup_printf ("\t<meta name=\"generator\" content=\"Cataract Gallery Generator v%s\" />\n", VERSION);
@@ -350,7 +350,7 @@ write_html_album (TGallerySetup *setup,
     else
       s2 = g_strdup_printf ("%s\t<link rel=\"icon\" href=\"%s%s\" />\n", s1, setup->support_files_use_common_root ? s3 : "", setup->favicon_file);
     g_free (s1);
-    free (s3);
+    g_free (s3);
     s1 = s2;
   }
   replace_table_add_key (global_replace_table, "CGG_META_TAGS", s1);
@@ -477,16 +477,16 @@ write_html_album (TGallerySetup *setup,
  */
 gboolean
 write_html_image (TGallerySetup *setup,
-                  const char *template_src,
-                  const char *original_img,
-                  const char *dst,
+                  const gchar *template_src,
+                  const gchar *original_img,
+                  const gchar *dst,
                   TIndexItem *item,
                   TAlbum *parent_items)
 {
   FILE *fin;
   FILE *fout;
-  char *big_dst;
-  char *orig_dst;
+  gchar *big_dst;
+  gchar *orig_dst;
   TExifData *exif;
   unsigned long img_big_w, img_big_h, img_orig_w, img_orig_h;
   unsigned int item_index, real_item_index, real_total_items;
@@ -495,11 +495,11 @@ write_html_image (TGallerySetup *setup,
   TIndexItem *tmp_item;
   TAlbum *parent;
   int i;
-  char *line;
-  char *block;
-  char *s1, *s2, *s3, *s4, *s5;
-  char *imgname, *preload_imgname;
-  char *title, *title_desc;
+  gchar *line;
+  gchar *block;
+  gchar *s1, *s2, *s3, *s4, *s5;
+  gchar *imgname, *preload_imgname;
+  gchar *title, *title_desc;
   gboolean res, bb;
   int level, old_parent_item_index;
   gboolean override_title_meta;
@@ -648,7 +648,7 @@ write_html_image (TGallerySetup *setup,
     s4 = g_strdup (parent->ID);
     s5 = setup->use_inpage_links ? g_strdup_printf ("#i%d", parent == parent_items ? item_index : old_parent_item_index) : g_strdup ("");
     s2 = g_strdup_printf ("<a href=\"%s%s%s\">%s</a> &gt; %s", s3, setup->index_file_name, s5, s4, s1);
-    free (s3);
+    g_free (s3);
     g_free (s1);
     g_free (s4);
     g_free (s5);
@@ -668,7 +668,7 @@ write_html_image (TGallerySetup *setup,
   /*  Supportfiles path  */
   s1 = make_string ("../", level - 1);
   replace_table_add_key (replace_table, "TEMPLATES_PATH", setup->support_files_use_common_root ? s1 : "");
-  free (s1);
+  g_free (s1);
 
   /*  EXIF values  */
   replace_table_add_key (replace_table, "EXIF_ISO", exif->iso ? exif->iso : "??");
@@ -794,8 +794,8 @@ write_html_image (TGallerySetup *setup,
   fclose (fin);
   g_free (title);
   g_free (title_desc);
-  free (big_dst);
-  free (orig_dst);
+  g_free (big_dst);
+  g_free (orig_dst);
   g_free (imgname);
   g_free (preload_imgname);
   free_exif_data (exif);