diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-03-08 11:29:29 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-03-08 11:29:29 +0000 |
commit | 2f02cbbfb34c8994a6fa5efb0dce1bd3c5a6833b (patch) | |
tree | 635ee94081144ac9df29d31726abb56d3637b325 /src/include | |
parent | e4dd537d1b8b66a750d963c6502c7f48e2e810a3 (diff) | |
download | gnunet-2f02cbbfb34c8994a6fa5efb0dce1bd3c5a6833b.tar.gz gnunet-2f02cbbfb34c8994a6fa5efb0dce1bd3c5a6833b.zip |
do not print to stderr
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gauger.h | 4 | ||||
-rw-r--r-- | src/include/gnunet_transport_plugin.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/include/gauger.h b/src/include/gauger.h index 290be8dc1..8c4e9e3fb 100644 --- a/src/include/gauger.h +++ b/src/include/gauger.h | |||
@@ -15,8 +15,8 @@ | |||
15 | #include <stdio.h> | 15 | #include <stdio.h> |
16 | #include <sys/wait.h> | 16 | #include <sys/wait.h> |
17 | 17 | ||
18 | #define GAUGER(category, counter, value, unit) {char* __gauger_v[10];char __gauger_s[32];pid_t __gauger_p; if(!(__gauger_p=fork())){if(!fork()){sprintf(__gauger_s,"%llu", (unsigned long long) (value));__gauger_v[0] = "gauger-cli.py";__gauger_v[1] = "-n";__gauger_v[2] = counter;__gauger_v[3] = "-d";__gauger_v[4] = __gauger_s;__gauger_v[5] = "-u";__gauger_v[6] = unit;__gauger_v[7] = "-c";__gauger_v[8] = category;__gauger_v[9] = (char *)NULL;execvp("gauger-cli.py",__gauger_v);perror("gauger");_exit(1);}else{_exit(0);}}else{waitpid(__gauger_p,NULL,0);}} | 18 | #define GAUGER(category, counter, value, unit) {char* __gauger_v[10];char __gauger_s[32];pid_t __gauger_p; if(!(__gauger_p=fork())){if(!fork()){sprintf(__gauger_s,"%llu", (unsigned long long) (value));__gauger_v[0] = "gauger-cli.py";__gauger_v[1] = "-n";__gauger_v[2] = counter;__gauger_v[3] = "-d";__gauger_v[4] = __gauger_s;__gauger_v[5] = "-u";__gauger_v[6] = unit;__gauger_v[7] = "-c";__gauger_v[8] = category;__gauger_v[9] = (char *)NULL; close(2); execvp("gauger-cli.py",__gauger_v);perror("gauger");_exit(1);}else{_exit(0);}}else{waitpid(__gauger_p,NULL,0);}} |
19 | 19 | ||
20 | #define GAUGER_ID(category, counter, value, unit, id) {char* __gauger_v[12];char __gauger_s[32];pid_t __gauger_p; if(!(__gauger_p=fork())){if(!fork()){sprintf(__gauger_s,"%llu", (unsigned long long) (value));__gauger_v[0] = "gauger-cli.py";__gauger_v[1] = "-n";__gauger_v[2] = counter;__gauger_v[3] = "-d";__gauger_v[4] = __gauger_s;__gauger_v[5] = "-u";__gauger_v[6] = unit;__gauger_v[7] = "-i";__gauger_v[8] = id;__gauger_v[9] = "-c";__gauger_v[10] = category;__gauger_v[11] = (char *)NULL;execvp("gauger-cli.py",__gauger_v);perror("gauger");_exit(1);}else{_exit(0);}}else{waitpid(__gauger_p,NULL,0);}} | 20 | #define GAUGER_ID(category, counter, value, unit, id) {char* __gauger_v[12];char __gauger_s[32];pid_t __gauger_p; if(!(__gauger_p=fork())){if(!fork()){sprintf(__gauger_s,"%llu", (unsigned long long) (value));__gauger_v[0] = "gauger-cli.py";__gauger_v[1] = "-n";__gauger_v[2] = counter;__gauger_v[3] = "-d";__gauger_v[4] = __gauger_s;__gauger_v[5] = "-u";__gauger_v[6] = unit;__gauger_v[7] = "-i";__gauger_v[8] = id;__gauger_v[9] = "-c";__gauger_v[10] = category;__gauger_v[11] = (char *)NULL; close(2); execvp("gauger-cli.py",__gauger_v);perror("gauger");_exit(1);}else{_exit(0);}}else{waitpid(__gauger_p,NULL,0);}} |
21 | 21 | ||
22 | #endif | 22 | #endif |
diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h index d8e567106..507d95abe 100644 --- a/src/include/gnunet_transport_plugin.h +++ b/src/include/gnunet_transport_plugin.h | |||
@@ -112,7 +112,7 @@ typedef struct GNUNET_TIME_Relative (*GNUNET_TRANSPORT_PluginReceiveCallback) (v | |||
112 | GNUNET_MessageHeader * | 112 | GNUNET_MessageHeader * |
113 | message, | 113 | message, |
114 | const struct GNUNET_TRANSPORT_ATS_Information *ats, | 114 | const struct GNUNET_TRANSPORT_ATS_Information *ats, |
115 | uint32_t ats_count, | 115 | uint32_t ats_count, |
116 | struct Session *session, | 116 | struct Session *session, |
117 | const char *sender_address, | 117 | const char *sender_address, |
118 | uint16_t sender_address_len); | 118 | uint16_t sender_address_len); |
@@ -171,10 +171,10 @@ typedef struct GNUNET_TIME_Relative (*GNUNET_TRANSPORT_TrafficReport) (void *cls | |||
171 | * @param cost pointer to the first element of struct GNUNET_TRANSPORT_ATS_Cost_Information[] | 171 | * @param cost pointer to the first element of struct GNUNET_TRANSPORT_ATS_Cost_Information[] |
172 | */ | 172 | */ |
173 | typedef void (*GNUNET_TRANSPORT_CostReport) (void *cls, | 173 | typedef void (*GNUNET_TRANSPORT_CostReport) (void *cls, |
174 | const struct GNUNET_PeerIdentity *peer, | 174 | const struct GNUNET_PeerIdentity *peer, |
175 | const void *addr, | 175 | const void *addr, |
176 | uint16_t addrlen, | 176 | uint16_t addrlen, |
177 | struct GNUNET_TRANSPORT_ATS_Information * cost); | 177 | struct GNUNET_TRANSPORT_ATS_Information * cost); |
178 | 178 | ||
179 | /** | 179 | /** |
180 | * The transport service will pass a pointer to a struct | 180 | * The transport service will pass a pointer to a struct |