bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filter: Remove redundant code

Browse Source 
Skipping leading whitespace and removing trailing whitespace and
comments were swapped to avoid skipping the leading whitespace twice.
This commit is contained in:
Janosch Hoffmann 2019-05-05 16:46:16 +02:00
parent 10d36d48a4
commit fffe45cae1
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/filter.c
View File

@ -52,7 +52,7 @@ void filter_init (void)
FILE *fd;
struct filter_list *p;
char buf[FILTER_BUFFER_LEN];
char *s;
char *s, *start;
int cflags;
if (fl || already_init) {
@ -73,14 +73,16 @@ void filter_init (void)
cflags |= REG_ICASE;
while (fgets (buf, FILTER_BUFFER_LEN, fd)) {
/* skip leading whitespace */
s = buf;
while (*s && isspace ((unsigned char) *s))
s++;
start = s;
/*
* Remove any trailing white space and
* comments.
*/
s = buf;
/* skip leading whitespace */
while (*s && isspace ((unsigned char) *s))
++s;
while (*s) {
if (isspace ((unsigned char) *s))
break;
@ -96,11 +98,7 @@ void filter_init (void)
++s;
}
*s = '\0';
/* skip leading whitespace */
s = buf;
while (*s && isspace ((unsigned char) *s))
s++;
s = start;
/* skip blank lines and comments */
if (*s == '\0')