mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-23 18:52:09 +01:00
added argument assertments.
Fri May 19 11:37:54 2000 Tim Janik <timj@gtk.org> * gutils.c (g_snprintf): (g_vsnprintf): added argument assertments. * gstring.c (g_string_assign): (g_string_truncate): added argument assertments.
This commit is contained in:
parent
b3278400bc
commit
9340ef7981
@ -1,3 +1,11 @@
|
|||||||
|
Fri May 19 11:37:54 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* gutils.c (g_snprintf):
|
||||||
|
(g_vsnprintf): added argument assertments.
|
||||||
|
|
||||||
|
* gstring.c (g_string_assign):
|
||||||
|
(g_string_truncate): added argument assertments.
|
||||||
|
|
||||||
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
Fri May 19 11:37:54 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* gutils.c (g_snprintf):
|
||||||
|
(g_vsnprintf): added argument assertments.
|
||||||
|
|
||||||
|
* gstring.c (g_string_assign):
|
||||||
|
(g_string_truncate): added argument assertments.
|
||||||
|
|
||||||
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
Fri May 19 11:37:54 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* gutils.c (g_snprintf):
|
||||||
|
(g_vsnprintf): added argument assertments.
|
||||||
|
|
||||||
|
* gstring.c (g_string_assign):
|
||||||
|
(g_string_truncate): added argument assertments.
|
||||||
|
|
||||||
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
Fri May 19 11:37:54 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* gutils.c (g_snprintf):
|
||||||
|
(g_vsnprintf): added argument assertments.
|
||||||
|
|
||||||
|
* gstring.c (g_string_assign):
|
||||||
|
(g_string_truncate): added argument assertments.
|
||||||
|
|
||||||
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
Fri May 19 11:37:54 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* gutils.c (g_snprintf):
|
||||||
|
(g_vsnprintf): added argument assertments.
|
||||||
|
|
||||||
|
* gstring.c (g_string_assign):
|
||||||
|
(g_string_truncate): added argument assertments.
|
||||||
|
|
||||||
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
Fri May 19 11:37:54 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* gutils.c (g_snprintf):
|
||||||
|
(g_vsnprintf): added argument assertments.
|
||||||
|
|
||||||
|
* gstring.c (g_string_assign):
|
||||||
|
(g_string_truncate): added argument assertments.
|
||||||
|
|
||||||
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
Fri May 19 11:37:54 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* gutils.c (g_snprintf):
|
||||||
|
(g_vsnprintf): added argument assertments.
|
||||||
|
|
||||||
|
* gstring.c (g_string_assign):
|
||||||
|
(g_string_truncate): added argument assertments.
|
||||||
|
|
||||||
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
Fri May 19 11:37:54 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
|
* gutils.c (g_snprintf):
|
||||||
|
(g_vsnprintf): added argument assertments.
|
||||||
|
|
||||||
|
* gstring.c (g_string_assign):
|
||||||
|
(g_string_truncate): added argument assertments.
|
||||||
|
|
||||||
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
|
||||||
|
|
||||||
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
|
||||||
|
@ -258,6 +258,9 @@ GString*
|
|||||||
g_string_assign (GString *lval,
|
g_string_assign (GString *lval,
|
||||||
const gchar *rval)
|
const gchar *rval)
|
||||||
{
|
{
|
||||||
|
g_return_val_if_fail (lval != NULL, NULL);
|
||||||
|
g_return_val_if_fail (rval != NULL, NULL);
|
||||||
|
|
||||||
g_string_truncate (lval, 0);
|
g_string_truncate (lval, 0);
|
||||||
g_string_append (lval, rval);
|
g_string_append (lval, rval);
|
||||||
|
|
||||||
@ -271,6 +274,7 @@ g_string_truncate (GString* fstring,
|
|||||||
GRealString *string = (GRealString*)fstring;
|
GRealString *string = (GRealString*)fstring;
|
||||||
|
|
||||||
g_return_val_if_fail (string != NULL, NULL);
|
g_return_val_if_fail (string != NULL, NULL);
|
||||||
|
g_return_val_if_fail (len >= 0, NULL);
|
||||||
|
|
||||||
string->len = len;
|
string->len = len;
|
||||||
|
|
||||||
|
@ -136,6 +136,10 @@ g_snprintf (gchar *str,
|
|||||||
va_list args;
|
va_list args;
|
||||||
gint retval;
|
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);
|
va_start (args, fmt);
|
||||||
retval = vsnprintf (str, n, fmt, args);
|
retval = vsnprintf (str, n, fmt, args);
|
||||||
va_end (args);
|
va_end (args);
|
||||||
@ -151,6 +155,10 @@ g_snprintf (gchar *str,
|
|||||||
gchar *printed;
|
gchar *printed;
|
||||||
va_list args;
|
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);
|
va_start (args, fmt);
|
||||||
printed = g_strdup_vprintf (fmt, args);
|
printed = g_strdup_vprintf (fmt, args);
|
||||||
va_end (args);
|
va_end (args);
|
||||||
@ -172,6 +180,10 @@ g_vsnprintf (gchar *str,
|
|||||||
{
|
{
|
||||||
#ifdef HAVE_VSNPRINTF
|
#ifdef HAVE_VSNPRINTF
|
||||||
gint retval;
|
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);
|
retval = vsnprintf (str, n, fmt, args);
|
||||||
|
|
||||||
@ -185,6 +197,10 @@ g_vsnprintf (gchar *str,
|
|||||||
#else /* !HAVE_VSNPRINTF */
|
#else /* !HAVE_VSNPRINTF */
|
||||||
gchar *printed;
|
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);
|
printed = g_strdup_vprintf (fmt, args);
|
||||||
strncpy (str, printed, n);
|
strncpy (str, printed, n);
|
||||||
str[n-1] = '\0';
|
str[n-1] = '\0';
|
||||||
|
@ -258,6 +258,9 @@ GString*
|
|||||||
g_string_assign (GString *lval,
|
g_string_assign (GString *lval,
|
||||||
const gchar *rval)
|
const gchar *rval)
|
||||||
{
|
{
|
||||||
|
g_return_val_if_fail (lval != NULL, NULL);
|
||||||
|
g_return_val_if_fail (rval != NULL, NULL);
|
||||||
|
|
||||||
g_string_truncate (lval, 0);
|
g_string_truncate (lval, 0);
|
||||||
g_string_append (lval, rval);
|
g_string_append (lval, rval);
|
||||||
|
|
||||||
@ -271,6 +274,7 @@ g_string_truncate (GString* fstring,
|
|||||||
GRealString *string = (GRealString*)fstring;
|
GRealString *string = (GRealString*)fstring;
|
||||||
|
|
||||||
g_return_val_if_fail (string != NULL, NULL);
|
g_return_val_if_fail (string != NULL, NULL);
|
||||||
|
g_return_val_if_fail (len >= 0, NULL);
|
||||||
|
|
||||||
string->len = len;
|
string->len = len;
|
||||||
|
|
||||||
|
16
gutils.c
16
gutils.c
@ -136,6 +136,10 @@ g_snprintf (gchar *str,
|
|||||||
va_list args;
|
va_list args;
|
||||||
gint retval;
|
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);
|
va_start (args, fmt);
|
||||||
retval = vsnprintf (str, n, fmt, args);
|
retval = vsnprintf (str, n, fmt, args);
|
||||||
va_end (args);
|
va_end (args);
|
||||||
@ -151,6 +155,10 @@ g_snprintf (gchar *str,
|
|||||||
gchar *printed;
|
gchar *printed;
|
||||||
va_list args;
|
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);
|
va_start (args, fmt);
|
||||||
printed = g_strdup_vprintf (fmt, args);
|
printed = g_strdup_vprintf (fmt, args);
|
||||||
va_end (args);
|
va_end (args);
|
||||||
@ -172,6 +180,10 @@ g_vsnprintf (gchar *str,
|
|||||||
{
|
{
|
||||||
#ifdef HAVE_VSNPRINTF
|
#ifdef HAVE_VSNPRINTF
|
||||||
gint retval;
|
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);
|
retval = vsnprintf (str, n, fmt, args);
|
||||||
|
|
||||||
@ -185,6 +197,10 @@ g_vsnprintf (gchar *str,
|
|||||||
#else /* !HAVE_VSNPRINTF */
|
#else /* !HAVE_VSNPRINTF */
|
||||||
gchar *printed;
|
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);
|
printed = g_strdup_vprintf (fmt, args);
|
||||||
strncpy (str, printed, n);
|
strncpy (str, printed, n);
|
||||||
str[n-1] = '\0';
|
str[n-1] = '\0';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user