clear all warnings from cppcheck static code analysis

obtained with: cppcheck --enable=warning --force --inconclusive --quiet ~/firejail/src
netblue30 · Aug 11, 2018 · f6d6204 · f6d6204
1 parent a535609
commit f6d6204
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/src/firejail/join.c b/src/firejail/join.c
@@ -49,7 +49,7 @@ static void extract_x11_display(pid_t pid) {
  if (!fp)
  return;
 
- if (1 != fscanf(fp, "%d", &display)) {
+ if (1 != fscanf(fp, "%u", &display)) {
  fprintf(stderr, "Error: cannot read X11 display file\n");
  fclose(fp);
  return;

diff --git a/src/firejail/profile.c b/src/firejail/profile.c
@@ -93,9 +93,6 @@ void profile_add_ignore(const char *str) {
  fprintf(stderr, "Error: invalid ignore option\n");
  exit(1);
  }
- char *ptr = strdup(str);
- if (!ptr)
- errExit("strdup");
 
  // find an empty entry in profile_ignore array
  int i;

diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
@@ -250,7 +250,7 @@ static int monitor_application(pid_t app_pid) {
  }
  while(rv != monitored_pid);
  if (arg_debug)
- printf("Sandbox monitor: waitpid %u retval %d status %d\n", monitored_pid, rv, status);
+ printf("Sandbox monitor: waitpid %d retval %d status %d\n", monitored_pid, rv, status);
  if (rv == -1) { // we can get here if we have processes joining the sandbox (ECHILD)
  if (arg_debug)
  perror("waitpid");
@@ -294,7 +294,7 @@ static int monitor_application(pid_t app_pid) {
  closedir(dir);
 
  if (monitored_pid != 0 && arg_debug)
- printf("Sandbox monitor: monitoring %u\n", monitored_pid);
+ printf("Sandbox monitor: monitoring %d\n", monitored_pid);
  }
 
  // return the latest exit status.

diff --git a/src/firemon/arp.c b/src/firemon/arp.c
@@ -51,7 +51,7 @@ static void print_arp(const char *fname) {
  char mac[64];
  char mask[64];
  char device[64];
- int rv = sscanf(start, "%s %s %s %s %s %s\n", ip, type, flags, mac, mask, device);
+ int rv = sscanf(start, "%63s %63s %63s %63s %63s %63s\n", ip, type, flags, mac, mask, device);
  if (rv != 6)
  continue;
 

diff --git a/src/firemon/route.c b/src/firemon/route.c
@@ -144,7 +144,7 @@ static void print_route(const char *fname) {
  char use[64];
  char metric[64];
  char mask[64];
- int rv = sscanf(start, "%s %s %s %s %s %s %s %s\n", ifname, destination, gateway, flags, refcnt, use, metric, mask);
+ int rv = sscanf(start, "%63s %63s %63s %63s %63s %63s %63s %63s\n", ifname, destination, gateway, flags, refcnt, use, metric, mask);
  if (rv != 8)
  continue;
 
@@ -161,15 +161,15 @@ static void print_route(const char *fname) {
 
 // printf("#%s# #%s# #%s# #%s# #%s# #%s# #%s# #%s#\n", ifname, destination, gateway, flags, refcnt, use, metric, mask);
  if (gw != 0)
- printf(" %u.%u.%u.%u/%u via %u.%u.%u.%u, dev %s, metric %s\n",
+ printf(" %d.%d.%d.%d/%u via %d.%d.%d.%d, dev %s, metric %s\n",
  PRINT_IP(destip), mask2bits(destmask),
  PRINT_IP(gw),
  ifname,
  metric);
  else { // this is an interface
  IfList *ifentry = list_find(destip, destmask);
  if (ifentry) {
- printf(" %u.%u.%u.%u/%u, dev %s, scope link src %d.%d.%d.%d\n",
+ printf(" %d.%d.%d.%d/%u, dev %s, scope link src %d.%d.%d.%d\n",
  PRINT_IP(destip), mask2bits(destmask),
  ifname,
  PRINT_IP(ifentry->ip));

diff --git a/src/fnetfilter/main.c b/src/fnetfilter/main.c
@@ -125,7 +125,7 @@ for (i = 0; i < argcnt; i++)
  else {
  // parsing
  int index = 0;
- int rv = sscanf(ptr, "$ARG%u", &index) ;
+ int rv = sscanf(ptr, "$ARG%d", &index) ;
  if (rv != 1) {
  fprintf(stderr, "Error fnetfilter: invalid template argument on line %d\n", line);
  exit(1);

diff --git a/src/libtracelog/libtracelog.c b/src/libtracelog/libtracelog.c
@@ -64,16 +64,17 @@ static inline uint32_t hash(const char *str) {
 }
 
 static void storage_add(const char *str) {
-#ifdef DEBUG
- printf("add %s\n", str);
-#endif
  if (!str) {
 #ifdef DEBUG
  printf("null pointer passed to storage_add\n");
 #endif
  return;
  }
 
+#ifdef DEBUG
+ printf("add %s\n", str);
+#endif
+
  ListElem *ptr = malloc(sizeof(ListElem));
  if (!ptr) {
  fprintf(stderr, "Error: cannot allocate memory\n");
@@ -96,15 +97,17 @@ static void storage_add(const char *str) {
 static char* cwd = NULL;
 
 static char *storage_find(const char *str) {
-#ifdef DEBUG
- printf("storage find %s\n", str);
-#endif
  if (!str) {
 #ifdef DEBUG
  printf("null pointer passed to storage_find\n");
 #endif
  return NULL;
  }
+
+#ifdef DEBUG
+ printf("storage find %s\n", str);
+#endif
+
  const char *tofind = str;
  int allocated = 0;