anon/csope
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixup

Browse Source
This commit is contained in:
anon 2023-08-12 22:50:24 +02:00
parent 80137619e7
commit dc399a1b86
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/fscanner.l
View File

@ -538,11 +538,11 @@ if{wsnl}*\( { /* ignore 'if' */
template = true; template = true;
} }
goto ident; goto ident;
/* falseTREACHED */ /* NOTREACHED */
} }
("*"|{wsnl})+{identifier} { /* typedef name or modifier use */ ("*"|{wsnl})+{identifier} { /* typedef name or modifier use */
goto ident; goto ident;
/* falseTREACHED */ /* NOTREACHED */
} }
.|\n { /* general identifer usage */ .|\n { /* general identifer usage */
char *s; char *s;
@ -649,7 +649,7 @@ if{wsnl}*\( { /* ignore 'if' */
} }
/* my_yymore(); */ /* my_yymore(); */
return(token); return(token);
/* falseTREACHED */ /* NOTREACHED */
} }
} }
} }
@ -657,19 +657,19 @@ if{wsnl}*\( { /* ignore 'if' */
\[ { /* array dimension (don't worry or about subscripts) */ \[ { /* array dimension (don't worry or about subscripts) */
arraydimension = true; arraydimension = true;
goto more; goto more;
/* falseTREACHED */ /* NOTREACHED */
} }
\] { \] {
arraydimension = false; arraydimension = false;
goto more; goto more;
/* falseTREACHED */ /* NOTREACHED */
} }
\\\n { /* preprocessor statement is continued on next line */ \\\n { /* preprocessor statement is continued on next line */
/* save the '\\' to the output file, but not the '\n': */ /* save the '\\' to the output file, but not the '\n': */
yyleng = 1; yyleng = 1;
my_yymore(); my_yymore();
goto eol; goto eol;
/* falseTREACHED */ /* NOTREACHED */
} }
\n { /* end of the line */ \n { /* end of the line */
if (ppdefine == true) { /* end of a #define */ if (ppdefine == true) { /* end of a #define */
@ -725,38 +725,38 @@ if{wsnl}*\( { /* ignore 'if' */
if (sdl == false) if (sdl == false)
BEGIN(IN_SQUOTE); BEGIN(IN_SQUOTE);
goto more; goto more;
/* falseTREACHED */ /* NOTREACHED */
} }
<IN_SQUOTE>\' { <IN_SQUOTE>\' {
BEGIN(INITIAL); BEGIN(INITIAL);
goto more; goto more;
/* falseTREACHED */ /* NOTREACHED */
} }
\" { /* string constant */ \" { /* string constant */
BEGIN(IN_DQUOTE); BEGIN(IN_DQUOTE);
goto more; goto more;
/* falseTREACHED */ /* NOTREACHED */
} }
<IN_DQUOTE>\" { <IN_DQUOTE>\" {
BEGIN(INITIAL); BEGIN(INITIAL);
goto more; goto more;
/* falseTREACHED */ /* NOTREACHED */
} }
<IN_DQUOTE,IN_SQUOTE>{ <IN_DQUOTE,IN_SQUOTE>{
\n { /* syntax error: unexpected EOL */ \n { /* syntax error: unexpected EOL */
BEGIN(INITIAL); BEGIN(INITIAL);
goto eol; goto eol;
/* falseTREACHED */ /* NOTREACHED */
} }
\\. | \\. |
. { . {
goto more; goto more;
/* falseTREACHED */ /* NOTREACHED */
} }
\\\n { /* line continuation inside a string! */ \\\n { /* line continuation inside a string! */
myylineno++; myylineno++;
goto more; goto more;
/* falseTREACHED */ /* NOTREACHED */
} }
} }
@ -787,7 +787,7 @@ if{wsnl}*\( { /* ignore 'if' */
} else { } else {
++myylineno; ++myylineno;
} }
/* falseTREACHED */ /* NOTREACHED */
} }
"*"+"/" { "*"+"/" {
/* replace the comment by a single blank */ /* replace the comment by a single blank */
@ -799,7 +799,7 @@ if{wsnl}*\( { /* ignore 'if' */
"//".*\n? { "//".*\n? {
/* C++-style one-line comment */ /* C++-style one-line comment */
goto eol; goto eol;
/* falseTREACHED */ /* NOTREACHED */
} }
{number} | /* number */ {number} | /* number */

22
src/main.c
View File

@ -192,12 +192,12 @@ skiplist(FILE *oldrefs)
if (fscanf(oldrefs, "%d", &i) != 1) { if (fscanf(oldrefs, "%d", &i) != 1) {
postfatal(PROGRAM_NAME ": cannot read list size from file %s\n", reffile); postfatal(PROGRAM_NAME ": cannot read list size from file %s\n", reffile);
/* falseTREACHED */ /* NOTREACHED */
} }
while (--i >= 0) { while (--i >= 0) {
if (fscanf(oldrefs, "%*s") != 0) { if (fscanf(oldrefs, "%*s") != 0) {
postfatal(PROGRAM_NAME ": cannot read list name from file %s\n", reffile); postfatal(PROGRAM_NAME ": cannot read list name from file %s\n", reffile);
/* falseTREACHED */ /* NOTREACHED */
} }
} }
} }
@ -388,7 +388,7 @@ main(int argc, char **argv)
/* XXX remove if/when clearerr() in dir.c does the right thing. */ /* XXX remove if/when clearerr() in dir.c does the right thing. */
if (namefile && strcmp(namefile, "-") == 0 && !buildonly) { if (namefile && strcmp(namefile, "-") == 0 && !buildonly) {
postfatal(PROGRAM_NAME ": Must use -b if file list comes from stdin\n"); postfatal(PROGRAM_NAME ": Must use -b if file list comes from stdin\n");
/* falseTREACHED */ /* NOTREACHED */
} }
/* make sure that tmpdir exists */ /* make sure that tmpdir exists */
@ -448,13 +448,13 @@ main(int argc, char **argv)
if (isuptodate == true) { if (isuptodate == true) {
if ((oldrefs = vpfopen(reffile, "rb")) == NULL) { if ((oldrefs = vpfopen(reffile, "rb")) == NULL) {
postfatal(PROGRAM_NAME ": cannot open file %s\n", reffile); postfatal(PROGRAM_NAME ": cannot open file %s\n", reffile);
/* falseTREACHED */ /* NOTREACHED */
} }
/* get the crossref file version but skip the current directory */ /* get the crossref file version but skip the current directory */
if (fscanf(oldrefs, PROGRAM_NAME " %d %*s", &fileversion) != 1) { if (fscanf(oldrefs, PROGRAM_NAME " %d %*s", &fileversion) != 1) {
postfatal(PROGRAM_NAME ": cannot read file version from file %s\n", postfatal(PROGRAM_NAME ": cannot read file version from file %s\n",
reffile); reffile);
/* falseTREACHED */ /* NOTREACHED */
} }
if (fileversion >= 8) { if (fileversion >= 8) {
@ -495,7 +495,7 @@ main(int argc, char **argv)
postfatal( postfatal(
PROGRAM_NAME ": cannot read source file size from file %s\n", PROGRAM_NAME ": cannot read source file size from file %s\n",
reffile); reffile);
/* falseTREACHED */ /* NOTREACHED */
} }
/* get the source file list */ /* get the source file list */
srcfiles = malloc(nsrcfiles * sizeof(*srcfiles)); srcfiles = malloc(nsrcfiles * sizeof(*srcfiles));
@ -506,7 +506,7 @@ main(int argc, char **argv)
postfatal( postfatal(
PROGRAM_NAME ": cannot read string space size from file %s\n", PROGRAM_NAME ": cannot read string space size from file %s\n",
reffile); reffile);
/* falseTREACHED */ /* NOTREACHED */
} }
s = malloc(oldnum); s = malloc(oldnum);
getc(oldrefs); /* skip the newline */ getc(oldrefs); /* skip the newline */
@ -516,7 +516,7 @@ main(int argc, char **argv)
postfatal( postfatal(
PROGRAM_NAME ": cannot read source file names from file %s\n", PROGRAM_NAME ": cannot read source file names from file %s\n",
reffile); reffile);
/* falseTREACHED */ /* NOTREACHED */
} }
/* change newlines to nulls */ /* change newlines to nulls */
for (i = 0; i < nsrcfiles; ++i) { for (i = 0; i < nsrcfiles; ++i) {
@ -557,7 +557,7 @@ main(int argc, char **argv)
PROGRAM_NAME ": cannot read source file name from file %s\n", PROGRAM_NAME ": cannot read source file name from file %s\n",
reffile reffile
); );
/* falseTREACHED */ /* NOTREACHED */
} }
srcfiles[i] = strdup(path); srcfiles[i] = strdup(path);
} }
@ -610,7 +610,7 @@ main(int argc, char **argv)
} }
if (buildonly == true) { if (buildonly == true) {
myexit(0); myexit(0);
/* falseTREACHED */ /* NOTREACHED */
} }
} }
opendatabase(); opendatabase();
@ -636,6 +636,6 @@ main(int argc, char **argv)
screenmode_event_loop(); screenmode_event_loop();
/* cleanup and exit */ /* cleanup and exit */
myexit(0); myexit(0);
/* falseTREACHED */ /* NOTREACHED */
return 0; /* avoid warning... */ return 0; /* avoid warning... */
} }

2
src/opt.c
View File

@ -115,7 +115,7 @@ char ** parse_options(int *argc, char **argv)
postfatal("\ postfatal("\
cscope: reffile too long, cannot \ cscope: reffile too long, cannot \
be > %d characters\n", sizeof(path) - 3); be > %d characters\n", sizeof(path) - 3);
/* falseTREACHED */ /* NOTREACHED */
} }
strcpy(path, reffile); strcpy(path, reffile);