brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More ISO C90 warning fixes in Clutter

Browse Source 
This time, in Clutter core.

The ObjC standard library provides a type called 'id', which obviously
requires any library to either drop the useful shadowed variable warning
or stop using 'id' as a variable name.

Yes, it's almost unbearably stupid. Well, at least it's not 'index' in
string.h, or 'y2' in math.h.
This commit is contained in:
Emmanuele Bassi
2011-02-15 11:50:26 +00:00
parent 54a4511247
commit 5c398c18ad
16 changed files with 144 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/clutter-script.c
View File

@ -1196,7 +1196,7 @@ _clutter_script_generate_fake_id (ClutterScript *script)
/*
* _clutter_script_warn_missing_attribute:
* @script: a #ClutterScript
* @id: the id of an object definition, or %NULL
* @id_: the id of an object definition, or %NULL
* @attribute: the expected attribute
*
* Emits a warning, using GLib's log facilities, for a missing
@ -1205,19 +1205,19 @@ _clutter_script_generate_fake_id (ClutterScript *script)
*/
void
_clutter_script_warn_missing_attribute (ClutterScript *script,
const gchar *id,
const gchar *id_,
const gchar *attribute)
{
ClutterScriptPrivate *priv = script->priv;
JsonParser *parser = JSON_PARSER (priv->parser);
gint current_line = json_parser_get_current_line (parser);
if (id != NULL && *id != '\0')
if (id_ != NULL && *id_ != '\0')
{
g_warning ("%s:%d: object '%s' has no '%s' attribute",
priv->is_filename ? priv->filename : "<input>",
current_line,
id,
id_,
attribute);
}
else