projects
/
henge
/
apc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dce5c6f
)
merged
author
ken
<ken@mihrtec.com>
Fri, 16 Dec 2016 19:55:23 +0000
(11:55 -0800)
committer
ken
<ken@mihrtec.com>
Fri, 16 Dec 2016 19:55:23 +0000
(11:55 -0800)
src/scanner.c
patch
|
blob
|
history
diff --git
a/src/scanner.c
b/src/scanner.c
index
55245af
..
36a2050
100644
(file)
--- a/
src/scanner.c
+++ b/
src/scanner.c
@@
-143,11
+143,7
@@
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
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
-=======
- 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 (DL_LEN() >= DL_STACKSIZE) //fail if maxdepth exceeded
{ fprintf(stderr, ERR_DEPTH);
goto fail;