From 10f5201f8b585ca26c398c449387be411d983eb1 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Wed, 9 Nov 2016 17:42:49 +0100 Subject: gir: Update annotations from GLib git master --- gir/gio-2.0.c | 2 +- gir/glib-2.0.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 9b692a90..77e7e0f3 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -4937,7 +4937,7 @@ * * If used, the expected form of an application identifier is very close * to that of of a - * [DBus bus name](http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names-interface). + * [D-Bus bus name](http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names-interface). * Examples include: "com.example.MyApp", "org.example.internal-apps.Calculator". * For details on valid application identifiers, see g_application_id_is_valid(). * diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index a9e46c2a..7c8f82f7 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -3447,8 +3447,9 @@ /** * G_GNUC_PRINTF: * @format_idx: the index of the argument corresponding to the - * format string (The arguments are numbered from 1) - * @arg_idx: the index of the first of the format arguments + * format string (the arguments are numbered from 1) + * @arg_idx: the index of the first of the format arguments, or 0 if + * there are no format arguments * * Expands to the GNU C format function attribute if the compiler is gcc. * This is used for declaring functions which take a variable number of @@ -3458,7 +3459,9 @@ * Place the attribute after the function declaration, just before the * semicolon. * - * See the GNU C documentation for more details. + * See the + * [GNU C documentation](https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-Wformat-3288) + * for more details. * * |[ * gint g_snprintf (gchar *string, @@ -3487,15 +3490,18 @@ /** * G_GNUC_SCANF: * @format_idx: the index of the argument corresponding to - * the format string (The arguments are numbered from 1) - * @arg_idx: the index of the first of the format arguments + * the format string (the arguments are numbered from 1) + * @arg_idx: the index of the first of the format arguments, or 0 if + * there are no format arguments * * Expands to the GNU C format function attribute if the compiler is gcc. * This is used for declaring functions which take a variable number of * arguments, with the same syntax as scanf(). It allows the compiler * to type-check the arguments passed to the function. * - * See the GNU C documentation for details. + * See the + * [GNU C documentation](https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-Wformat-3288) + * for details. */ -- cgit v1.2.1