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

parser: fix build warning for assigning default cache location

Browse Source 
The compiler is spitting out the warning

parser_main.c:1291:16: warning: ISO C++ forbids converting a string constant to 'char*' [-Wwrite-strings]
    char *tmp = "/var/cache/apparmor";

fix this by constifying the cacheloc array.

Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen
2018-08-15 13:21:37 -07:00
parent b1967c892a
commit e7949d09fa
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
parser/parser_main.c
View File

@@ -102,7 +102,7 @@ bool debug_jobs = false;
struct timespec cache_tstamp, mru_policy_tstamp; struct timespec cache_tstamp, mru_policy_tstamp;
static char *apparmorfs = NULL; static char *apparmorfs = NULL;
static char *cacheloc[MAX_CACHE_LOCS]; static const char *cacheloc[MAX_CACHE_LOCS];
static int cacheloc_n = 0; static int cacheloc_n = 0;
static bool print_cache_dir = false; static bool print_cache_dir = false;
@@ -241,7 +241,7 @@ void display_warn(const char *command)
} }
/* Parse comma separated cachelocations. Commas can be escaped by \, */ /* Parse comma separated cachelocations. Commas can be escaped by \, */
static int parse_cacheloc(const char *arg, char **cacheloc, int max_size) static int parse_cacheloc(const char *arg, const char **cacheloc, int max_size)
{ {
const char *s = arg; const char *s = arg;
const char *p = arg; const char *p = arg;
@@ -253,15 +253,17 @@ static int parse_cacheloc(const char *arg, char **cacheloc, int max_size)
p++; p++;
} else if (*p == ',') { } else if (*p == ',') {
if (p != s) { if (p != s) {
char *tmp;
if (n == max_size) { if (n == max_size) {
errno = E2BIG; errno = E2BIG;
return -1; return -1;
} }
cacheloc[n] = (char *) malloc(p - s + 1); tmp = (char *) malloc(p - s + 1);
if (cacheloc[n] == NULL) if (tmp == NULL)
return -1; return -1;
memcpy(cacheloc[n], s, p - s); memcpy(tmp, s, p - s);
cacheloc[n][p - s] = 0; tmp[p - s] = 0;
cacheloc[n] = tmp;
n++; n++;
} }
p++; p++;
@@ -270,15 +272,17 @@ static int parse_cacheloc(const char *arg, char **cacheloc, int max_size)
p++; p++;
} }
if (p != s) { if (p != s) {
char *tmp;
if (n == max_size) { if (n == max_size) {
errno = E2BIG; errno = E2BIG;
return -1; return -1;
} }
cacheloc[n] = (char *) malloc(p - s + 1); tmp = (char *) malloc(p - s + 1);
if (cacheloc[n] == NULL) if (tmp == NULL)
return -1; return -1;
memcpy(cacheloc[n], s, p - s); memcpy(tmp, s, p - s);
cacheloc[n][p - s] = 0; tmp[p - s] = 0;
cacheloc[n] = tmp;
n++; n++;
} }
@@ -809,7 +813,7 @@ static bool do_print_cache_dir(aa_features *features, int dirfd, const char *pat
return true; return true;
} }
static bool do_print_cache_dirs(aa_features *features, char **cacheloc, static bool do_print_cache_dirs(aa_features *features, const char **cacheloc,
int cacheloc_n) int cacheloc_n)
{ {
int i; int i;
@@ -1288,8 +1292,7 @@ int main(int argc, char *argv[])
uint16_t max_caches = write_cache && cond_clear_cache ? (uint16_t) (-1) : 0; uint16_t max_caches = write_cache && cond_clear_cache ? (uint16_t) (-1) : 0;
if (!cacheloc[0]) { if (!cacheloc[0]) {
char *tmp = "/var/cache/apparmor"; cacheloc[0] = "/var/cache/apparmor";
cacheloc[0] = tmp;
cacheloc_n = 1; cacheloc_n = 1;
} }
if (print_cache_dir) if (print_cache_dir)