[GNUnet-SVN] r14608 - gnunet/src/include

[gnunet]

Author: grothoff
Date: 2011-03-08 12:29:29 +0100 (Tue, 08 Mar 2011)
New Revision: 14608

Modified:
   gnunet/src/include/gauger.h
   gnunet/src/include/gnunet_transport_plugin.h
Log:
do not print to stderr

Modified: gnunet/src/include/gauger.h
===================================================================
--- gnunet/src/include/gauger.h 2011-03-07 10:47:42 UTC (rev 14607)
+++ gnunet/src/include/gauger.h 2011-03-08 11:29:29 UTC (rev 14608)
@@ -15,8 +15,8 @@
 #include <stdio.h>
 #include <sys/wait.h>
 
-#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);}}
+#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);}}
 
-#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);}}
+#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);}}
 
 #endif

Modified: gnunet/src/include/gnunet_transport_plugin.h
===================================================================
--- gnunet/src/include/gnunet_transport_plugin.h        2011-03-07 10:47:42 UTC 
(rev 14607)
+++ gnunet/src/include/gnunet_transport_plugin.h        2011-03-08 11:29:29 UTC 
(rev 14608)
@@ -112,7 +112,7 @@
                                                                               
GNUNET_MessageHeader *
                                                                               
message,
                                                                               
const struct GNUNET_TRANSPORT_ATS_Information *ats,
-                                                                  uint32_t 
ats_count,
+                                                                              
uint32_t ats_count,
                                                                               
struct Session *session,
                                                                               
const char *sender_address,
                                                                               
uint16_t sender_address_len);
@@ -171,10 +171,10 @@
  * @param cost pointer to the first element of struct 
GNUNET_TRANSPORT_ATS_Cost_Information[]
  */
 typedef void (*GNUNET_TRANSPORT_CostReport) (void *cls,
-                                                                               
         const struct GNUNET_PeerIdentity *peer,
+                                            const struct GNUNET_PeerIdentity 
*peer,
                                              const void *addr,
                                              uint16_t addrlen,
-                                                                               
         struct GNUNET_TRANSPORT_ATS_Information * cost);
+                                            struct 
GNUNET_TRANSPORT_ATS_Information * cost);
 
 /**
  * The transport service will pass a pointer to a struct