merged

[henge/webcc.git] / src / apc / scanner.c

diff --git a/src/apc/scanner.c b/src/apc/scanner.c
index 5611c95..55245af 100644 (file)
--- a/src/apc/scanner.c
+++ b/src/apc/scanner.c
@@ -31,7 +31,7 @@ int   scanner(void);
 int   scanner_scanpixels(int*,int);
 /* Private */
 extern //lexer.c
-int   lexer_lexstring(const char*);
+int   lexer_lexstring(const uint8_t*);
 extern //lexer.c
 void  lexer_pushtok(int, int);
 static
@@ -143,14 +143,17 @@ int scanner
   if (DL_CD_LEN() > 0)               //There are entities to process
     { if (DL_CD_POP() == NULL)            //If the dirent is null, then the
         goto libfail;                       //lib function in dirent has failed
+<<<<<<< HEAD
       ntok += lexer_lexstring(DL_CD_CURNAME());//lex the directory name
+=======
+      ntok += lexer_lexstring(DL_CD_CURNAME());  //lex the directory name
+>>>>>>> 15d3ab5e7871ff459af13089b82bf5f17f731ebd
       if (DL_LEN() >= DL_STACKSIZE)       //fail if maxdepth exceeded
         { fprintf(stderr, ERR_DEPTH);
           goto fail;
         }
       if (chdir(DL_CD_CURNAME()))         //move into the new directory
        goto libfail;
-      DL_PUSH(opendir(CWDSTR));
       if (DL_CURDIR() == NULL)            //open the cwd
        goto libfail;
       lexer_pushtok(CLOPEN, 0);           //Push "Open Directory" token
@@ -192,8 +195,8 @@ int scanner_scanpixels
          return -1;
         }
       //Verify file header, get row_len/col_len
-      if (read_img_header(&row_len, &col_len))
-       return -1;
+      //if (read_img_header(&row_len, &col_len))
+      //return -1;
       row = 0;
     }
   //Read pixels into the buffer if there are rows left in the image