Consolidate data types

1 files changed, 29 insertions, 28 deletions

diff --git a/src/gallery-utils.c b/src/gallery-utils.c
index 29c456d..1ac8419 100644
--- a/src/gallery-utils.c
+++ b/src/gallery-utils.c
@@ -34,12 +34,12 @@
  *                - reallocates the original string
  */
 void
-str_replace (char **dst, const char *search, const char *replace)
+str_replace (gchar **dst, const gchar *search, const gchar *replace)
 {
   #define REPLACE_MAX_LENGTH 32768
-  static char d[REPLACE_MAX_LENGTH];
-  char *src;
-  char *found;
+  static gchar d[REPLACE_MAX_LENGTH];
+  gchar *src;
+  gchar *found;
   int i;
 
   /* TODO: add range checking */
@@ -79,7 +79,7 @@ str_replace (char **dst, const char *search, const char *replace)
 #endif
 
   /*  return fixed string  */
-  free (*dst);
+  g_free (*dst);
   *dst = g_strdup (&d[0]);
 }
 
@@ -88,7 +88,7 @@ str_replace (char **dst, const char *search, const char *replace)
  *   copy_file: copy file from src to dst
  */
 gboolean
-copy_file (const char *src, const char *dst)
+copy_file (const gchar *src, const gchar *dst)
 {
   #define BUFFER_SIZE 65536
 
@@ -151,18 +151,18 @@ copy_file (const char *src, const char *dst)
  *   make_string: make string of 'substr' substrings
  *                - returns newly allocated string
  */
-char *
-make_string (const char *substr, int count)
+gchar *
+make_string (const gchar *substr, int count)
 {
   int i;
-  char *s;
+  gchar *s;
 
   if (count < 0)
     count = 0;
 
-  s = malloc (strlen (substr) * count + 1);
+  s = g_malloc0 (strlen (substr) * count + 1);
   for (i = 0; i < count; i++)
-	  memcpy (s + (strlen (substr) * i), substr, strlen (substr));
+    memcpy (s + (strlen (substr) * i), substr, strlen (substr));
   s[strlen (substr) * count] = 0;
   return s;
 }
@@ -173,12 +173,12 @@ make_string (const char *substr, int count)
  *                 - returns newly allocated string
  */
 void
-fix_entities (char **str)
+fix_entities (gchar **str)
 {
-  static char d[REPLACE_MAX_LENGTH];
-  char *src;
-  char *found;
-  char *scan;
+  static gchar d[REPLACE_MAX_LENGTH];
+  gchar *src;
+  gchar *found;
+  gchar *scan;
   int i;
 
   /* TODO: add range checking */
@@ -228,7 +228,7 @@ fix_entities (char **str)
 #endif
 
   /*  return fixed string  */
-  free (*str);
+  g_free (*str);
   *str = g_strdup (&d[0]);
 }
 
@@ -239,12 +239,12 @@ fix_entities (char **str)
  *                - returns newly allocated string
  */
 void
-remove_tags (char **str, const char *tag_begin, const char *tag_end)
+remove_tags (gchar **str, const gchar *tag_begin, const gchar *tag_end)
 {
-  char *src;
-  char *found;
-  char *found2;
-  char *dest;
+  gchar *src;
+  gchar *found;
+  gchar *found2;
+  gchar *dest;
 
   if (! *str || ! tag_begin || ! tag_end || strlen (*str) == 0 || strlen (tag_begin) == 0 || strlen (tag_end) == 0)
     return;
@@ -255,7 +255,7 @@ remove_tags (char **str, const char *tag_begin, const char *tag_end)
     found2 = strstr (found, tag_end);
     if (found2) {
       found2 += strlen (tag_end);
-      dest = malloc (strlen (src) - (found2 - found) + 1);
+      dest = g_malloc0 (strlen (src) - (found2 - found) + 1);
       memcpy (dest, src, found - src);
       memcpy (dest + (found - src), found2, strlen (found2) + 1);
 #ifdef __DEBUG_ALL__
@@ -264,7 +264,7 @@ remove_tags (char **str, const char *tag_begin, const char *tag_end)
 #endif
       g_free (src);
       src = g_strdup (dest);
-      free (dest);
+      g_free (dest);
     }
     else
     {
@@ -276,11 +276,12 @@ remove_tags (char **str, const char *tag_begin, const char *tag_end)
   *str = src;
 }
 
+
 /*
  *   count_dir_levels: returns number of path elements
  */
 int
-count_dir_levels (const char *path)
+count_dir_levels (const gchar *path)
 {
   int i;
   int level;
@@ -301,8 +302,8 @@ count_dir_levels (const char *path)
 /*
  *   extract_file_ext: returns pointer to filename extension
  */
-const char *
-extract_file_ext (const char *filename)
+const gchar *
+extract_file_ext (const gchar *filename)
 {
   g_return_val_if_fail (filename != NULL, NULL);
   g_return_val_if_fail (strlen (filename) > 0, NULL);
@@ -332,7 +333,7 @@ log_error (const gchar *format, ...)
  *   needs_update: returns TRUE if the destionation file needs updating, also when missing
  */
 gboolean
-needs_update (const char *source, const char *dest)
+needs_update (const gchar *source, const gchar *dest)
 {
   struct stat src_stat;
   struct stat dst_stat;