diff --git a/ChangeLog b/ChangeLog index 3abe4e86a..8dc8b6087 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-09-26 Matthias Clasen + + * glib/gstrfuncs.c (g_ascii_strtoull): Add details to the + docs. (#314393, Matthew F. Barnes) + 2005-09-20 Matthias Clasen * glib/gqueue.c (g_queue_insert_sorted): Fix the docs. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3abe4e86a..8dc8b6087 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-09-26 Matthias Clasen + + * glib/gstrfuncs.c (g_ascii_strtoull): Add details to the + docs. (#314393, Matthew F. Barnes) + 2005-09-20 Matthias Clasen * glib/gqueue.c (g_queue_insert_sorted): Fix the docs. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 3abe4e86a..8dc8b6087 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2005-09-26 Matthias Clasen + + * glib/gstrfuncs.c (g_ascii_strtoull): Add details to the + docs. (#314393, Matthew F. Barnes) + 2005-09-20 Matthias Clasen * glib/gqueue.c (g_queue_insert_sorted): Fix the docs. 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 **/