X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Finclude%2Fgauger.h;h=54ba7f1f708d48b873adf87c741010df91274a77;hb=6ec7797ac937cb7e903688d5743c7debeda115fc;hp=9761cbeae65a27e971234c1f6e0ab5488c4ecddb;hpb=fb3c8466ece5cfca78b96331d69549de10636ac1;p=oweals%2Fgnunet.git diff --git a/src/include/gauger.h b/src/include/gauger.h index 9761cbeae..54ba7f1f7 100644 --- a/src/include/gauger.h +++ b/src/include/gauger.h @@ -1,4 +1,4 @@ -/** --------------------------------------------------------------------------- +/* --------------------------------------------------------------------------- * This software is in the public domain, furnished "as is", without technical * support, and with no warranty, express or implied, as to its usefulness for * any purpose. @@ -29,14 +29,14 @@ sprintf(__gauger_s,"%Lf", (long double) (value));\ __gauger_v[0] = "gauger";\ __gauger_v[1] = "-n";\ - __gauger_v[2] = counter;\ + __gauger_v[2] = (char*) (counter); \ __gauger_v[3] = "-d";\ __gauger_v[4] = __gauger_s;\ __gauger_v[5] = "-u";\ - __gauger_v[6] = unit;\ + __gauger_v[6] = (char*) (unit); \ __gauger_v[7] = "-c";\ - __gauger_v[8] = category;\ - __gauger_v[9] = (char *)NULL;\ + __gauger_v[8] = (char*) (category); \ + __gauger_v[9] = (char*) NULL;\ execvp("gauger",__gauger_v);\ _exit(1);\ }else{\ @@ -59,30 +59,51 @@ sprintf(__gauger_s,"%Lf", (long double) (value));\ __gauger_v[0] = "gauger";\ __gauger_v[1] = "-n";\ - __gauger_v[2] = counter;\ + __gauger_v[2] = (char*) (counter); \ __gauger_v[3] = "-d";\ __gauger_v[4] = __gauger_s;\ __gauger_v[5] = "-u";\ - __gauger_v[6] = unit;\ + __gauger_v[6] = (char*) (unit); \ __gauger_v[7] = "-i";\ __gauger_v[8] = id;\ __gauger_v[9] = "-c";\ - __gauger_v[10] = category;\ - __gauger_v[11] = (char *)NULL;\ + __gauger_v[10] = (char *) (category); \ + __gauger_v[11] = (char *) NULL;\ execvp("gauger",__gauger_v);\ _exit(1);\ }else{\ _exit(0);\ }\ }else{\ - waitpid(__gauger_p,NULL,0);\ + waitpid(__gauger_p, NULL, 0);\ }\ } -#else +#else /* WINDOWS */ + +#include +#include +#include + +#define GAUGER(category, counter, value, unit)\ +{\ + char __gauger_commandline[MAX_PATH];\ + \ + snprintf (__gauger_commandline, MAX_PATH, "gauger.py -n \"%s\" -d \"%Lf\" -u \"%s\" -c \"%s\"",\ + (counter), (long double) (value), (unit), (category)); \ + __gauger_commandline[MAX_PATH - 1] = '\0';\ + system (__gauger_commandline);\ +} -#define GAUGER_ID(category, counter, value, unit, id) {} -#define GAUGER(category, counter, value, unit) {} +#define GAUGER_ID(category, counter, value, unit, id)\ +{\ + char __gauger_commandline[MAX_PATH];\ + \ + snprintf (__gauger_commandline, MAX_PATH, "gauger.py -n \"%s\" -d \"%Lf\" -u \"%s\" -i \"%s\" -c \"%s\"",\ + (counter), (long double) (value), (unit), (id), (category)); \ + __gauger_commandline[MAX_PATH - 1] = '\0';\ + system (__gauger_commandline);\ +} #endif // WINDOWS