diff options
author | Tim Janik <timj@gtk.org> | 2000-05-19 10:01:08 +0000 |
---|---|---|
committer | Tim Janik <timj@src.gnome.org> | 2000-05-19 10:01:08 +0000 |
commit | 1fe02b28ad2e689d5d93cf389eeafa3d84f5fea6 (patch) | |
tree | f0897cf4c892a532da4aedfd0009d0e92295041d /glib | |
parent | 1e5d06d4ceb07ae8ddbd596cb69936fb3807a116 (diff) | |
download | glib-1fe02b28ad2e689d5d93cf389eeafa3d84f5fea6.tar.gz |
added argument assertments.
Fri May 19 11:39:29 2000 Tim Janik <timj@gtk.org>
* gutils.c (g_snprintf):
(g_vsnprintf): added argument assertments.
* gstring.c (g_string_assign): added argument assertments.
(g_string_truncate): make len a guint.
Diffstat (limited to 'glib')
-rw-r--r-- | glib/glib.h | 2 | ||||
-rw-r--r-- | glib/gstring.c | 2 | ||||
-rw-r--r-- | glib/gutils.c | 16 |
3 files changed, 18 insertions, 2 deletions
diff --git a/glib/glib.h b/glib/glib.h index 23aa72cc3..ea31dbb22 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -1864,7 +1864,7 @@ void g_string_free (GString *string, GString* g_string_assign (GString *string, const gchar *rval); GString* g_string_truncate (GString *string, - gint len); + guint len); GString* g_string_insert_len (GString *string, gint pos, const gchar *val, diff --git a/glib/gstring.c b/glib/gstring.c index aba8b1275..299b24233 100644 --- a/glib/gstring.c +++ b/glib/gstring.c @@ -280,7 +280,7 @@ g_string_assign (GString *string, GString* g_string_truncate (GString *fstring, - gint len) + guint len) { GRealString *string = (GRealString *) fstring; diff --git a/glib/gutils.c b/glib/gutils.c index 7e99bb0b6..09646ccb5 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -149,6 +149,10 @@ g_snprintf (gchar *str, va_list args; gint retval; + g_return_val_if_fail (str != NULL, 0); + g_return_val_if_fail (n > 0, 0); + g_return_val_if_fail (fmt != NULL, 0); + va_start (args, fmt); retval = vsnprintf (str, n, fmt, args); va_end (args); @@ -164,6 +168,10 @@ g_snprintf (gchar *str, gchar *printed; va_list args; + g_return_val_if_fail (str != NULL, 0); + g_return_val_if_fail (n > 0, 0); + g_return_val_if_fail (fmt != NULL, 0); + va_start (args, fmt); printed = g_strdup_vprintf (fmt, args); va_end (args); @@ -186,6 +194,10 @@ g_vsnprintf (gchar *str, #ifdef HAVE_VSNPRINTF gint retval; + g_return_val_if_fail (str != NULL, 0); + g_return_val_if_fail (n > 0, 0); + g_return_val_if_fail (fmt != NULL, 0); + retval = vsnprintf (str, n, fmt, args); if (retval < 0) @@ -198,6 +210,10 @@ g_vsnprintf (gchar *str, #else /* !HAVE_VSNPRINTF */ gchar *printed; + g_return_val_if_fail (str != NULL, 0); + g_return_val_if_fail (n > 0, 0); + g_return_val_if_fail (fmt != NULL, 0); + printed = g_strdup_vprintf (fmt, args); strncpy (str, printed, n); str[n-1] = '\0'; |