From: Charlie Brej Date: Mon, 20 Jul 2009 14:15:09 +0000 (+0100) Subject: [script] Correct vareable to variable X-Git-Tag: 0.7.0~83 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebe123a1e422eef27a45a605aac5bb1089dbcd9b;p=thirdparty%2Fplymouth.git [script] Correct vareable to variable There are likely many other misspellings that I consistently get wrong. --- diff --git a/src/plugins/splash/script/script-execute.c b/src/plugins/splash/script/script-execute.c index cace00f3..03369566 100644 --- a/src/plugins/splash/script/script-execute.c +++ b/src/plugins/splash/script/script-execute.c @@ -103,23 +103,23 @@ static script_obj_t *script_evaluate_var (script_state_t *state, assert (state->global->type == SCRIPT_OBJ_TYPE_HASH); /*FIXME use script-object functions */ assert (state->local->type == SCRIPT_OBJ_TYPE_HASH); - script_vareable_t *vareable = ply_hashtable_lookup (state->local->data.hash, + script_variable_t *variable = ply_hashtable_lookup (state->local->data.hash, name); - if (!vareable) - vareable = ply_hashtable_lookup (state->global->data.hash, name); - if (vareable) + if (!variable) + variable = ply_hashtable_lookup (state->global->data.hash, name); + if (variable) { - obj = vareable->object; + obj = variable->object; script_obj_ref (obj); return obj; } obj = script_obj_new_null (); - vareable = malloc (sizeof (script_vareable_t)); - vareable->name = strdup (name); - vareable->object = obj; + variable = malloc (sizeof (script_variable_t)); + variable->name = strdup (name); + variable->object = obj; - ply_hashtable_insert (state->local->data.hash, vareable->name, vareable); + ply_hashtable_insert (state->local->data.hash, variable->name, variable); script_obj_ref (obj); return obj; } diff --git a/src/plugins/splash/script/script-object.c b/src/plugins/splash/script/script-object.c index 558b3491..089a0e10 100644 --- a/src/plugins/splash/script/script-object.c +++ b/src/plugins/splash/script/script-object.c @@ -58,15 +58,15 @@ void script_obj_unref (script_obj_t *obj) script_obj_free (obj); } -static void foreach_free_vareable (void *key, +static void foreach_free_variable (void *key, void *data, void *user_data) { - script_vareable_t *vareable = data; + script_variable_t *variable = data; - script_obj_unref (vareable->object); - free (vareable->name); - free (vareable); + script_obj_unref (variable->object); + free (variable->name); + free (variable); } void script_obj_reset (script_obj_t *obj) @@ -88,7 +88,7 @@ void script_obj_reset (script_obj_t *obj) break; case SCRIPT_OBJ_TYPE_HASH: /* FIXME nightmare */ - ply_hashtable_foreach (obj->data.hash, foreach_free_vareable, NULL); + ply_hashtable_foreach (obj->data.hash, foreach_free_variable, NULL); ply_hashtable_free (obj->data.hash); break; @@ -471,19 +471,19 @@ script_obj_t *script_obj_hash_get_element (script_obj_t *hash, { hash = script_obj_deref_direct (hash); assert (hash->type == SCRIPT_OBJ_TYPE_HASH); - script_vareable_t *vareable = ply_hashtable_lookup (hash->data.hash, + script_variable_t *variable = ply_hashtable_lookup (hash->data.hash, (void *) name); script_obj_t *obj; - if (vareable) - obj = vareable->object; + if (variable) + obj = variable->object; else { obj = script_obj_new_null (); - vareable = malloc (sizeof (script_vareable_t)); - vareable->name = strdup (name); - vareable->object = obj; - ply_hashtable_insert (hash->data.hash, vareable->name, vareable); + variable = malloc (sizeof (script_variable_t)); + variable->name = strdup (name); + variable->object = obj; + ply_hashtable_insert (hash->data.hash, variable->name, variable); } script_obj_ref (obj); return obj; diff --git a/src/plugins/splash/script/script.h b/src/plugins/splash/script/script.h index 338b9bd1..e568a2ba 100644 --- a/src/plugins/splash/script/script.h +++ b/src/plugins/splash/script/script.h @@ -213,7 +213,7 @@ typedef struct { char *name; script_obj_t *object; -} script_vareable_t; +} script_variable_t; #define script_return_obj(_return_object) ((script_return_t) {SCRIPT_RETURN_TYPE_RETURN, _return_object})