Converts the code to compile on g++

makefile

@@ -11,8 +11,11 @@ BIN = mojitos
 BINP = mojitos_prometeus
 PREFIX = /usr/local
 
-CC = g++
-CPPFLAGS = -std=c++20 -Wall -Wextra -Wpedantic -Wno-unused-function -I./lib $(NVML_IFLAGS)
+# specific flags for g++
+# CC = g++
+# CPPFLAGS = -std=c++20 -Wall -Wno-error=write-strings -Wextra -Wpedantic -Wno-unused-function -I./lib $(NVML_IFLAGS)
+
+#works also with clang
 CC = gcc
 CPPFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -Wno-unused-function -I./lib $(NVML_IFLAGS)
 

src/counters.c

@@ -230,7 +230,7 @@ unsigned int get_counters(uint64_t *results, void *ptr)
     return state->nbperf;
 }
 
-void label_counters(char **labels, void *ptr)
+void label_counters(const char **labels, void *ptr)
 {
     Counter *state = (Counter *) ptr;
 

src/counters.h

@@ -21,7 +21,7 @@
 unsigned int init_counters(char *, void **);
 unsigned int get_counters(uint64_t *results, void *);
 void clean_counters(void *);
-void label_counters(char **labels, void *);
+void label_counters(const char **labels, void *);
 void *show_all_counters(void *, size_t);
 
 Sensor counters = {

src/display_manager.c

@@ -8,7 +8,7 @@
 extern FILE *output;
 extern char* output_option;
 
-void init_manager(char** labels, int nb_sensors, int stat_mode) {
+void init_manager(const char** labels, int nb_sensors, int stat_mode) {
   if (output_option != NULL) {
     if ((output = fopen(output_option, "wb")) == NULL) {
       perror("fopen");

src/libmojitos.c

@@ -9,7 +9,7 @@
 #include "libmojitos.h"
 
 typedef unsigned int (*initializer_t)(char *, void **);
-typedef void (*labeler_t)(char **, void *);
+typedef void (*labeler_t)(const char **, void *);
 typedef unsigned int (*getter_t)(uint64_t *, void *);
 typedef void (*cleaner_t)(void *);
 
@@ -35,7 +35,7 @@ Optparse _moj_opts[NB_SENSOR_OPT + 1];
   
 unsigned int nb_sources = 0;
 unsigned int nb_sensors = 0; // might have multiple sensors per source
-char **labels = NULL;
+const char **labels = NULL;
 uint64_t *values = NULL;
 void **states = NULL;
 getter_t *getter = NULL;
@@ -63,7 +63,7 @@ void add_source(Sensor *cpt, char *arg)
     cleaner = (cleaner_t*) realloc(cleaner, nb_sources * sizeof(void *));
     cleaner[nb_sources - 1] = clean;
 
-    labels = (char**) realloc(labels, (nb_sensors + nb) * sizeof(char *));
+    labels = (const char**) realloc(labels, (nb_sensors + nb) * sizeof(char *));
     labeler(labels + nb_sensors, states[nb_sources - 1]);
 
     values = (uint64_t*) realloc(values, (nb_sensors + nb) * sizeof(uint64_t));
@@ -115,7 +115,7 @@ void moj_clean(void) {
     }
 }
 
-char **moj_labels(void) {
+const char **moj_labels(void) {
   return labels;
 }
 

src/libmojitos.h

 int moj_init(char** argv);
 uint64_t* moj_get_values(void);
 void moj_clean(void);
-char **moj_labels(void);
+const char **moj_labels(void);

src/likwid.c

@@ -61,7 +61,7 @@ void _get_likwid(Likwid *likwid, uint64_t *values)
   }
 }
 
-void label_likwid(char **labels, void *ptr)
+void label_likwid(const char **labels, void *ptr)
 {
     Likwid *state = (Likwid *) ptr;
 

src/likwid.h

@@ -21,7 +21,7 @@
 unsigned int init_likwid(char *, void **);
 unsigned int get_likwid(uint64_t *results, void *);
 void clean_likwid(void *);
-void label_likwid(char **labels, void *);
+void label_likwid(const char **labels, void *);
 void *show_all_likwid(void *, size_t);
 
 Sensor likwid = {

src/load.c

@@ -98,7 +98,7 @@ char *_labels[LOAD_VALUES_SIZE] = {
     "user", "nice", "system", "idle", "iowait", "irq",
     "softirq", "steal", "guest", "guest_nice"
 };
-void label_load(char **labels, void *none)
+void label_load(const char **labels, void *none)
 {
     UNUSED(none);
 

src/load.h

@@ -21,7 +21,7 @@
 unsigned int init_load(char *, void **);
 unsigned int get_load(uint64_t *results, void *);
 void clean_load(void *);
-void label_load(char **labels, void *);
+void label_load(const char **labels, void *);
 
 Sensor load = {
     .init = init_load,

src/manager.h

-void init_manager(char** labels, int nb_sensors, int stat_mode);
+void init_manager(const char** labels, int nb_sensors, int stat_mode);
 void use_manager(struct timespec ts,
 		 const uint64_t* values, int nb_sensors,
 		 uint64_t stat_data);

src/memory.c

@@ -83,7 +83,7 @@ unsigned int get_memory(uint64_t *results, void *none)
     return MEMORY_COUNT;
 }
 
-void label_memory(char **labels, void *none)
+void label_memory(const char **labels, void *none)
 {
     UNUSED(none);
     memcpy(labels, memory_labels, sizeof(char *) * MEMORY_COUNT);

src/memory.h

@@ -21,7 +21,7 @@
 unsigned int init_memory(char *, void **);
 unsigned int get_memory(uint64_t *results, void *);
 void clean_memory(void *);
-void label_memory(char **labels, void *);
+void label_memory(const char **labels, void *);
 
 
 Sensor memory = {

src/memory_counters.c

@@ -101,7 +101,7 @@ unsigned int get_memory_counters(uint64_t *results, void *ptr)
     return counters->count;
 }
 
-void label_memory_counters(char **labels, void *ptr)
+void label_memory_counters(const char **labels, void *ptr)
 {
     MemoryCounters *counters = (MemoryCounters *)ptr;
     for (unsigned int i = 0; i < counters->count; i++) {

src/memory_counters.h

@@ -20,7 +20,7 @@
 
 unsigned int init_memory_counters(char *args, void **ptr);
 unsigned int get_memory_counters(uint64_t *results, void *ptr);
-void label_memory_counters(char **labels, void *ptr);
+void label_memory_counters(const char **labels, void *ptr);
 void clean_memory_counters(void *ptr);
 void *show_all_memory_counters(void *, size_t);
 

src/mojitos.c

@@ -210,7 +210,7 @@ int main(int argc, char **argv)
     struct timespec ts;
     struct timespec ts_ref;
 
-    char** labels = moj_labels();
+    const char** labels = moj_labels();
     init_manager(labels, nb_sensors, stat_mode);
 		 
     uint64_t stat_data = 0;

src/network.c

@@ -242,7 +242,7 @@ void clean_network(void *ptr)
     free(state);
 }
 
-void label_network(char **labels, void *ptr)
+void label_network(const char **labels, void *ptr)
 {
     struct Network *state = (struct Network *) ptr;
 

src/network.h

@@ -21,7 +21,7 @@
 unsigned int init_network(char *, void **);
 unsigned int get_network(uint64_t *results, void *);
 void clean_network(void *);
-void label_network(char **labels, void *);
+void label_network(const char **labels, void *);
 
 Sensor network = {
     .init = init_network,

src/rapl.c

@@ -206,7 +206,7 @@ void clean_rapl(void *ptr)
 }
 
 
-void label_rapl(char **labels, void *ptr)
+void label_rapl(const char **labels, void *ptr)
 {
     IntelRapl *rapl = (IntelRapl *) ptr;
 

src/rapl.h

@@ -21,7 +21,7 @@
 unsigned int init_rapl(char *, void **);
 unsigned int get_rapl(uint64_t *results, void *);
 void clean_rapl(void *);
-void label_rapl(char **labels, void *);
+void label_rapl(const char **labels, void *);
 
 Sensor rapl = {
     .init = init_rapl,