diff --git a/ChangeLog b/ChangeLog index 3a7ee3ddc..19d3e3fb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-09-26 Matthias Clasen + * glib/gstrfuncs.c (g_ascii_strtoull): Add details to the + docs. (#314393, Matthew F. Barnes) + * glib/glib.symbols: * glib/gprintf.h: Remove g_snprintf() and g_vsnprintf(), since they are already declared in glib.h. This doesn't break documented diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3a7ee3ddc..19d3e3fb2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-09-26 Matthias Clasen + * glib/gstrfuncs.c (g_ascii_strtoull): Add details to the + docs. (#314393, Matthew F. Barnes) + * glib/glib.symbols: * glib/gprintf.h: Remove g_snprintf() and g_vsnprintf(), since they are already declared in glib.h. This doesn't break documented diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 3a7ee3ddc..19d3e3fb2 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,8 @@ 2005-09-26 Matthias Clasen + * glib/gstrfuncs.c (g_ascii_strtoull): Add details to the + docs. (#314393, Matthew F. Barnes) + * glib/glib.symbols: * glib/gprintf.h: Remove g_snprintf() and g_vsnprintf(), since they are already declared in glib.h. This doesn't break documented diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index 321c1102f..12018ec88 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -610,9 +610,12 @@ g_ascii_formatd (gchar *buffer, * locale-sensitive system strtoull() function. * * If the correct value would cause overflow, %G_MAXUINT64 - * is returned, and %ERANGE is stored in %errno. + * is returned, and %ERANGE is stored in %errno. If the base is + * outside the valid range, zero is returned, and %EINVAL is stored + * in %errno. If the string conversion fails, zero is returned, and + * @endptr returns @nptr (if @endptr is non-%NULL). * - * Return value: the #guint64 value. + * Return value: the #guint64 value or zero on error. * * Since: 2.2 **/