Use gchar, gint, gsize instead of char, int, size_t in the interface for

2003-07-29  Matthias Clasen  <maclas@gmx.de>

	* glib/gqsort.[hc] (g_qsort_with_data):
	* glib/gconvert.[hc] (g_filename_to_uri, g_filename_from_uri):
	* glib/gfileutils.[hc] (g_mkstemp, g_file_open_tmp): Use gchar, gint, gsize instead of char, int, size_t
	in the interface for consistency.  (#118567)

diff --git a/ChangeLog b/ChangeLog
index 5330adae3c00a0f91f4a87aa0b019ef864e953b2..106f6811c814ada26e59848d728dd4d9c746556b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-07-29  Matthias Clasen  <maclas@gmx.de>
 
+       * glib/gqsort.[hc] (g_qsort_with_data): 
+       * glib/gconvert.[hc] (g_filename_to_uri, g_filename_from_uri): 
+       * glib/gfileutils.[hc] (g_mkstemp, g_file_open_tmp): Use gchar, gint, gsize instead of char, int, size_t 
+       in the interface for consistency.  (#118567)
+
        Replace trio printf() by gnulib vasnprintf():  (#101874)
        
        * configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5330adae3c00a0f91f4a87aa0b019ef864e953b2..106f6811c814ada26e59848d728dd4d9c746556b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2003-07-29  Matthias Clasen  <maclas@gmx.de>
 
+       * glib/gqsort.[hc] (g_qsort_with_data): 
+       * glib/gconvert.[hc] (g_filename_to_uri, g_filename_from_uri): 
+       * glib/gfileutils.[hc] (g_mkstemp, g_file_open_tmp): Use gchar, gint, gsize instead of char, int, size_t 
+       in the interface for consistency.  (#118567)
+
        Replace trio printf() by gnulib vasnprintf():  (#101874)
        
        * configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 5330adae3c00a0f91f4a87aa0b019ef864e953b2..106f6811c814ada26e59848d728dd4d9c746556b 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,10 @@
 2003-07-29  Matthias Clasen  <maclas@gmx.de>
 
+       * glib/gqsort.[hc] (g_qsort_with_data): 
+       * glib/gconvert.[hc] (g_filename_to_uri, g_filename_from_uri): 
+       * glib/gfileutils.[hc] (g_mkstemp, g_file_open_tmp): Use gchar, gint, gsize instead of char, int, size_t 
+       in the interface for consistency.  (#118567)
+
        Replace trio printf() by gnulib vasnprintf():  (#101874)
        
        * configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5330adae3c00a0f91f4a87aa0b019ef864e953b2..106f6811c814ada26e59848d728dd4d9c746556b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,10 @@
 2003-07-29  Matthias Clasen  <maclas@gmx.de>
 
+       * glib/gqsort.[hc] (g_qsort_with_data): 
+       * glib/gconvert.[hc] (g_filename_to_uri, g_filename_from_uri): 
+       * glib/gfileutils.[hc] (g_mkstemp, g_file_open_tmp): Use gchar, gint, gsize instead of char, int, size_t 
+       in the interface for consistency.  (#118567)
+
        Replace trio printf() by gnulib vasnprintf():  (#101874)
        
        * configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5330adae3c00a0f91f4a87aa0b019ef864e953b2..106f6811c814ada26e59848d728dd4d9c746556b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
 2003-07-29  Matthias Clasen  <maclas@gmx.de>
 
+       * glib/gqsort.[hc] (g_qsort_with_data): 
+       * glib/gconvert.[hc] (g_filename_to_uri, g_filename_from_uri): 
+       * glib/gfileutils.[hc] (g_mkstemp, g_file_open_tmp): Use gchar, gint, gsize instead of char, int, size_t 
+       in the interface for consistency.  (#118567)
+
        Replace trio printf() by gnulib vasnprintf():  (#101874)
        
        * configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5330adae3c00a0f91f4a87aa0b019ef864e953b2..106f6811c814ada26e59848d728dd4d9c746556b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2003-07-29  Matthias Clasen  <maclas@gmx.de>
 
+       * glib/gqsort.[hc] (g_qsort_with_data): 
+       * glib/gconvert.[hc] (g_filename_to_uri, g_filename_from_uri): 
+       * glib/gfileutils.[hc] (g_mkstemp, g_file_open_tmp): Use gchar, gint, gsize instead of char, int, size_t 
+       in the interface for consistency.  (#118567)
+
        Replace trio printf() by gnulib vasnprintf():  (#101874)
        
        * configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to 

diff --git a/glib/gconvert.c b/glib/gconvert.c
index 66ce7f22dffc799fdcc337cf1bc8bb115fb1c5fd..cdef325131797d591482c1eb3a9a76ea4074e176 100644 (file)
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -1608,9 +1608,9 @@ hostname_validate (const char *hostname)
  *               filename, or %NULL on an error.
  **/
 gchar *
-g_filename_from_uri (const char *uri,
-                    char      **hostname,
-                    GError    **error)
+g_filename_from_uri (const gchar *uri,
+                    gchar      **hostname,
+                    GError     **error)
 {
   const char *path_part;
   const char *host_part;
@@ -1742,9 +1742,9 @@ g_filename_from_uri (const char *uri,
  *               URI, or %NULL on an error.
  **/
 gchar *
-g_filename_to_uri   (const char *filename,
-                    const char *hostname,
-                    GError    **error)
+g_filename_to_uri   (const gchar *filename,
+                    const gchar *hostname,
+                    GError     **error)
 {
   char *escaped_uri;
   char *utf8_filename;

diff --git a/glib/gconvert.h b/glib/gconvert.h
index c705078fbcd73175a19350385e6758182050cd95..e3989b42970d188ecafc71efc5edbbddfd20fbca 100644 (file)
--- a/glib/gconvert.h
+++ b/glib/gconvert.h
@@ -109,13 +109,13 @@ gchar* g_filename_from_utf8 (const gchar  *utf8string,
                             gsize        *bytes_written,  
                             GError      **error);
 
-gchar *g_filename_from_uri (const char *uri,
-                           char      **hostname,
-                           GError    **error);
+gchar *g_filename_from_uri (const gchar *uri,
+                           gchar      **hostname,
+                           GError     **error);
   
-gchar *g_filename_to_uri   (const char *filename,
-                           const char *hostname,
-                           GError    **error);
+gchar *g_filename_to_uri   (const gchar *filename,
+                           const gchar *hostname,
+                           GError     **error);
 
 
 G_END_DECLS

diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index c378820e9e41eec1670670885aa699fa96589e69..8fdd0ec98c9ddda2e484c8b33182d1cd9a892d6b 100644 (file)
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -653,8 +653,8 @@ g_file_get_contents (const gchar *filename,
  * on platforms where there is a difference. The file handle should be
  * closed with close(). In case of errors, -1 is returned.
  */
-int
-g_mkstemp (char *tmpl)
+gint
+g_mkstemp (gchar *tmpl)
 {
 #ifdef HAVE_MKSTEMP
   return mkstemp (tmpl);
@@ -740,10 +740,10 @@ g_mkstemp (char *tmpl)
  * closed with close(). In case of errors, -1 is returned 
  * and @error will be set.
  **/
-int
-g_file_open_tmp (const char *tmpl,
-                char      **name_used,
-                GError    **error)
+gint
+g_file_open_tmp (const gchar *tmpl,
+                gchar      **name_used,
+                GError     **error)
 {
   int retval;
   const char *tmpdir;

diff --git a/glib/gfileutils.h b/glib/gfileutils.h
index 76669f8cde04dba9b8b2cda1c58e848fa9de0b2f..0649580e8b00322e5a01d00fd8693188ca66a56f 100644 (file)
--- a/glib/gfileutils.h
+++ b/glib/gfileutils.h
@@ -82,11 +82,11 @@ gchar * g_read_link          (const gchar  *filename,
                              GError      **error);
 
 /* Wrapper / workalike for mkstemp() */
-int     g_mkstemp            (char         *tmpl);
+gint    g_mkstemp            (gchar        *tmpl);
 
 /* Wrapper for g_mkstemp */
-int     g_file_open_tmp      (const char   *tmpl,
-                             char        **name_used,
+gint    g_file_open_tmp      (const gchar  *tmpl,
+                             gchar       **name_used,
                              GError      **error);
 
 gchar *g_build_path     (const gchar *separator,

diff --git a/glib/gqsort.c b/glib/gqsort.c
index 8c9314c791bb46f8863db092b835085b27c2e61c..b44785be6c1f6d83aba9baea07f13c867a5b5aba 100644 (file)
--- a/glib/gqsort.c
+++ b/glib/gqsort.c
@@ -111,7 +111,7 @@ stack_node;
 void
 g_qsort_with_data (gconstpointer    pbase,
                   gint             total_elems,
-                  size_t           size,
+                  gsize            size,
                   GCompareDataFunc compare_func,
                   gpointer         user_data)
 {

diff --git a/glib/gqsort.h b/glib/gqsort.h
index 12e7a05b13eedbec0a53e2e1e3532f3d0c857e4b..d0ff46a484f9468302dc6e409a797e2292981ca8 100644 (file)
--- a/glib/gqsort.h
+++ b/glib/gqsort.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
 
 void g_qsort_with_data (gconstpointer    pbase,
                        gint             total_elems,
-                       size_t           size,
+                       gsize            size,
                        GCompareDataFunc compare_func,
                        gpointer         user_data);