fixed bug in jpeg2000 decoding

[swftools.git] / src / parser.lex

diff --git a/src/parser.lex b/src/parser.lex
index 291fc9c..a4338e8 100644 (file)
--- a/src/parser.lex
+++ b/src/parser.lex
@@ -38,7 +38,7 @@ static void unescapeString(string_t * tmp)
     /* fixme - this routine expects the string to be
        null-terminated */
 
-    for (p1=tmp->str; (p=strchr(p1, '\\')); p1 = p+1) 
+    for (p1=(char*)tmp->str; (p=strchr(p1, '\\')); p1 = p+1) 
     {
        int nr=2;
        int new=1;
@@ -157,18 +157,21 @@ static void store(enum type_t type, int line, int column, char*text, int length)
 }
 
 #define MAX_INCLUDE_DEPTH 16
-YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
-int line_stack[MAX_INCLUDE_DEPTH];
-int column_stack[MAX_INCLUDE_DEPTH];
-int include_stack_ptr = 0;
+static YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
+static int line_stack[MAX_INCLUDE_DEPTH];
+static int column_stack[MAX_INCLUDE_DEPTH];
+static int include_stack_ptr = 0;
 
-void handleInclude(char*text, int len)
+static void handleInclude(char*text, int len)
 {
     text+=9;len-=9;
     while(len >=1 && (text[0] == ' ' || text[0] == '\t')) {
        text++;len--;
     }
-    while(len >= 1 && (text[len-1] == ' ' || text[len-1] == "\r" || text[len-1] == '\n')) {
+    while(len >= 1 && 
+          (text[len-1] == ' ' || 
+           text[len-1] == '\r' || 
+           text[len-1] == '\n')) {
        len--;
     }
     if(len >= 2 && text[0] == '"' && text[len-1] == '"') {