]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
[script] Correct vareable to variable
authorCharlie Brej <cbrej@cs.man.ac.uk>
Mon, 20 Jul 2009 14:15:09 +0000 (15:15 +0100)
committerCharlie Brej <cbrej@cs.man.ac.uk>
Mon, 20 Jul 2009 14:15:09 +0000 (15:15 +0100)
There are likely many other misspellings that I consistently get wrong.

src/plugins/splash/script/script-execute.c
src/plugins/splash/script/script-object.c
src/plugins/splash/script/script.h

index cace00f38bf6eee0d70afb95ef672a15af795bab..033695663f42d2142275ab11d5e7952472372494 100644 (file)
@@ -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;
 }
index 558b34913aa54fd0d21c96d6cb48af2e9369c9a2..089a0e10e070f227766b29e8e99a72480d695fbd 100644 (file)
@@ -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;
index 338b9bd1da5e3a7d4de7193b2f50712b0b4092ca..e568a2badab5826c1f6863f6520918b4ad4307c7 100644 (file)
@@ -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})