From: Charlie Brej <cbrej@cs.man.ac.uk>
Date: Thu, 25 Jun 2009 14:02:55 +0000 (+0100)
Subject: [script] Correctly parse multiple parameter functions and allow dangeling comma
X-Git-Tag: 0.7.0~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2e08f4968bd51f1fe33e78e520687d02ac2607b;p=thirdparty%2Fplymouth.git

[script] Correctly parse multiple parameter functions and allow dangeling comma

Typo was causing parsing errors.
---

diff --git a/src/plugins/splash/script/script-parse.c b/src/plugins/splash/script/script-parse.c
index 30f05720..e6133a58 100644
--- a/src/plugins/splash/script/script-parse.c
+++ b/src/plugins/splash/script/script-parse.c
@@ -139,7 +139,7 @@ static script_exp* script_parse_exp_pi (ply_scan_t* scan)
                 script_parse_error (curtoken, "Function parameters should be separated with a ',' and terminated with a ')'");
                 return NULL;
                 }
-            ply_scan_get_next_token(scan);
+            curtoken = ply_scan_get_next_token(scan);
             }
         ply_scan_get_next_token(scan);
         func->data.function.name = exp;
@@ -591,15 +591,15 @@ static script_op* script_parse_function (ply_scan_t* scan)
     curtoken = ply_scan_get_next_token(scan);
     
     if (curtoken->type != PLY_SCAN_TOKEN_TYPE_SYMBOL){
-       script_parse_error (curtoken, "Function declaration parameters must separated with ',' and terminated ')'");
+       script_parse_error (curtoken, "Function declaration parameters must separated with ',' and terminated with a ')'");
        return NULL;
        }
     if (curtoken->data.symbol == ')') break;
-    if (curtoken->data.symbol == ','){ 
-       script_parse_error (curtoken, "Function declaration parameters must separated with ',' and terminated ')'");
+    if (curtoken->data.symbol != ','){ 
+       script_parse_error (curtoken, "Function declaration parameters must separated with ',' and terminated with a ')'");
        return NULL;
        }
-    ply_scan_get_next_token(scan);
+    curtoken = ply_scan_get_next_token(scan);
     }
  
  curtoken = ply_scan_get_next_token(scan);