From e10c8cc37c59200273c80d6db4aa93672feb45b6 Mon Sep 17 00:00:00 2001 From: mquinson Date: Tue, 28 Sep 2004 11:27:30 +0000 Subject: [PATCH] Only use the C comment style, not the C++ one git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@435 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/Makefile.am | 2 ++ src/amok/bandwidth.c | 6 ++-- src/gras/Transport/rl_transport.c | 2 +- src/gras/Transport/sg_transport.c | 2 +- src/gras/Transport/transport_plugin_tcp.c | 2 +- src/xbt/dict_multi.c | 6 ++-- testsuite/gras/datadesc_usage.c | 4 +-- testsuite/gras/trp_file_client.c | 2 +- testsuite/gras/trp_file_server.c | 2 +- testsuite/gras/trp_tcp_client.c | 2 +- testsuite/gras/trp_tcp_server.c | 2 +- testsuite/xbt/dict_crash.c | 6 ++-- testsuite/xbt/dict_usage.c | 10 +++--- testsuite/xbt/log_usage.c | 44 +++++------------------ testsuite/xbt/multidict_crash.c | 2 +- testsuite/xbt/set_usage.c | 8 ++--- 16 files changed, 39 insertions(+), 63 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 8eda89ffa8..8c1b5298a5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS=. # amok not ported to GRAS NG yet + +AM_CFLAGS= -g #AM_CFLAGS= -DNDEBUG # -DNLOG cuts absolutely all logs at compilation time. diff --git a/src/amok/bandwidth.c b/src/amok/bandwidth.c index a9917ff63a..167559c1cf 100644 --- a/src/amok/bandwidth.c +++ b/src/amok/bandwidth.c @@ -222,8 +222,8 @@ int grasbw_cbBWHandshake(gras_msg_t *msg) { ans->expSize=gras_msg_ctn(msg,0,0,BwExp_t).expSize; ans->msgSize=gras_msg_ctn(msg,0,0,BwExp_t).msgSize; ans->port=gras_rawsock_get_peer_port(rawIn); - // fprintf(stderr,"grasbw_cbHandshake. bufSize=%d expSize=%d msgSize=%d port=%d\n", - // ans->bufSize,ans->expSize,ans->msgSize,ans->port); + /* fprintf(stderr,"grasbw_cbHandshake. bufSize=%d expSize=%d msgSize=%d port=%d\n", + ans->bufSize,ans->expSize,ans->msgSize,ans->port);*/ if ((errcode=gras_msg_new_and_send(msg->sock,GRASMSG_BW_HANDSHAKED, 1, ans, 1))) { @@ -305,7 +305,7 @@ gras_error_t grasbw_request(const char* from_name,unsigned int from_port, return errcode; } - // fprintf(stderr,"sec=%p",gras_msg_ctn(answer,1,0,msgResult_t)); + /* fprintf(stderr,"sec=%p",gras_msg_ctn(answer,1,0,msgResult_t)); */ *sec=gras_msg_ctn(answer,1,0,msgResult_t).value; *bw=gras_msg_ctn(answer,1,1,msgResult_t).value; diff --git a/src/gras/Transport/rl_transport.c b/src/gras/Transport/rl_transport.c index 13d17b685a..0dce317b46 100644 --- a/src/gras/Transport/rl_transport.c +++ b/src/gras/Transport/rl_transport.c @@ -40,7 +40,7 @@ gras_trp_select(double timeout, double wakeup = gras_os_time() + 1000000*timeout; double now = 0; /* nextToService used to make sure socket with high number do not starve */ - // static int nextToService = 0; + /* static int nextToService = 0; */ struct timeval tout, *p_tout; int max_fds=0; /* first arg of select: number of existing sockets */ diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c index 38acc704ab..93dc5c798d 100644 --- a/src/gras/Transport/sg_transport.c +++ b/src/gras/Transport/sg_transport.c @@ -136,7 +136,7 @@ gras_trp_select(double timeout, MSG_process_get_name(MSG_process_self()), MSG_host_get_name(MSG_host_self())); */ - // MSG_process_sleep(1); + /* MSG_process_sleep(1); */ MSG_process_sleep(0.01); } } while (gras_os_time()-startTime < timeout diff --git a/src/gras/Transport/transport_plugin_tcp.c b/src/gras/Transport/transport_plugin_tcp.c index 6fa9cb5ae1..988b6e7a9f 100644 --- a/src/gras/Transport/transport_plugin_tcp.c +++ b/src/gras/Transport/transport_plugin_tcp.c @@ -156,7 +156,7 @@ gras_error_t gras_trp_tcp_socket_client(gras_trp_plugin_t *self, gras_error_t gras_trp_tcp_socket_server(gras_trp_plugin_t *self, unsigned short port, /* OUT */ gras_socket_t *sock){ -// int size = bufSize * 1024; +/* int size = bufSize * 1024; */ int on = 1; struct sockaddr_in server; diff --git a/src/xbt/dict_multi.c b/src/xbt/dict_multi.c index b9a9d26faa..e1fd5ef723 100644 --- a/src/xbt/dict_multi.c +++ b/src/xbt/dict_multi.c @@ -150,9 +150,9 @@ gras_multidict_get_ext(gras_dictelm_t *p_head, i++; } - if (p_elm) { // Found all dicts to the data + if (p_elm) { /* Found all dicts to the data */ - // gras_dict_dump(dict,&gras_dict_prints); + /* gras_dict_dump(dict,&gras_dict_prints); */ return gras_dict_get_ext(p_elm, key[i], key_len[i], data); } else { @@ -216,7 +216,7 @@ gras_multidict_remove_ext(gras_dictelm_t *p_head, } if (p_elm) { - // Found all dicts to the data + /* Found all dicts to the data */ return gras_dict_remove_ext(p_elm, key[i], key_len[i]); } else { return 1; diff --git a/testsuite/gras/datadesc_usage.c b/testsuite/gras/datadesc_usage.c index 25e9d30280..ea8f45abc4 100644 --- a/testsuite/gras/datadesc_usage.c +++ b/testsuite/gras/datadesc_usage.c @@ -549,7 +549,7 @@ gras_error_t test_clause(gras_socket_t *sock, int direction) { /* create the damn type descriptor */ ddt = gras_datadesc_by_symbol(s_clause); -// gras_datadesc_type_dump(ddt); +/* gras_datadesc_type_dump(ddt); */ TRYFAIL(gras_datadesc_ref("Clause*",ddt,&ddt)); @@ -617,7 +617,7 @@ int main(int argc,char *argv[]) { TRYFAIL(declare_chained_list_type()); TRYFAIL(test_chain_list(sock,direction)); - // TRYFAIL(test_graph(sock,direction)); + /* TRYFAIL(test_graph(sock,direction)); */ TRYFAIL(test_pbio(sock,direction)); diff --git a/testsuite/gras/trp_file_client.c b/testsuite/gras/trp_file_client.c index d27323d617..a95983210a 100644 --- a/testsuite/gras/trp_file_client.c +++ b/testsuite/gras/trp_file_client.c @@ -12,7 +12,7 @@ #include #include "gras/Transport/transport_interface.h" -//GRAS_LOG_NEW_DEFAULT_CATEGORY(test); +/* GRAS_LOG_NEW_DEFAULT_CATEGORY(test); */ int main(int argc,char *argv[]) { gras_socket_t *sock; diff --git a/testsuite/gras/trp_file_server.c b/testsuite/gras/trp_file_server.c index b3b23b810a..0406320d75 100644 --- a/testsuite/gras/trp_file_server.c +++ b/testsuite/gras/trp_file_server.c @@ -12,7 +12,7 @@ #include #include "gras/Transport/transport_interface.h" -//GRAS_LOG_NEW_DEFAULT_CATEGORY(test); +/*GRAS_LOG_NEW_DEFAULT_CATEGORY(test);*/ int main(int argc,char *argv[]) { gras_socket_t *sock, *conn; diff --git a/testsuite/gras/trp_tcp_client.c b/testsuite/gras/trp_tcp_client.c index fa6a09b59d..129e354c22 100644 --- a/testsuite/gras/trp_tcp_client.c +++ b/testsuite/gras/trp_tcp_client.c @@ -12,7 +12,7 @@ #include #include "gras/Transport/transport_interface.h" -//GRAS_LOG_NEW_DEFAULT_CATEGORY(test); +/*GRAS_LOG_NEW_DEFAULT_CATEGORY(test);*/ int main(int argc,char *argv[]) { gras_socket_t * sock; diff --git a/testsuite/gras/trp_tcp_server.c b/testsuite/gras/trp_tcp_server.c index 4611682288..be8fb9f209 100644 --- a/testsuite/gras/trp_tcp_server.c +++ b/testsuite/gras/trp_tcp_server.c @@ -12,7 +12,7 @@ #include #include "gras/Transport/transport_interface.h" -//GRAS_LOG_NEW_DEFAULT_CATEGORY(test); +/*GRAS_LOG_NEW_DEFAULT_CATEGORY(test);*/ int main(int argc,char *argv[]) { gras_socket_t *sock, *conn; diff --git a/testsuite/xbt/dict_crash.c b/testsuite/xbt/dict_crash.c index 99dadb3e5c..5a3ddef4ab 100644 --- a/testsuite/xbt/dict_crash.c +++ b/testsuite/xbt/dict_crash.c @@ -29,7 +29,7 @@ static gras_error_t traverse(gras_dict_t *head) { char *data; gras_dict_foreach(head,cursor,key,data) { - // printf(" Seen: %s=%s\n",key,data); + /* printf(" Seen: %s=%s\n",key,data); */ gras_assert2 (!strcmp(key,data), "Key(%s) != value(%s). Abording\n",key,data); } @@ -76,11 +76,11 @@ int main(int argc,char **argv) { for (k=0;k #include diff --git a/testsuite/xbt/multidict_crash.c b/testsuite/xbt/multidict_crash.c index c730666887..c1bcac8b48 100644 --- a/testsuite/xbt/multidict_crash.c +++ b/testsuite/xbt/multidict_crash.c @@ -51,7 +51,7 @@ static gras_error_t test1() { } val[l][k]='\0'; if (verbose) printf("%s ; ",val[l]); - key[l]=val[l];// NOWADAYS, no need to strdup the key. + key[l]=val[l];/* NOWADAYS, no need to strdup the key. */ } if (verbose) printf("in multitree %p.\n",head); TRYFAIL(gras_multidict_set(&head,MULTICACHE_DEPTH,key, diff --git a/testsuite/xbt/set_usage.c b/testsuite/xbt/set_usage.c index 81730ad22b..7900c340f0 100644 --- a/testsuite/xbt/set_usage.c +++ b/testsuite/xbt/set_usage.c @@ -86,9 +86,9 @@ static gras_error_t fill(gras_set_t **set) { TRY(debuged_add(*set,"12b")); TRY(debuged_add(*set,"123")); TRY(debuged_add(*set,"123456")); - // Child becomes child of what to add + /* Child becomes child of what to add */ TRY(debuged_add(*set,"1234")); - // Need of common ancestor + /* Need of common ancestor */ TRY(debuged_add(*set,"123457")); return no_error; @@ -190,7 +190,7 @@ int main(int argc,char **argv) { printf(" - Change 12a to '12a'\n"); TRYFAIL(debuged_add_with_data(set,"12a","12a")); - // gras_dict_dump(head,(void (*)(void*))&printf); + /* gras_dict_dump(head,(void (*)(void*))&printf); */ printf(" - Traverse the resulting data set\n"); TRYFAIL(traverse(set)); @@ -225,7 +225,7 @@ int main(int argc,char **argv) { printf(" - Traverse the resulting data set\n"); TRYFAIL(traverse(set)); - // gras_dict_dump(head,(void (*)(void*))&printf); + /* gras_dict_dump(head,(void (*)(void*))&printf); */ printf(" Free the data set (twice)\n"); gras_set_free(&set); -- 2.20.1