mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-04 08:15:21 +00:00
Code Issues Releases Wiki Activity

This cleans up a number of warnings that appeared after the parser rework

Browse Source 
commits were made (as well as a few other minor warnings elsewhere).

The Makefile change is to avoid passing -Wstrict-prototypes and
-Wnested-externs to the C++ compiler, which the compiler yells about and
then ignores.

Since we compile with -Wmissing-field-initializers I dropped the
unreferenced zero-width fields in the header structs, and then explicitly
initialized the remaining fields.

I tagged several unused function parameters to silence those warnings.

And finally, I dropped the unused filter_escapes() too.
This commit is contained in:
Kees Cook
2010-11-09 13:39:18 -08:00
parent d53bb7f811
commit eaa6a3c297
6 changed files with 23 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
parser/parser_regex.c
View File

@@ -35,38 +35,6 @@ enum error_type {
e_buffer_overflow
};
/* filter_escapes: scan input for any escape characters
* and remove, and reduce double \\ to a single
* NOTE: modifies in place the contents of the name argument */
static void filter_escapes(char *name)
{
char *sptr, *dptr;
BOOL bEscape = 0;
if (!name) /* shouldn't happen */
return;
sptr = dptr = name;
while (*sptr) {
if (*sptr == '\\') {
if (bEscape) {
*dptr++ = *sptr++;
} else {
++sptr;
bEscape = TRUE;
continue;
}
} else if (dptr < sptr) {
*dptr++ = *sptr++;
} else {
dptr++;
sptr++;
}
bEscape = 0;
}
*dptr = 0;
}
/* Filters out multiple slashes (except if the first two are slashes,
* that's a distinct namespace in linux) and trailing slashes.
* NOTE: modifies in place the contents of the path argument */
@@ -661,21 +629,6 @@ void yyerror(char *msg, ...)
/* Guh, fake symbol */
char *progname;
static int test_filter_escapes(void)
{
int rc = 0;
char *test_string;
test_string = strdup("foo\\\\foo");
filter_escapes(test_string);
MY_TEST(strcmp(test_string, "foo\\foo") == 0, "simple filter for \\\\");
test_string = strdup("foo\\foo");
filter_escapes(test_string);
MY_TEST(strcmp(test_string, "foofoo") == 0, "simple filter for \\f");
return rc;
}
static int test_filter_slashes(void)
{
int rc = 0;
@@ -725,10 +678,6 @@ int main(void)
int rc = 0;
int retval;
retval = test_filter_escapes();
if (retval != 0)
rc = retval;
retval = test_filter_slashes();
if (retval != 0)
rc = retval;