Fix for gcc7 warnings and removed unused variable.

Change-Id: I527947873f14e109851dcb49c10c04c1a4f1952f
intel · May 18, 2017 · b13a8e5 · b13a8e5
1 parent 433c9bd
commit b13a8e5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/lib/allocation.c b/lib/allocation.c
@@ -718,7 +718,7 @@ get_unused_cos(const unsigned id,
                unsigned *class_id)
 {
         const int l2_req = ((technology & (1 << PQOS_CAP_TYPE_L2CA)) != 0);
-        unsigned used_classes[hi_class_id + 1];
+        unsigned used_classes[PQOS_MAX_L3CA_COS];
         unsigned i, cos;
         int ret;
 

diff --git a/lib/os_allocation.c b/lib/os_allocation.c
@@ -352,10 +352,14 @@ struct schemata {
  */
 static void
 schemata_fini(struct schemata *schemata) {
-	if (schemata->l2ca != NULL)
+	if (schemata->l2ca != NULL) {
 		free(schemata->l2ca);
-	if (schemata->l3ca != NULL)
+                schemata->l2ca = NULL;
+        }
+	if (schemata->l3ca != NULL) {
 		free(schemata->l3ca);
+                schemata->l3ca = NULL;
+        }
 }
 
 /**

diff --git a/lib/os_monitoring.c b/lib/os_monitoring.c
@@ -316,7 +316,7 @@ set_rdt_event_attrs(const int idx, const char *fname)
         FILE *fd;
         int config, ret;
         double sf = 0;
-        char file[128], buf[32], *p = buf;
+        char file[512], buf[32], *p = buf;
 
         /**
          * Read event type from file system

diff --git a/pqos/monitor.c b/pqos/monitor.c
@@ -993,9 +993,9 @@ print_text_row(FILE *fp,
                                      mon_data->event & PQOS_MON_EVENT_LMEM_BW,
                                      sel_events_max & PQOS_MON_EVENT_LMEM_BW);
 
-        offset += fillin_text_column(mbr, data + offset, sz_data - offset,
-                                     mon_data->event & PQOS_MON_EVENT_RMEM_BW,
-                                     sel_events_max & PQOS_MON_EVENT_RMEM_BW);
+        fillin_text_column(mbr, data + offset, sz_data - offset,
+                           mon_data->event & PQOS_MON_EVENT_RMEM_BW,
+                           sel_events_max & PQOS_MON_EVENT_RMEM_BW);
 
         if (!process_mode())
                 fprintf(fp, "\n%8.8s %5.2f %7uk%s",
@@ -1046,10 +1046,10 @@ print_xml_row(FILE *fp, char *time,
                                     sel_events_max & PQOS_MON_EVENT_LMEM_BW,
                                     "mbm_local_MB");
 
-        offset += fillin_xml_column(mbr, data + offset, sz_data - offset,
-                                    mon_data->event & PQOS_MON_EVENT_RMEM_BW,
-                                    sel_events_max & PQOS_MON_EVENT_RMEM_BW,
-                                    "mbm_remote_MB");
+        fillin_xml_column(mbr, data + offset, sz_data - offset,
+                          mon_data->event & PQOS_MON_EVENT_RMEM_BW,
+                          sel_events_max & PQOS_MON_EVENT_RMEM_BW,
+                          "mbm_remote_MB");
 
         if (!process_mode())
                 fprintf(fp,
@@ -1122,9 +1122,9 @@ print_csv_row(FILE *fp, char *time,
                                     mon_data->event & PQOS_MON_EVENT_LMEM_BW,
                                     sel_events_max & PQOS_MON_EVENT_LMEM_BW);
 
-        offset += fillin_csv_column(mbr, data + offset, sz_data - offset,
-                                    mon_data->event & PQOS_MON_EVENT_RMEM_BW,
-                                    sel_events_max & PQOS_MON_EVENT_RMEM_BW);
+        fillin_csv_column(mbr, data + offset, sz_data - offset,
+                          mon_data->event & PQOS_MON_EVENT_RMEM_BW,
+                          sel_events_max & PQOS_MON_EVENT_RMEM_BW);
 
         if (!process_mode())
                 fprintf(fp,