Minor doc fix

This commit is contained in:
Matthias Clasen
2009-07-05 23:55:00 -04:00
parent 563c55bb71
commit d5a5130519

View File

@@ -21,7 +21,7 @@
* Modified by the GLib Team and others 1997-2000. See the AUTHORS * Modified by the GLib Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GLib Team. See the ChangeLog * file for a list of people on the GLib Team. See the ChangeLog
* files for a list of changes. These files are distributed with * files for a list of changes. These files are distributed with
* GLib at ftp://ftp.gtk.org/pub/gtk/. * GLib at ftp://ftp.gtk.org/pub/gtk/.
*/ */
#include "config.h" #include "config.h"
@@ -35,7 +35,7 @@
* @domain: error domain * @domain: error domain
* @code: error code * @code: error code
* @format: printf()-style format for error message * @format: printf()-style format for error message
* @var_args: #va_list of parameters for the message format * @args: #va_list of parameters for the message format
* *
* Creates a new #GError with the given @domain and @code, * Creates a new #GError with the given @domain and @code,
* and a message formatted with @format. * and a message formatted with @format.
@@ -43,36 +43,36 @@
* Returns: a new #GError * Returns: a new #GError
* *
* Since: 2.22 * Since: 2.22
**/ */
GError* GError*
g_error_new_valist (GQuark domain, g_error_new_valist (GQuark domain,
gint code, gint code,
const gchar *format, const gchar *format,
va_list args) va_list args)
{ {
GError *error; GError *error;
error = g_slice_new (GError); error = g_slice_new (GError);
error->domain = domain; error->domain = domain;
error->code = code; error->code = code;
error->message = g_strdup_vprintf (format, args); error->message = g_strdup_vprintf (format, args);
return error; return error;
} }
/** /**
* g_error_new: * g_error_new:
* @domain: error domain * @domain: error domain
* @code: error code * @code: error code
* @format: printf()-style format for error message * @format: printf()-style format for error message
* @Varargs: parameters for message format * @Varargs: parameters for message format
* *
* Creates a new #GError with the given @domain and @code, * Creates a new #GError with the given @domain and @code,
* and a message formatted with @format. * and a message formatted with @format.
* *
* Return value: a new #GError * Return value: a new #GError
**/ */
GError* GError*
g_error_new (GQuark domain, g_error_new (GQuark domain,
gint code, gint code,
@@ -97,12 +97,12 @@ g_error_new (GQuark domain,
* @domain: error domain * @domain: error domain
* @code: error code * @code: error code
* @message: error message * @message: error message
* *
* Creates a new #GError; unlike g_error_new(), @message is not * Creates a new #GError; unlike g_error_new(), @message is
* a printf()-style format string. Use this * not a printf()-style format string. Use this function if
* function if @message contains text you don't have control over, * @message contains text you don't have control over,
* that could include printf() escape sequences. * that could include printf() escape sequences.
* *
* Return value: a new #GError * Return value: a new #GError
**/ **/
GError* GError*
@@ -120,7 +120,7 @@ g_error_new_literal (GQuark domain,
err->domain = domain; err->domain = domain;
err->code = code; err->code = code;
err->message = g_strdup (message); err->message = g_strdup (message);
return err; return err;
} }
@@ -129,12 +129,11 @@ g_error_new_literal (GQuark domain,
* @error: a #GError * @error: a #GError
* *
* Frees a #GError and associated resources. * Frees a #GError and associated resources.
* */
**/
void void
g_error_free (GError *error) g_error_free (GError *error)
{ {
g_return_if_fail (error != NULL); g_return_if_fail (error != NULL);
g_free (error->message); g_free (error->message);
@@ -144,16 +143,16 @@ g_error_free (GError *error)
/** /**
* g_error_copy: * g_error_copy:
* @error: a #GError * @error: a #GError
* *
* Makes a copy of @error. * Makes a copy of @error.
* *
* Return value: a new #GError * Return value: a new #GError
**/ */
GError* GError*
g_error_copy (const GError *error) g_error_copy (const GError *error)
{ {
GError *copy; GError *copy;
g_return_val_if_fail (error != NULL, NULL); g_return_val_if_fail (error != NULL, NULL);
copy = g_slice_new (GError); copy = g_slice_new (GError);
@@ -170,12 +169,12 @@ g_error_copy (const GError *error)
* @error: a #GError * @error: a #GError
* @domain: an error domain * @domain: an error domain
* @code: an error code * @code: an error code
* *
* Returns %TRUE if @error matches @domain and @code, %FALSE * Returns %TRUE if @error matches @domain and @code, %FALSE
* otherwise. * otherwise.
* *
* Return value: whether @error has @domain and @code * Return value: whether @error has @domain and @code
**/ */
gboolean gboolean
g_error_matches (const GError *error, g_error_matches (const GError *error,
GQuark domain, GQuark domain,
@@ -194,13 +193,13 @@ g_error_matches (const GError *error,
* g_set_error: * g_set_error:
* @err: a return location for a #GError, or %NULL * @err: a return location for a #GError, or %NULL
* @domain: error domain * @domain: error domain
* @code: error code * @code: error code
* @format: printf()-style format * @format: printf()-style format
* @Varargs: args for @format * @Varargs: args for @format
* *
* Does nothing if @err is %NULL; if @err is non-%NULL, then *@err must * Does nothing if @err is %NULL; if @err is non-%NULL, then *@err
* be %NULL. A new #GError is created and assigned to *@err. * must be %NULL. A new #GError is created and assigned to *@err.
**/ */
void void
g_set_error (GError **err, g_set_error (GError **err,
GQuark domain, GQuark domain,
@@ -209,12 +208,12 @@ g_set_error (GError **err,
...) ...)
{ {
GError *new; GError *new;
va_list args; va_list args;
if (err == NULL) if (err == NULL)
return; return;
va_start (args, format); va_start (args, format);
new = g_error_new_valist (domain, code, format, args); new = g_error_new_valist (domain, code, format, args);
va_end (args); va_end (args);
@@ -222,24 +221,24 @@ g_set_error (GError **err,
if (*err == NULL) if (*err == NULL)
*err = new; *err = new;
else else
g_warning (ERROR_OVERWRITTEN_WARNING, new->message); g_warning (ERROR_OVERWRITTEN_WARNING, new->message);
} }
/** /**
* g_set_error_literal: * g_set_error_literal:
* @err: a return location for a #GError, or %NULL * @err: a return location for a #GError, or %NULL
* @domain: error domain * @domain: error domain
* @code: error code * @code: error code
* @message: error message * @message: error message
* *
* Does nothing if @err is %NULL; if @err is non-%NULL, then *@err must * Does nothing if @err is %NULL; if @err is non-%NULL, then *@err
* be %NULL. A new #GError is created and assigned to *@err. * must be %NULL. A new #GError is created and assigned to *@err.
* Unlike g_set_error(), @message is not a printf()-style format string. * Unlike g_set_error(), @message is not a printf()-style format string.
* Use this function if @message contains text you don't have control over, * Use this function if @message contains text you don't have control over,
* that could include printf() escape sequences. * that could include printf() escape sequences.
* *
* Since: 2.18 * Since: 2.18
**/ */
void void
g_set_error_literal (GError **err, g_set_error_literal (GError **err,
GQuark domain, GQuark domain,
@@ -247,7 +246,7 @@ g_set_error_literal (GError **err,
const gchar *message) const gchar *message)
{ {
GError *new; GError *new;
if (err == NULL) if (err == NULL)
return; return;
@@ -255,7 +254,7 @@ g_set_error_literal (GError **err,
if (*err == NULL) if (*err == NULL)
*err = new; *err = new;
else else
g_warning (ERROR_OVERWRITTEN_WARNING, new->message); g_warning (ERROR_OVERWRITTEN_WARNING, new->message);
} }
/** /**
@@ -265,13 +264,13 @@ g_set_error_literal (GError **err,
* *
* If @dest is %NULL, free @src; otherwise, moves @src into *@dest. * If @dest is %NULL, free @src; otherwise, moves @src into *@dest.
* The error variable @dest points to must be %NULL. * The error variable @dest points to must be %NULL.
**/ */
void void
g_propagate_error (GError **dest, g_propagate_error (GError **dest,
GError *src) GError *src)
{ {
g_return_if_fail (src != NULL); g_return_if_fail (src != NULL);
if (dest == NULL) if (dest == NULL)
{ {
if (src) if (src)
@@ -290,10 +289,10 @@ g_propagate_error (GError **dest,
/** /**
* g_clear_error: * g_clear_error:
* @err: a #GError return location * @err: a #GError return location
* *
* If @err is %NULL, does nothing. If @err is non-%NULL, * If @err is %NULL, does nothing. If @err is non-%NULL,
* calls g_error_free() on *@err and sets *@err to %NULL. * calls g_error_free() on *@err and sets *@err to %NULL.
**/ */
void void
g_clear_error (GError **err) g_clear_error (GError **err)
{ {
@@ -337,7 +336,7 @@ g_error_add_prefix (gchar **string,
* to you. * to you.
* *
* Since: 2.16 * Since: 2.16
**/ */
void void
g_prefix_error (GError **err, g_prefix_error (GError **err,
const gchar *format, const gchar *format,
@@ -359,10 +358,10 @@ g_prefix_error (GError **err,
* @src: error to move into the return location * @src: error to move into the return location
* @format: printf()-style format string * @format: printf()-style format string
* @...: arguments to @format * @...: arguments to @format
* *
* If @dest is %NULL, free @src; otherwise, * If @dest is %NULL, free @src; otherwise,
* moves @src into *@dest. *@dest must be %NULL. * moves @src into *@dest. *@dest must be %NULL.
* After the move, add a prefix as with * After the move, add a prefix as with
* g_prefix_error(). * g_prefix_error().
* *
* Since: 2.16 * Since: 2.16