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)
This commit is contained in:
Matthias Clasen 2003-07-29 18:59:23 +00:00 committed by Matthias Clasen
parent 352c03fd39
commit cf9779628e
12 changed files with 53 additions and 23 deletions

View File

@ -1,5 +1,10 @@
2003-07-29 Matthias Clasen <maclas@gmx.de> 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) Replace trio printf() by gnulib vasnprintf(): (#101874)
* configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to * configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to

View File

@ -1,5 +1,10 @@
2003-07-29 Matthias Clasen <maclas@gmx.de> 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) Replace trio printf() by gnulib vasnprintf(): (#101874)
* configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to * configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to

View File

@ -1,5 +1,10 @@
2003-07-29 Matthias Clasen <maclas@gmx.de> 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) Replace trio printf() by gnulib vasnprintf(): (#101874)
* configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to * configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to

View File

@ -1,5 +1,10 @@
2003-07-29 Matthias Clasen <maclas@gmx.de> 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) Replace trio printf() by gnulib vasnprintf(): (#101874)
* configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to * configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to

View File

@ -1,5 +1,10 @@
2003-07-29 Matthias Clasen <maclas@gmx.de> 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) Replace trio printf() by gnulib vasnprintf(): (#101874)
* configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to * configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to

View File

@ -1,5 +1,10 @@
2003-07-29 Matthias Clasen <maclas@gmx.de> 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) Replace trio printf() by gnulib vasnprintf(): (#101874)
* configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to * configure.in: Define HAVE_LONG_LONG_FORMAT if system printf understands %llu; rename enable_trio to

View File

@ -1608,8 +1608,8 @@ hostname_validate (const char *hostname)
* filename, or %NULL on an error. * filename, or %NULL on an error.
**/ **/
gchar * gchar *
g_filename_from_uri (const char *uri, g_filename_from_uri (const gchar *uri,
char **hostname, gchar **hostname,
GError **error) GError **error)
{ {
const char *path_part; const char *path_part;
@ -1742,8 +1742,8 @@ g_filename_from_uri (const char *uri,
* URI, or %NULL on an error. * URI, or %NULL on an error.
**/ **/
gchar * gchar *
g_filename_to_uri (const char *filename, g_filename_to_uri (const gchar *filename,
const char *hostname, const gchar *hostname,
GError **error) GError **error)
{ {
char *escaped_uri; char *escaped_uri;

View File

@ -109,12 +109,12 @@ gchar* g_filename_from_utf8 (const gchar *utf8string,
gsize *bytes_written, gsize *bytes_written,
GError **error); GError **error);
gchar *g_filename_from_uri (const char *uri, gchar *g_filename_from_uri (const gchar *uri,
char **hostname, gchar **hostname,
GError **error); GError **error);
gchar *g_filename_to_uri (const char *filename, gchar *g_filename_to_uri (const gchar *filename,
const char *hostname, const gchar *hostname,
GError **error); GError **error);

View File

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

View File

@ -82,11 +82,11 @@ gchar * g_read_link (const gchar *filename,
GError **error); GError **error);
/* Wrapper / workalike for mkstemp() */ /* Wrapper / workalike for mkstemp() */
int g_mkstemp (char *tmpl); gint g_mkstemp (gchar *tmpl);
/* Wrapper for g_mkstemp */ /* Wrapper for g_mkstemp */
int g_file_open_tmp (const char *tmpl, gint g_file_open_tmp (const gchar *tmpl,
char **name_used, gchar **name_used,
GError **error); GError **error);
gchar *g_build_path (const gchar *separator, gchar *g_build_path (const gchar *separator,

View File

@ -111,7 +111,7 @@ stack_node;
void void
g_qsort_with_data (gconstpointer pbase, g_qsort_with_data (gconstpointer pbase,
gint total_elems, gint total_elems,
size_t size, gsize size,
GCompareDataFunc compare_func, GCompareDataFunc compare_func,
gpointer user_data) gpointer user_data)
{ {

View File

@ -34,7 +34,7 @@ G_BEGIN_DECLS
void g_qsort_with_data (gconstpointer pbase, void g_qsort_with_data (gconstpointer pbase,
gint total_elems, gint total_elems,
size_t size, gsize size,
GCompareDataFunc compare_func, GCompareDataFunc compare_func,
gpointer user_data); gpointer user_data);