isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 11:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

2007-12-06 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/json/json-parser.[ch]: Use gssize, size we allow -1
	as a length (meaning "use the whole string").

	(json_parser_load_from_data): Use the passed length instead of
	using strlen() all the time.

	* clutter/clutter-script.[ch]: Ditto as above.
This commit is contained in:
Emmanuele Bassi 2007-12-06 11:25:16 +00:00
parent 6e25c4ef96
commit 6fae4bcfc9
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2007-12-06 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/json/json-parser.[ch]: Use gssize, size we allow -1
as a length (meaning "use the whole string").
(json_parser_load_from_data): Use the passed length instead of
using strlen() all the time.
* clutter/clutter-script.[ch]: Ditto as above.
2007-12-06 Emmanuele Bassi <ebassi@openedhand.com> 2007-12-06 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/pango/pangoclutter-render.c: Hush a compiler warning * clutter/pango/pangoclutter-render.c: Hush a compiler warning

5
clutter/clutter-script.c
View File

@ -1602,7 +1602,7 @@ clutter_script_load_from_file (ClutterScript *script,
guint guint
clutter_script_load_from_data (ClutterScript *script, clutter_script_load_from_data (ClutterScript *script,
const gchar *data, const gchar *data,
gsize length, gssize length,
GError **error) GError **error)
{ {
ClutterScriptPrivate *priv; ClutterScriptPrivate *priv;
@ -1611,6 +1611,9 @@ clutter_script_load_from_data (ClutterScript *script,
g_return_val_if_fail (CLUTTER_IS_SCRIPT (script), 0); g_return_val_if_fail (CLUTTER_IS_SCRIPT (script), 0);
g_return_val_if_fail (data != NULL, 0); g_return_val_if_fail (data != NULL, 0);
if (length < 0)
length = strlen (data);
priv = script->priv; priv = script->priv;
g_free (priv->filename); g_free (priv->filename);

2
clutter/clutter-script.h
View File

@ -120,7 +120,7 @@ guint clutter_script_load_from_file (ClutterScript *script,
GError **error); GError **error);
guint clutter_script_load_from_data (ClutterScript *script, guint clutter_script_load_from_data (ClutterScript *script,
const gchar *data, const gchar *data,
gsize length, gssize length,
GError **error); GError **error);
GObject * clutter_script_get_object (ClutterScript *script, GObject * clutter_script_get_object (ClutterScript *script,
const gchar *name); const gchar *name);

4
clutter/json/json-parser.c
View File

@ -888,7 +888,7 @@ json_parser_load_from_file (JsonParser *parser,
gboolean gboolean
json_parser_load_from_data (JsonParser *parser, json_parser_load_from_data (JsonParser *parser,
const gchar *data, const gchar *data,
gsize length, gssize length,
GError **error) GError **error)
{ {
GScanner *scanner; GScanner *scanner;
@ -909,7 +909,7 @@ json_parser_load_from_data (JsonParser *parser,
} }
scanner = json_scanner_new (parser); scanner = json_scanner_new (parser);
g_scanner_input_text (scanner, data, strlen (data)); g_scanner_input_text (scanner, data, length);
for (i = 0; i < n_symbols; i++) for (i = 0; i < n_symbols; i++)
{ {

2
clutter/json/json-parser.h
View File

@ -135,7 +135,7 @@ gboolean json_parser_load_from_file (JsonParser *parser,
GError **error); GError **error);
gboolean json_parser_load_from_data (JsonParser *parser, gboolean json_parser_load_from_data (JsonParser *parser,
const gchar *data, const gchar *data,
gsize length, gssize length,
GError **error); GError **error);
JsonNode * json_parser_get_root (JsonParser *parser); JsonNode * json_parser_get_root (JsonParser *parser);