sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tools/nxstyle.c: Fix logic from commit 005a077310 for the case of header files when contain no functions.

Browse Source
This commit is contained in:
Gregory Nutt 2019-06-29 18:38:56 -06:00
parent 42b178fb13
commit f6221ae2dc
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/nxstyle.c
View File

@ -103,6 +103,7 @@ int main(int argc, char **argv, char **envp)
char line[LINE_SIZE]; /* The current line being examined */
char *filename; /* Name of the file to open */
char *lptr; /* Temporary pointer into line[] */
char *ext; /* Temporary file extension */
bool btabs; /* True: TAB characters found on the line */
bool bfunctions; /* True: In private or public functions */
bool bstatm; /* True: This line is beginning of a statement */
@ -112,6 +113,7 @@ int main(int argc, char **argv, char **envp)
bool bquote; /* True: Backslash quoted character next */
bool bblank; /* Used to verify block comment terminator */
bool ppline; /* True: The next line the continuation of a pre-processor command */
bool hdrfile; /* True: File is a header file */
int lineno; /* Current line number */
int indent; /* Indentation level */
int ncomment; /* Comment nesting level on this line */
@ -174,6 +176,24 @@ int main(int argc, char **argv, char **envp)
return 1;
}
/* Are we parsing a header file? */
hdrfile = false;
ext = strrchr(filename, '.');
if (ext == 0)
{
printf("No file extension\n");
}
else if (strcmp(ext, ".h") == 0)
{
hdrfile = true;
}
else if (strcmp(ext, ".c") != 0)
{
printf("Unrecognized file extension: \"%s\"\n", ext + 1);
}
btabs = false; /* True: TAB characters found on the line */
bfunctions = false; /* True: In private or public functions */
bswitch = false; /* True: Within a switch statement */
@ -1601,7 +1621,7 @@ int main(int argc, char **argv, char **envp)
}
}
if (!bfunctions)
if (!bfunctions && !hdrfile)
{
fprintf(stderr, "ERROR: \"Private/Public Functions\" not found!\n");
fprintf(stderr, " File could not be checked.\n");