From: Soeren Sandmann Date: Fri, 8 Nov 2002 18:47:56 +0000 (+0000) Subject: Trivial s/foo/foo_/ fixes to make includable with -Wshadow X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=d201974f56d7b805f70b5c5703be79e8db73526e;p=dana%2Fcg-glib.git Trivial s/foo/foo_/ fixes to make includable with -Wshadow Fri Nov 8 19:44:20 2002 Soeren Sandmann * docs/reference/glib/tmpl/arrays.sgml: * docs/reference/glib/tmpl/arrays_byte.sgml: * docs/reference/glib/tmpl/arrays_pointer.sgml: * docs/reference/glib/tmpl/date.sgml: * docs/reference/glib/tmpl/linked_lists_double.sgml: * docs/reference/glib/tmpl/linked_lists_single.sgml: * docs/reference/glib/tmpl/main.sgml: * docs/reference/glib/tmpl/queue.sgml: * docs/reference/glib/tmpl/random_numbers.sgml: * docs/reference/glib/tmpl/relations.sgml: * docs/reference/glib/tmpl/scanner.sgml: * docs/reference/gobject/tmpl/gtype.sgml: * docs/reference/gobject/tmpl/value_arrays.sgml glib/garray.h: * glib/gdate.h glib/giochannel.h glib/glist.h glib/gmain.c: * glib/gmain.h glib/gqueue.c glib/gqueue.h glib/grand.c glib/grand.h: * glib/grel.h glib/gslist.h glib/gtimer.h gobject/gvaluearray.h: Trivial s/foo/foo_/ fixes to make includable with -Wshadow without warnings (#91680) --- diff --git a/ChangeLog b/ChangeLog index 7c65eae8..87ceb0f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +Fri Nov 8 19:44:20 2002 Soeren Sandmann + + * docs/reference/glib/tmpl/arrays.sgml: + * docs/reference/glib/tmpl/arrays_byte.sgml: + * docs/reference/glib/tmpl/arrays_pointer.sgml: + * docs/reference/glib/tmpl/date.sgml: + * docs/reference/glib/tmpl/linked_lists_double.sgml: + * docs/reference/glib/tmpl/linked_lists_single.sgml: + * docs/reference/glib/tmpl/main.sgml: + * docs/reference/glib/tmpl/queue.sgml: + * docs/reference/glib/tmpl/random_numbers.sgml: + * docs/reference/glib/tmpl/relations.sgml: + * docs/reference/glib/tmpl/scanner.sgml: + * docs/reference/gobject/tmpl/gtype.sgml: + * docs/reference/gobject/tmpl/value_arrays.sgml glib/garray.h: + * glib/gdate.h glib/giochannel.h glib/glist.h glib/gmain.c: + * glib/gmain.h glib/gqueue.c glib/gqueue.h glib/grand.c glib/grand.h: + * glib/grel.h glib/gslist.h glib/gtimer.h gobject/gvaluearray.h: + + Trivial s/foo/foo_/ fixes to make includable with + -Wshadow without warnings (#91680) + Thu Nov 7 19:32:26 2002 Owen Taylor * glib/gutils.[ch] (g_set/get_application_name): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7c65eae8..87ceb0f1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,25 @@ +Fri Nov 8 19:44:20 2002 Soeren Sandmann + + * docs/reference/glib/tmpl/arrays.sgml: + * docs/reference/glib/tmpl/arrays_byte.sgml: + * docs/reference/glib/tmpl/arrays_pointer.sgml: + * docs/reference/glib/tmpl/date.sgml: + * docs/reference/glib/tmpl/linked_lists_double.sgml: + * docs/reference/glib/tmpl/linked_lists_single.sgml: + * docs/reference/glib/tmpl/main.sgml: + * docs/reference/glib/tmpl/queue.sgml: + * docs/reference/glib/tmpl/random_numbers.sgml: + * docs/reference/glib/tmpl/relations.sgml: + * docs/reference/glib/tmpl/scanner.sgml: + * docs/reference/gobject/tmpl/gtype.sgml: + * docs/reference/gobject/tmpl/value_arrays.sgml glib/garray.h: + * glib/gdate.h glib/giochannel.h glib/glist.h glib/gmain.c: + * glib/gmain.h glib/gqueue.c glib/gqueue.h glib/grand.c glib/grand.h: + * glib/grel.h glib/gslist.h glib/gtimer.h gobject/gvaluearray.h: + + Trivial s/foo/foo_/ fixes to make includable with + -Wshadow without warnings (#91680) + Thu Nov 7 19:32:26 2002 Owen Taylor * glib/gutils.[ch] (g_set/get_application_name): diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 7c65eae8..87ceb0f1 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,25 @@ +Fri Nov 8 19:44:20 2002 Soeren Sandmann + + * docs/reference/glib/tmpl/arrays.sgml: + * docs/reference/glib/tmpl/arrays_byte.sgml: + * docs/reference/glib/tmpl/arrays_pointer.sgml: + * docs/reference/glib/tmpl/date.sgml: + * docs/reference/glib/tmpl/linked_lists_double.sgml: + * docs/reference/glib/tmpl/linked_lists_single.sgml: + * docs/reference/glib/tmpl/main.sgml: + * docs/reference/glib/tmpl/queue.sgml: + * docs/reference/glib/tmpl/random_numbers.sgml: + * docs/reference/glib/tmpl/relations.sgml: + * docs/reference/glib/tmpl/scanner.sgml: + * docs/reference/gobject/tmpl/gtype.sgml: + * docs/reference/gobject/tmpl/value_arrays.sgml glib/garray.h: + * glib/gdate.h glib/giochannel.h glib/glist.h glib/gmain.c: + * glib/gmain.h glib/gqueue.c glib/gqueue.h glib/grand.c glib/grand.h: + * glib/grel.h glib/gslist.h glib/gtimer.h gobject/gvaluearray.h: + + Trivial s/foo/foo_/ fixes to make includable with + -Wshadow without warnings (#91680) + Thu Nov 7 19:32:26 2002 Owen Taylor * glib/gutils.[ch] (g_set/get_application_name): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7c65eae8..87ceb0f1 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,25 @@ +Fri Nov 8 19:44:20 2002 Soeren Sandmann + + * docs/reference/glib/tmpl/arrays.sgml: + * docs/reference/glib/tmpl/arrays_byte.sgml: + * docs/reference/glib/tmpl/arrays_pointer.sgml: + * docs/reference/glib/tmpl/date.sgml: + * docs/reference/glib/tmpl/linked_lists_double.sgml: + * docs/reference/glib/tmpl/linked_lists_single.sgml: + * docs/reference/glib/tmpl/main.sgml: + * docs/reference/glib/tmpl/queue.sgml: + * docs/reference/glib/tmpl/random_numbers.sgml: + * docs/reference/glib/tmpl/relations.sgml: + * docs/reference/glib/tmpl/scanner.sgml: + * docs/reference/gobject/tmpl/gtype.sgml: + * docs/reference/gobject/tmpl/value_arrays.sgml glib/garray.h: + * glib/gdate.h glib/giochannel.h glib/glist.h glib/gmain.c: + * glib/gmain.h glib/gqueue.c glib/gqueue.h glib/grand.c glib/grand.h: + * glib/grel.h glib/gslist.h glib/gtimer.h gobject/gvaluearray.h: + + Trivial s/foo/foo_/ fixes to make includable with + -Wshadow without warnings (#91680) + Thu Nov 7 19:32:26 2002 Owen Taylor * glib/gutils.[ch] (g_set/get_application_name): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7c65eae8..87ceb0f1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,25 @@ +Fri Nov 8 19:44:20 2002 Soeren Sandmann + + * docs/reference/glib/tmpl/arrays.sgml: + * docs/reference/glib/tmpl/arrays_byte.sgml: + * docs/reference/glib/tmpl/arrays_pointer.sgml: + * docs/reference/glib/tmpl/date.sgml: + * docs/reference/glib/tmpl/linked_lists_double.sgml: + * docs/reference/glib/tmpl/linked_lists_single.sgml: + * docs/reference/glib/tmpl/main.sgml: + * docs/reference/glib/tmpl/queue.sgml: + * docs/reference/glib/tmpl/random_numbers.sgml: + * docs/reference/glib/tmpl/relations.sgml: + * docs/reference/glib/tmpl/scanner.sgml: + * docs/reference/gobject/tmpl/gtype.sgml: + * docs/reference/gobject/tmpl/value_arrays.sgml glib/garray.h: + * glib/gdate.h glib/giochannel.h glib/glist.h glib/gmain.c: + * glib/gmain.h glib/gqueue.c glib/gqueue.h glib/grand.c glib/grand.h: + * glib/grel.h glib/gslist.h glib/gtimer.h gobject/gvaluearray.h: + + Trivial s/foo/foo_/ fixes to make includable with + -Wshadow without warnings (#91680) + Thu Nov 7 19:32:26 2002 Owen Taylor * glib/gutils.[ch] (g_set/get_application_name): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7c65eae8..87ceb0f1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,25 @@ +Fri Nov 8 19:44:20 2002 Soeren Sandmann + + * docs/reference/glib/tmpl/arrays.sgml: + * docs/reference/glib/tmpl/arrays_byte.sgml: + * docs/reference/glib/tmpl/arrays_pointer.sgml: + * docs/reference/glib/tmpl/date.sgml: + * docs/reference/glib/tmpl/linked_lists_double.sgml: + * docs/reference/glib/tmpl/linked_lists_single.sgml: + * docs/reference/glib/tmpl/main.sgml: + * docs/reference/glib/tmpl/queue.sgml: + * docs/reference/glib/tmpl/random_numbers.sgml: + * docs/reference/glib/tmpl/relations.sgml: + * docs/reference/glib/tmpl/scanner.sgml: + * docs/reference/gobject/tmpl/gtype.sgml: + * docs/reference/gobject/tmpl/value_arrays.sgml glib/garray.h: + * glib/gdate.h glib/giochannel.h glib/glist.h glib/gmain.c: + * glib/gmain.h glib/gqueue.c glib/gqueue.h glib/grand.c glib/grand.h: + * glib/grel.h glib/gslist.h glib/gtimer.h gobject/gvaluearray.h: + + Trivial s/foo/foo_/ fixes to make includable with + -Wshadow without warnings (#91680) + Thu Nov 7 19:32:26 2002 Owen Taylor * glib/gutils.[ch] (g_set/get_application_name): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7c65eae8..87ceb0f1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,25 @@ +Fri Nov 8 19:44:20 2002 Soeren Sandmann + + * docs/reference/glib/tmpl/arrays.sgml: + * docs/reference/glib/tmpl/arrays_byte.sgml: + * docs/reference/glib/tmpl/arrays_pointer.sgml: + * docs/reference/glib/tmpl/date.sgml: + * docs/reference/glib/tmpl/linked_lists_double.sgml: + * docs/reference/glib/tmpl/linked_lists_single.sgml: + * docs/reference/glib/tmpl/main.sgml: + * docs/reference/glib/tmpl/queue.sgml: + * docs/reference/glib/tmpl/random_numbers.sgml: + * docs/reference/glib/tmpl/relations.sgml: + * docs/reference/glib/tmpl/scanner.sgml: + * docs/reference/gobject/tmpl/gtype.sgml: + * docs/reference/gobject/tmpl/value_arrays.sgml glib/garray.h: + * glib/gdate.h glib/giochannel.h glib/glist.h glib/gmain.c: + * glib/gmain.h glib/gqueue.c glib/gqueue.h glib/grand.c glib/grand.h: + * glib/grel.h glib/gslist.h glib/gtimer.h gobject/gvaluearray.h: + + Trivial s/foo/foo_/ fixes to make includable with + -Wshadow without warnings (#91680) + Thu Nov 7 19:32:26 2002 Owen Taylor * glib/gutils.[ch] (g_set/get_application_name): diff --git a/docs/reference/glib/tmpl/arrays.sgml b/docs/reference/glib/tmpl/arrays.sgml index 3f360e14..6602e13b 100644 --- a/docs/reference/glib/tmpl/arrays.sgml +++ b/docs/reference/glib/tmpl/arrays.sgml @@ -71,7 +71,7 @@ Creates a new #GArray. @zero_terminated: %TRUE if the array should have an extra element at the end which is set to 0. -@clear: %TRUE if #GArray elements should be automatically cleared to 0 +@clear_: %TRUE if #GArray elements should be automatically cleared to 0 when they are allocated. @element_size: the size of each element in bytes. @Returns: the new #GArray. @@ -86,7 +86,7 @@ array is still 0. @zero_terminated: %TRUE if the array should have an extra element at the end with all bits cleared. -@clear: %TRUE if all bits in the array should be cleared to 0 on allocation. +@clear_: %TRUE if all bits in the array should be cleared to 0 on allocation. @element_size: size of each element in the array. @reserved_size: number of elements preallocated. @Returns: the new #GArray. @@ -182,7 +182,7 @@ Inserts @len elements into a #GArray at the given index. @array: a #GArray. -@index: the index to place the elements at. +@index_: the index to place the elements at. @data: a pointer to the elements to insert. @len: the number of elements to insert. @Returns: the #GArray. @@ -195,7 +195,7 @@ The following elements are moved down one place. @array: a #GArray. -@index: the index of the element to remove. +@index_: the index of the element to remove. @Returns: the #GArray. @@ -208,7 +208,7 @@ g_array_remove_index(). @array: a @GArray. -@index: the index of the element to remove. +@index_: the index of the element to remove. @Returns: the #GArray. @@ -260,7 +260,7 @@ The return value is cast to the given type. Sets the size of the array, expanding it if necessary. -If the array was created with @clear set to %TRUE, the new elements are set to 0. +If the array was created with @clear_ set to %TRUE, the new elements are set to 0. @array: a #GArray. diff --git a/docs/reference/glib/tmpl/arrays_byte.sgml b/docs/reference/glib/tmpl/arrays_byte.sgml index dedb301e..5614edf4 100644 --- a/docs/reference/glib/tmpl/arrays_byte.sgml +++ b/docs/reference/glib/tmpl/arrays_byte.sgml @@ -108,7 +108,7 @@ The following bytes are moved down one place. @array: a #GByteArray. -@index: the index of the byte to remove. +@index_: the index of the byte to remove. @Returns: the #GByteArray. @@ -121,7 +121,7 @@ g_byte_array_remove_index(). @array: a #GByteArray. -@index: the index of the byte to remove. +@index_: the index of the byte to remove. @Returns: the #GByteArray. diff --git a/docs/reference/glib/tmpl/arrays_pointer.sgml b/docs/reference/glib/tmpl/arrays_pointer.sgml index 889628b5..0222cfc3 100644 --- a/docs/reference/glib/tmpl/arrays_pointer.sgml +++ b/docs/reference/glib/tmpl/arrays_pointer.sgml @@ -121,7 +121,7 @@ The following elements are moved down one place. @array: a #GPtrArray. -@index: the index of the pointer to remove. +@index_: the index of the pointer to remove. @Returns: the pointer which was removed. @@ -151,7 +151,7 @@ g_ptr_array_remove_index(). @array: a #GPtrArray. -@index: the index of the pointer to remove. +@index_: the index of the pointer to remove. @Returns: the pointer which was removed. @@ -192,7 +192,7 @@ Returns the pointer at the given index of the pointer array. @array: a #GPtrArray. -@index: the index of the pointer to return. +@index_: the index of the pointer to return. @Returns: the pointer at the given index. diff --git a/docs/reference/glib/tmpl/date.sgml b/docs/reference/glib/tmpl/date.sgml index 0f6bf0b8..6fcec997 100644 --- a/docs/reference/glib/tmpl/date.sgml +++ b/docs/reference/glib/tmpl/date.sgml @@ -107,7 +107,7 @@ length of the sleep. -@time: +@time_: @microseconds: @@ -334,7 +334,7 @@ g_date_set_time (date, time (NULL)); @date: a #GDate. -@time: #GTime value to set. +@time_: #GTime value to set. diff --git a/docs/reference/glib/tmpl/linked_lists_double.sgml b/docs/reference/glib/tmpl/linked_lists_double.sgml index be76f7b2..5da5cb98 100644 --- a/docs/reference/glib/tmpl/linked_lists_double.sgml +++ b/docs/reference/glib/tmpl/linked_lists_double.sgml @@ -193,11 +193,11 @@ self-contained list with one element. -Deletes the node @link from @list. +Deletes the node @link_ from @list. @list: a #GList. -@link: node to delete from @list. +@link_: node to delete from @list. @Returns: the new head of @list. diff --git a/docs/reference/glib/tmpl/linked_lists_single.sgml b/docs/reference/glib/tmpl/linked_lists_single.sgml index 0c09e4f5..8a3db2e1 100644 --- a/docs/reference/glib/tmpl/linked_lists_single.sgml +++ b/docs/reference/glib/tmpl/linked_lists_single.sgml @@ -195,7 +195,7 @@ self-contained list with one element. @list: a #GSList. -@link: an element in the #GSList. +@link_: an element in the #GSList. @Returns: the new start of the #GSList, without the element. @@ -205,7 +205,7 @@ Deletes a node of @list. Returns the new list head. @list: a #GSList. -@link: node to delete. +@link_: node to delete. @Returns: new head of @list. diff --git a/docs/reference/glib/tmpl/main.sgml b/docs/reference/glib/tmpl/main.sgml index ce5a12fe..79d938ca 100644 --- a/docs/reference/glib/tmpl/main.sgml +++ b/docs/reference/glib/tmpl/main.sgml @@ -429,7 +429,7 @@ g_main_context_pending(). @context: @max_priority: -@timeout: +@timeout_: @fds: @n_fds: @Returns: @@ -482,7 +482,7 @@ The semantics of the function should match those of the @ufds: an array of #GPollFD elements. @nfsd: the number of elements in @ufds. -@timeout: the maximum time to wait for an event of the file descriptors. +@timeout_: the maximum time to wait for an event of the file descriptors. A negative value indicates an infinite timeout. @Returns: the number of #GPollFD elements which have events or errors reported, or -1 if an error occurred. @@ -648,10 +648,10 @@ event sources in a generic manner. Called before all the file descriptors are polled. If the source can determine that it is ready here (without waiting for the results of the poll() call) it should return %TRUE. -It can also return a @timeout value which should be the maximum timeout +It can also return a @timeout_ value which should be the maximum timeout (in milliseconds) which should be passed to the poll() call. The actual timeout used will be -1 if all sources returned -1, or it will -be the minimum of all the @timeout values returned which were >= 0. +be the minimum of all the @timeout_ values returned which were >= 0. diff --git a/docs/reference/glib/tmpl/queue.sgml b/docs/reference/glib/tmpl/queue.sgml index 99427ede..3846eec6 100644 --- a/docs/reference/glib/tmpl/queue.sgml +++ b/docs/reference/glib/tmpl/queue.sgml @@ -129,7 +129,7 @@ Contains the public fields of a Queue. @queue: -@link: +@link_: @@ -138,7 +138,7 @@ Contains the public fields of a Queue. @queue: -@link: +@link_: diff --git a/docs/reference/glib/tmpl/random_numbers.sgml b/docs/reference/glib/tmpl/random_numbers.sgml index cfa1ee3a..ada8a85a 100644 --- a/docs/reference/glib/tmpl/random_numbers.sgml +++ b/docs/reference/glib/tmpl/random_numbers.sgml @@ -60,37 +60,37 @@ accessed through the g_rand_* functions. -@rand: +@rand_: -@rand: +@rand_: @seed: -Returns a random #gboolean from @rand. This corresponds to a unbiased +Returns a random #gboolean from @rand_. This corresponds to a unbiased coin toss. -@rand: a #GRand. +@rand_: a #GRand. @Returns: a random #gboolean. -@rand: +@rand_: @Returns: -@rand: +@rand_: @begin: @end: @Returns: @@ -99,14 +99,14 @@ coin toss. -@rand: +@rand_: @Returns: -@rand: +@rand_: @begin: @end: @Returns: diff --git a/docs/reference/glib/tmpl/relations.sgml b/docs/reference/glib/tmpl/relations.sgml index 70b7ce61..102f0fb4 100644 --- a/docs/reference/glib/tmpl/relations.sgml +++ b/docs/reference/glib/tmpl/relations.sgml @@ -194,7 +194,7 @@ The returned value should not be changed. @tuples: the tuple data, returned by g_relation_select(). -@index: the index of the record. +@index_: the index of the record. @field: the field to return. @Returns: the field of the record. diff --git a/docs/reference/glib/tmpl/scanner.sgml b/docs/reference/glib/tmpl/scanner.sgml index 4488296f..9b0ed99f 100644 --- a/docs/reference/glib/tmpl/scanner.sgml +++ b/docs/reference/glib/tmpl/scanner.sgml @@ -214,6 +214,7 @@ is searched for in the default scope in addition to the current scope @char_2_token: @symbol_2_token: @scope_0_fallback: +@store_int64: @padding_dummy: diff --git a/docs/reference/gobject/tmpl/gtype.sgml b/docs/reference/gobject/tmpl/gtype.sgml index 092b1f1e..85837d59 100644 --- a/docs/reference/gobject/tmpl/gtype.sgml +++ b/docs/reference/gobject/tmpl/gtype.sgml @@ -730,6 +730,16 @@ g_free()ed after use. @Returns: Newly allocated and 0-terminated array of interface types. + + + + + +@interface_type: +@n_prerequisites: +@Returns: + + diff --git a/docs/reference/gobject/tmpl/value_arrays.sgml b/docs/reference/gobject/tmpl/value_arrays.sgml index b9e6219b..643fe571 100644 --- a/docs/reference/gobject/tmpl/value_arrays.sgml +++ b/docs/reference/gobject/tmpl/value_arrays.sgml @@ -25,12 +25,12 @@ in order for it to be used as a boxed type through %G_TYPE_VALUE_ARRAY. -Return a pointer to the value at @index containd in @value_array. +Return a pointer to the value at @index_ containd in @value_array. @value_array: #GValueArray to get a value from -@index: index of the value of interest -@Returns: pointer to a value at @index in @value_array +@index_: index of the value of interest +@Returns: pointer to a value at @index_ in @value_array @@ -88,18 +88,18 @@ Insert a copy of @value at specified position into @value_array. @value_array: #GValueArray to add an element to -@index: insertion position, must be <= value_array->n_values +@index_: insertion position, must be <= value_array->n_values @value: #GValue to copy into #GValueArray @Returns: the #GValueArray passed in as @value_array -Remove the value at position @index from @value_array. +Remove the value at position @index_ from @value_array. @value_array: #GValueArray to remove an element from -@index: position of value to remove, must be < value_array->n_values +@index_: position of value to remove, must be < value_array->n_values @Returns: the #GValueArray passed in as @value_array diff --git a/glib/garray.h b/glib/garray.h index 80421830..bccd91a8 100644 --- a/glib/garray.h +++ b/glib/garray.h @@ -64,10 +64,10 @@ struct _GPtrArray #define g_array_index(a,t,i) (((t*) (a)->data) [(i)]) GArray* g_array_new (gboolean zero_terminated, - gboolean clear, + gboolean clear_, guint element_size); GArray* g_array_sized_new (gboolean zero_terminated, - gboolean clear, + gboolean clear_, guint element_size, guint reserved_size); gchar* g_array_free (GArray *array, @@ -79,15 +79,15 @@ GArray* g_array_prepend_vals (GArray *array, gconstpointer data, guint len); GArray* g_array_insert_vals (GArray *array, - guint index, + guint index_, gconstpointer data, guint len); GArray* g_array_set_size (GArray *array, guint length); GArray* g_array_remove_index (GArray *array, - guint index); + guint index_); GArray* g_array_remove_index_fast (GArray *array, - guint index); + guint index_); void g_array_sort (GArray *array, GCompareFunc compare_func); void g_array_sort_with_data (GArray *array, @@ -99,7 +99,7 @@ void g_array_sort_with_data (GArray *array, * cleared spot and shortens the array. remove_fast will again distort * order. */ -#define g_ptr_array_index(array,index) ((array)->pdata)[index] +#define g_ptr_array_index(array,index_) ((array)->pdata)[index_] GPtrArray* g_ptr_array_new (void); GPtrArray* g_ptr_array_sized_new (guint reserved_size); gpointer* g_ptr_array_free (GPtrArray *array, @@ -107,9 +107,9 @@ gpointer* g_ptr_array_free (GPtrArray *array, void g_ptr_array_set_size (GPtrArray *array, gint length); gpointer g_ptr_array_remove_index (GPtrArray *array, - guint index); + guint index_); gpointer g_ptr_array_remove_index_fast (GPtrArray *array, - guint index); + guint index_); gboolean g_ptr_array_remove (GPtrArray *array, gpointer data); gboolean g_ptr_array_remove_fast (GPtrArray *array, @@ -140,9 +140,9 @@ GByteArray* g_byte_array_prepend (GByteArray *array, GByteArray* g_byte_array_set_size (GByteArray *array, guint length); GByteArray* g_byte_array_remove_index (GByteArray *array, - guint index); + guint index_); GByteArray* g_byte_array_remove_index_fast (GByteArray *array, - guint index); + guint index_); void g_byte_array_sort (GByteArray *array, GCompareFunc compare_func); void g_byte_array_sort_with_data (GByteArray *array, diff --git a/glib/gdate.h b/glib/gdate.h index 96d827f6..2b5eb324 100644 --- a/glib/gdate.h +++ b/glib/gdate.h @@ -165,7 +165,7 @@ void g_date_clear (GDate *date, void g_date_set_parse (GDate *date, const gchar *str); void g_date_set_time (GDate *date, - GTime time); + GTime time_); void g_date_set_month (GDate *date, GDateMonth month); void g_date_set_day (GDate *date, diff --git a/glib/giochannel.h b/glib/giochannel.h index b368ef74..d8da2519 100644 --- a/glib/giochannel.h +++ b/glib/giochannel.h @@ -313,7 +313,7 @@ void g_io_channel_win32_make_pollfd (GIOChannel *channel, */ gint g_io_channel_win32_poll (GPollFD *fds, gint n_fds, - gint timeout); + gint timeout_); /* This is used to add polling for Windows messages. GDK (GTk+) programs * should *not* use this. diff --git a/glib/glist.h b/glib/glist.h index e434d695..9434dde6 100644 --- a/glib/glist.h +++ b/glib/glist.h @@ -69,7 +69,7 @@ GList* g_list_remove_all (GList *list, GList* g_list_remove_link (GList *list, GList *llink); GList* g_list_delete_link (GList *list, - GList *link); + GList *link_); GList* g_list_reverse (GList *list); GList* g_list_copy (GList *list); GList* g_list_nth (GList *list, diff --git a/glib/gmain.c b/glib/gmain.c index 9f6eeac6..c8d0011d 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -2002,7 +2002,7 @@ g_main_context_prepare (GMainContext *context, * g_main_context_query: * @context: a #GMainContext * @max_priority: maximum priority source to check - * @timeout: location to store timeout to be used in polling + * @timeout_: location to store timeout to be used in polling * @fds: location to store #GPollFD records that need to be polled. * @n_fds: length of @fds. * diff --git a/glib/gmain.h b/glib/gmain.h index 46568b6c..72f3ba90 100644 --- a/glib/gmain.h +++ b/glib/gmain.h @@ -72,7 +72,7 @@ typedef void (*GSourceDummyMarshal) (void); struct _GSourceFuncs { gboolean (*prepare) (GSource *source, - gint *timeout); + gint *timeout_); gboolean (*check) (GSource *source); gboolean (*dispatch) (GSource *source, GSourceFunc callback, @@ -115,7 +115,7 @@ struct _GSourceFuncs typedef struct _GPollFD GPollFD; typedef gint (*GPollFunc) (GPollFD *ufds, guint nfsd, - gint timeout); + gint timeout_); struct _GPollFD { @@ -166,7 +166,7 @@ gboolean g_main_context_prepare (GMainContext *context, gint *priority); gint g_main_context_query (GMainContext *context, gint max_priority, - gint *timeout, + gint *timeout_, GPollFD *fds, gint n_fds); gint g_main_context_check (GMainContext *context, diff --git a/glib/gqueue.c b/glib/gqueue.c index 8c609339..9db4d5c8 100644 --- a/glib/gqueue.c +++ b/glib/gqueue.c @@ -113,7 +113,7 @@ g_queue_push_head (GQueue *queue, /** * g_queue_push_head_link: * @queue: a #GQueue. - * @link: a single #GList element, not a list with + * @link_: a single #GList element, not a list with * more than one element. * * Adds a new element at the head of the queue. @@ -160,7 +160,7 @@ g_queue_push_tail (GQueue *queue, /** * g_queue_push_tail_link: * @queue: a #GQueue. - * @link: a single #GList element, not a list with + * @link_: a single #GList element, not a list with * more than one element. * * Adds a new element at the tail of the queue. diff --git a/glib/gqueue.h b/glib/gqueue.h index 64fd6928..7ce9a251 100644 --- a/glib/gqueue.h +++ b/glib/gqueue.h @@ -54,9 +54,9 @@ gboolean g_queue_is_empty (GQueue *queue); gpointer g_queue_peek_head (GQueue *queue); gpointer g_queue_peek_tail (GQueue *queue); void g_queue_push_head_link (GQueue *queue, - GList *link); + GList *link_); void g_queue_push_tail_link (GQueue *queue, - GList *link); + GList *link_); GList* g_queue_pop_head_link (GQueue *queue); GList* g_queue_pop_tail_link (GQueue *queue); diff --git a/glib/grand.c b/glib/grand.c index 39741a82..58f21079 100644 --- a/glib/grand.c +++ b/glib/grand.c @@ -124,7 +124,7 @@ g_rand_new (void) /** * g_rand_free: - * @rand: a #GRand. + * @rand_: a #GRand. * * Frees the memory allocated for the #GRand. **/ @@ -138,7 +138,7 @@ g_rand_free (GRand* rand) /** * g_rand_set_seed: - * @rand: a #GRand. + * @rand_: a #GRand. * @seed: a value to reinitialize the random number generator. * * Sets the seed for the random number generator #GRand to @seed. @@ -163,9 +163,9 @@ g_rand_set_seed (GRand* rand, guint32 seed) /** * g_rand_int: - * @rand: a #GRand. + * @rand_: a #GRand. * - * Returns the next random #guint32 from @rand equally distributed over + * Returns the next random #guint32 from @rand_ equally distributed over * the range [0..2^32-1]. * * Return value: A random number. @@ -210,11 +210,11 @@ g_rand_int (GRand* rand) /** * g_rand_int_range: - * @rand: a #GRand. + * @rand_: a #GRand. * @begin: lower closed bound of the interval. * @end: upper open bound of the interval. * - * Returns the next random #gint32 from @rand equally distributed over + * Returns the next random #gint32 from @rand_ equally distributed over * the range [@begin..@end-1]. * * Return value: A random number. @@ -262,9 +262,9 @@ g_rand_int_range (GRand* rand, gint32 begin, gint32 end) /** * g_rand_double: - * @rand: a #GRand. + * @rand_: a #GRand. * - * Returns the next random #gdouble from @rand equally distributed over + * Returns the next random #gdouble from @rand_ equally distributed over * the range [0..1). * * Return value: A random number. @@ -287,11 +287,11 @@ g_rand_double (GRand* rand) /** * g_rand_double_range: - * @rand: a #GRand. + * @rand_: a #GRand. * @begin: lower closed bound of the interval. * @end: upper open bound of the interval. * - * Returns the next random #gdouble from @rand equally distributed over + * Returns the next random #gdouble from @rand_ equally distributed over * the range [@begin..@end). * * Return value: A random number. diff --git a/glib/grand.h b/glib/grand.h index d743953f..051d9233 100644 --- a/glib/grand.h +++ b/glib/grand.h @@ -42,34 +42,33 @@ typedef struct _GRand GRand; * double_range -> [begin..end) */ -GRand* g_rand_new_with_seed (guint32 seed); -GRand* g_rand_new (void); -void g_rand_free (GRand *rand); - -void g_rand_set_seed (GRand *rand, - guint32 seed); - -#define g_rand_boolean(rand) ((g_rand_int (rand) & (1 << 15)) != 0) - -guint32 g_rand_int (GRand *rand); -gint32 g_rand_int_range (GRand *rand, - gint32 begin, - gint32 end); -gdouble g_rand_double (GRand *rand); -gdouble g_rand_double_range (GRand *rand, - gdouble begin, - gdouble end); - -void g_random_set_seed (guint32 seed); +GRand* g_rand_new_with_seed (guint32 seed); +GRand* g_rand_new (void); +void g_rand_free (GRand *rand_); +void g_rand_set_seed (GRand *rand_, + guint32 seed); + +#define g_rand_boolean(rand_) ((g_rand_int (rand_) & (1 << 15)) != 0) + +guint32 g_rand_int (GRand *rand_); +gint32 g_rand_int_range (GRand *rand_, + gint32 begin, + gint32 end); +gdouble g_rand_double (GRand *rand_); +gdouble g_rand_double_range (GRand *rand_, + gdouble begin, + gdouble end); +void g_random_set_seed (guint32 seed); #define g_random_boolean() ((g_random_int () & (1 << 15)) != 0) -guint32 g_random_int (void); -gint32 g_random_int_range (gint32 begin, - gint32 end); -gdouble g_random_double (void); -gdouble g_random_double_range (gdouble begin, - gdouble end); +guint32 g_random_int (void); +gint32 g_random_int_range (gint32 begin, + gint32 end); +gdouble g_random_double (void); +gdouble g_random_double_range (gdouble begin, + gdouble end); + G_END_DECLS diff --git a/glib/grel.h b/glib/grel.h index 562bd136..275f0549 100644 --- a/glib/grel.h +++ b/glib/grel.h @@ -85,7 +85,7 @@ void g_relation_print (GRelation *relation); void g_tuples_destroy (GTuples *tuples); gpointer g_tuples_index (GTuples *tuples, - gint index, + gint index_, gint field); G_END_DECLS diff --git a/glib/gslist.h b/glib/gslist.h index 32a3b245..72ce9d1a 100644 --- a/glib/gslist.h +++ b/glib/gslist.h @@ -66,9 +66,9 @@ GSList* g_slist_remove (GSList *list, GSList* g_slist_remove_all (GSList *list, gconstpointer data); GSList* g_slist_remove_link (GSList *list, - GSList *link); + GSList *link_); GSList* g_slist_delete_link (GSList *list, - GSList *link); + GSList *link_); GSList* g_slist_reverse (GSList *list); GSList* g_slist_copy (GSList *list); GSList* g_slist_nth (GSList *list, diff --git a/glib/gtimer.h b/glib/gtimer.h index 3a9b2650..33e53304 100644 --- a/glib/gtimer.h +++ b/glib/gtimer.h @@ -49,7 +49,7 @@ gdouble g_timer_elapsed (GTimer *timer, void g_usleep (gulong microseconds); -void g_time_val_add (GTimeVal *time, +void g_time_val_add (GTimeVal *time_, glong microseconds); G_END_DECLS diff --git a/gobject/gvaluearray.h b/gobject/gvaluearray.h index 863d2c30..b822895c 100644 --- a/gobject/gvaluearray.h +++ b/gobject/gvaluearray.h @@ -47,7 +47,7 @@ struct _GValueArray /* --- prototypes --- */ GValue* g_value_array_get_nth (GValueArray *value_array, - guint index); + guint index_); GValueArray* g_value_array_new (guint n_prealloced); void g_value_array_free (GValueArray *value_array); GValueArray* g_value_array_copy (const GValueArray *value_array); @@ -56,10 +56,10 @@ GValueArray* g_value_array_prepend (GValueArray *value_array, GValueArray* g_value_array_append (GValueArray *value_array, const GValue *value); GValueArray* g_value_array_insert (GValueArray *value_array, - guint index, + guint index_, const GValue *value); GValueArray* g_value_array_remove (GValueArray *value_array, - guint index); + guint index_); GValueArray* g_value_array_sort (GValueArray *value_array, GCompareFunc compare_func); GValueArray* g_value_array_sort_with_data (GValueArray *value_array,