diff --git a/ChangeLog b/ChangeLog index 2b0c109f3..e740a9a29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-11-29 Matthias Clasen + + * glib/gtimer.c (g_time_val_add): Adjust to changed parameter names. + + * glib/gutils.c (g_get_application_name): Mark as 2.2. addition. + + * glib/gstrfuncs.c (g_ascii_strtoull): Mark as 2.0.7 addition. + 2002-11-28 Matthias Clasen * glib/gutils.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2b0c109f3..e740a9a29 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2002-11-29 Matthias Clasen + + * glib/gtimer.c (g_time_val_add): Adjust to changed parameter names. + + * glib/gutils.c (g_get_application_name): Mark as 2.2. addition. + + * glib/gstrfuncs.c (g_ascii_strtoull): Mark as 2.0.7 addition. + 2002-11-28 Matthias Clasen * glib/gutils.c: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2b0c109f3..e740a9a29 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +2002-11-29 Matthias Clasen + + * glib/gtimer.c (g_time_val_add): Adjust to changed parameter names. + + * glib/gutils.c (g_get_application_name): Mark as 2.2. addition. + + * glib/gstrfuncs.c (g_ascii_strtoull): Mark as 2.0.7 addition. + 2002-11-28 Matthias Clasen * glib/gutils.c: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2b0c109f3..e740a9a29 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2002-11-29 Matthias Clasen + + * glib/gtimer.c (g_time_val_add): Adjust to changed parameter names. + + * glib/gutils.c (g_get_application_name): Mark as 2.2. addition. + + * glib/gstrfuncs.c (g_ascii_strtoull): Mark as 2.0.7 addition. + 2002-11-28 Matthias Clasen * glib/gutils.c: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2b0c109f3..e740a9a29 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2002-11-29 Matthias Clasen + + * glib/gtimer.c (g_time_val_add): Adjust to changed parameter names. + + * glib/gutils.c (g_get_application_name): Mark as 2.2. addition. + + * glib/gstrfuncs.c (g_ascii_strtoull): Mark as 2.0.7 addition. + 2002-11-28 Matthias Clasen * glib/gutils.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2b0c109f3..e740a9a29 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2002-11-29 Matthias Clasen + + * glib/gtimer.c (g_time_val_add): Adjust to changed parameter names. + + * glib/gutils.c (g_get_application_name): Mark as 2.2. addition. + + * glib/gstrfuncs.c (g_ascii_strtoull): Mark as 2.0.7 addition. + 2002-11-28 Matthias Clasen * glib/gutils.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2b0c109f3..e740a9a29 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2002-11-29 Matthias Clasen + + * glib/gtimer.c (g_time_val_add): Adjust to changed parameter names. + + * glib/gutils.c (g_get_application_name): Mark as 2.2. addition. + + * glib/gstrfuncs.c (g_ascii_strtoull): Mark as 2.0.7 addition. + 2002-11-28 Matthias Clasen * glib/gutils.c: diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 30882f11c..0d73e2c87 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,13 @@ +2002-11-29 Matthias Clasen + + * glib/tmpl/main.sgml: Write something about GSourceDummyMarshal. + + * glib/tmpl/date.sgml: + * glib/tmpl/string_utils.sgml: Remove redundant docs. + + * glib/glib-sections.txt: Add g_ascii_strtoull and + g_get_application_name. + 2002-11-28 Matthias Clasen * glib/tmpl/strings.sgml: diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt index c2a2bcaea..8980fe38b 100644 --- a/docs/reference/glib/glib-sections.txt +++ b/docs/reference/glib/glib-sections.txt @@ -951,6 +951,7 @@ g_strncasecmp g_strreverse +g_ascii_strtoull G_ASCII_DTOSTR_BUF_SIZE g_ascii_strtod g_ascii_dtostr @@ -1141,6 +1142,7 @@ g_hook_destroy_link
Miscellaneous Utility Functions misc_utils +g_get_application_name g_get_prgname g_set_prgname g_getenv diff --git a/docs/reference/glib/tmpl/date.sgml b/docs/reference/glib/tmpl/date.sgml index 6fcec9974..43756dde8 100644 --- a/docs/reference/glib/tmpl/date.sgml +++ b/docs/reference/glib/tmpl/date.sgml @@ -83,8 +83,6 @@ Represents a precise time, with seconds and microseconds. Same as the -Equivalent to gettimeofday(), but also works on -Win32. Returns the current time. @result: diff --git a/docs/reference/glib/tmpl/main.sgml b/docs/reference/glib/tmpl/main.sgml index 79d938ca3..67d68ad81 100644 --- a/docs/reference/glib/tmpl/main.sgml +++ b/docs/reference/glib/tmpl/main.sgml @@ -628,7 +628,8 @@ an event source. - +This is just a placeholder for #GClosureMarshal, which cannot be used here +for dependency reasons. diff --git a/docs/reference/glib/tmpl/misc_utils.sgml b/docs/reference/glib/tmpl/misc_utils.sgml index d8a4b5c4e..3b10f85df 100644 --- a/docs/reference/glib/tmpl/misc_utils.sgml +++ b/docs/reference/glib/tmpl/misc_utils.sgml @@ -14,6 +14,14 @@ These are portable utility functions. + + + + + +@Returns: + + Gets the name of the program. This name should NOT be localized, diff --git a/docs/reference/glib/tmpl/string_utils.sgml b/docs/reference/glib/tmpl/string_utils.sgml index 8ea834514..06d7de703 100644 --- a/docs/reference/glib/tmpl/string_utils.sgml +++ b/docs/reference/glib/tmpl/string_utils.sgml @@ -50,14 +50,10 @@ nul-terminated. -Copies a %NULL-terminated array of strings. The result consists of a -%NULL-terminated array, with one malloc block holding the array of strings, and -each string itself allocated. The simplest way to free the result is with -g_strfreev() which frees each string in a vector, then the vector itself. -@str_array: array to copy -@Returns: a new array +@str_array: +@Returns: @@ -617,6 +613,17 @@ Note that g_strreverse() doesn't work on UTF-8 strings containing multibyte char @Returns: the same pointer passed in as @string. + + + + + +@nptr: +@endptr: +@base: +@Returns: + + A good size for a buffer to be passed into g_ascii_dtostr(). diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index 1c8393430..a34c877ee 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -603,6 +603,8 @@ g_ascii_formatd (gchar *buffer, * is returned, and %ERANGE is stored in %errno. * * Return value: the #guint64 value. + * + * Since: 2.0.7 **/ guint64 g_ascii_strtoull (const gchar *nptr, diff --git a/glib/gtimer.c b/glib/gtimer.c index f06d5bb9e..30e249e18 100644 --- a/glib/gtimer.c +++ b/glib/gtimer.c @@ -226,36 +226,36 @@ g_usleep (gulong microseconds) /** * g_time_val_add: - * @time: a #GTimeVal + * @time_: a #GTimeVal * @microseconds: number of microseconds to add to @time * - * Adds the given number of microseconds to @time. @microseconds can - * also be negative to decrease the value of @time. + * Adds the given number of microseconds to @time_. @microseconds can + * also be negative to decrease the value of @time_. **/ void -g_time_val_add (GTimeVal *time, glong microseconds) +g_time_val_add (GTimeVal *time_, glong microseconds) { - g_return_if_fail (time->tv_usec >= 0 && time->tv_usec < G_USEC_PER_SEC); + g_return_if_fail (time_->tv_usec >= 0 && time_->tv_usec < G_USEC_PER_SEC); if (microseconds >= 0) { - time->tv_usec += microseconds % G_USEC_PER_SEC; - time->tv_sec += microseconds / G_USEC_PER_SEC; - if (time->tv_usec >= G_USEC_PER_SEC) + time_->tv_usec += microseconds % G_USEC_PER_SEC; + time_->tv_sec += microseconds / G_USEC_PER_SEC; + if (time_->tv_usec >= G_USEC_PER_SEC) { - time->tv_usec -= G_USEC_PER_SEC; - time->tv_sec++; + time_->tv_usec -= G_USEC_PER_SEC; + time_->tv_sec++; } } else { microseconds *= -1; - time->tv_usec -= microseconds % G_USEC_PER_SEC; - time->tv_sec -= microseconds / G_USEC_PER_SEC; - if (time->tv_usec < 0) + time_->tv_usec -= microseconds % G_USEC_PER_SEC; + time_->tv_sec -= microseconds / G_USEC_PER_SEC; + if (time_->tv_usec < 0) { - time->tv_usec += G_USEC_PER_SEC; - time->tv_sec--; + time_->tv_usec += G_USEC_PER_SEC; + time_->tv_sec--; } } } diff --git a/glib/gutils.c b/glib/gutils.c index 060d27914..71761cb95 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -976,6 +976,8 @@ static gchar *g_application_name = NULL; * been called). * * Return value: human-readable application name. may return %NULL + * + * Since: 2.2 **/ G_CONST_RETURN gchar* g_get_application_name (void)