Changeset bab946c for tools/tracertstats/tracertstats.c

Timestamp:

01/15/19 16:47:20 (22 months ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

e9fe6ac

Parents:

edd0448

Message:

Fix clashes between global and local variable names in tools.

File:

• tools/tracertstats/tracertstats.c (modified) (3 diffs)

tools/tracertstats/tracertstats.c

@@ -80 +80 @@
 struct output_data_t *output = NULL;
 
-uint64_t count;
-uint64_t bytes;
+uint64_t totalcount;
+uint64_t totalbytes;
 
 struct libtrace_t *currenttrace;
@@ -178 +178 @@
         }
         while ((glob_last_ts >> 32) < (ts >> 32)) {
-                report_results(glob_last_ts >> 32, count, bytes, stats);
-                count = 0;
-                bytes = 0;
+                report_results(glob_last_ts >> 32, totalcount, totalbytes,
+                                stats);
+                totalcount = 0;
+                totalbytes = 0;
                 for (j = 0; j < filter_count; j++)
                         filters[j].count = filters[j].bytes = 0;
                 glob_last_ts = ts;
         }
-        count += res->total.count;
+        totalcount += res->total.count;
         packets_seen += res->total.count;
-        bytes += res->total.bytes;
+        totalbytes += res->total.bytes;
         for (j = 0; j < filter_count; j++) {
                 filters[j].count += res->filters[j].count;
@@ -344 +345 @@
                 stats = trace_get_statistics(trace, stats);
         }
-        report_results((glob_last_ts >> 32), count, bytes, stats);
+        report_results((glob_last_ts >> 32), totalcount, totalbytes, stats);
         if (trace_is_err(trace))
                 trace_perror(trace,"%s",uri);