Changeset 1d780e4 for lib

Timestamp:

09/01/16 16:27:23 (4 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

ccc598d

Parents:

903f64d

Message:

Fix some basic warnings

Also fixed spelling of 'statistics' in internal function name.

Location:

lib

Files:

• format_linux_common.c (modified) (5 diffs)
• format_pcap.c (modified) (1 diff)

lib/format_linux_common.c

@@ -242 +242 @@
 
 /* These don't typically reset however an interface does exist to reset them */
-static int linuxcommon_get_dev_statisitics(libtrace_t *libtrace, struct linux_dev_stats *stats) {
+static int linuxcommon_get_dev_statistics(libtrace_t *libtrace, struct linux_dev_stats *stats) {
         FILE *file;
         char line[1024];
@@ -253 +253 @@
 
         /* Skip 2 header lines */
-        fgets(line, sizeof(line), file);
-        fgets(line, sizeof(line), file);
+        if (fgets(line, sizeof(line), file) == NULL) {
+                fclose(file);
+                return -1;
+        }
+
+        if (fgets(line, sizeof(line), file) == NULL) {
+                fclose(file);
+                return -1;
+        }
 
         while (!(feof(file)||ferror(file))) {
                 int tot;
-                fgets(line, sizeof(line), file);
+                if (fgets(line, sizeof(line), file) == NULL)
+                        break;
+
                 tot = sscanf(line, " %"xstr(IF_NAMESIZE)"[^:]:" REPEAT_16(" %"SCNd64),
                              tmp_stats.if_name,
@@ -436 +445 @@
         FORMAT_DATA->stats.tp_drops = 0;
 
-        if (linuxcommon_get_dev_statisitics(libtrace, &FORMAT_DATA->dev_stats) != 0) {
+        if (linuxcommon_get_dev_statistics(libtrace, &FORMAT_DATA->dev_stats) != 0) {
                 /* Mark this as bad */
                 FORMAT_DATA->dev_stats.if_name[0] = 0;
@@ -527 +536 @@
 /* Note these statistics come from two different sources, the socket itself and
  * the linux device. As such this means it is highly likely that their is some
- * margin of error in the returned statisitics, we perform basic sanitising so
+ * margin of error in the returned statistics, we perform basic sanitising so
  * that these are not too noticable.
  */
@@ -544 +553 @@
         /* Do we have starting stats to compare to? */
         if (FORMAT_DATA->dev_stats.if_name[0] != 0) {
-                linuxcommon_get_dev_statisitics(libtrace, &dev_stats);
+                linuxcommon_get_dev_statistics(libtrace, &dev_stats);
         }
         linuxcommon_update_socket_statistics(libtrace);

lib/format_pcap.c

@@ -345 +345 @@
 }
 
-static int pcap_pause_input(libtrace_t *libtrace)
+static int pcap_pause_input(libtrace_t *libtrace UNUSED)
 {
         return 0; /* success */