From: Arnaud Giersch Date: Fri, 27 Apr 2012 10:03:57 +0000 (+0200) Subject: Empty argument is allowed for XBT_IN(). X-Git-Tag: v3_7~51 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/027274ae8707c374384dbef37ae24a1c80b4fd10 Empty argument is allowed for XBT_IN(). --- diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c index e304553b1b..ce6a7e57ae 100644 --- a/src/gras/Transport/transport.c +++ b/src/gras/Transport/transport.c @@ -190,7 +190,7 @@ void gras_socket_close(xbt_socket_t sock) xbt_socket_t sock_iter = NULL; unsigned int cursor; - XBT_IN(""); + XBT_IN(); XBT_VERB("Close %p", sock); if (sock == _gras_lastly_selected_socket) { xbt_assert(!gras_opt_trp_nomoredata_on_close || !sock->moredata, diff --git a/src/surf/lagrange.c b/src/surf/lagrange.c index c04dcdeea5..91455ab604 100644 --- a/src/surf/lagrange.c +++ b/src/surf/lagrange.c @@ -376,7 +376,7 @@ static double dichotomy(double init, double diff(double, void *), double diff_0 = 0.0; min = max = init; - XBT_IN(""); + XBT_IN(); if (init == 0.0) { min = max = 0.5; @@ -485,7 +485,7 @@ static double partial_diff_lambda(double lambda, void *param_cnst) double diff = 0.0; double sigma_i = 0.0; - XBT_IN(""); + XBT_IN(); elem_list = &(cnst->element_set); XBT_CDEBUG(surf_lagrange_dichotomy, "Computing diff of cnst (%p)", cnst); diff --git a/src/xbt/config.c b/src/xbt/config.c index 049aa7f9a3..8bc054aac9 100644 --- a/src/xbt/config.c +++ b/src/xbt/config.c @@ -595,7 +595,7 @@ void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options) int len; - XBT_IN(""); + XBT_IN(); if (!options || !strlen(options)) { /* nothing to do */ return; } diff --git a/src/xbt/datadesc/ddt_create.c b/src/xbt/datadesc/ddt_create.c index 0dac216628..e1cf03b55d 100644 --- a/src/xbt/datadesc/ddt_create.c +++ b/src/xbt/datadesc/ddt_create.c @@ -122,7 +122,7 @@ xbt_datadesc_scalar(const char *name, xbt_datadesc_type_t res; long int arch; - XBT_IN(""); + XBT_IN(); res = xbt_datadesc_by_name_or_null(name); if (res) { xbt_assert(res->category_code == e_xbt_datadesc_type_cat_scalar, @@ -156,7 +156,7 @@ xbt_datadesc_scalar(const char *name, void xbt_dd_cat_field_free(void *f) { xbt_dd_cat_field_t field = *(xbt_dd_cat_field_t *) f; - XBT_IN(""); + XBT_IN(); if (field) { free(field->name); free(field); @@ -268,7 +268,7 @@ xbt_datadesc_struct_append(xbt_datadesc_type_t struct_type, void xbt_datadesc_struct_close(xbt_datadesc_type_t struct_type) { int arch; - XBT_IN(""); + XBT_IN(); struct_type->category.struct_data.closed = 1; for (arch = 0; arch < xbt_arch_count; arch++) { struct_type->size[arch] = struct_type->aligned_size[arch]; diff --git a/src/xbt/datadesc/ddt_parse.c b/src/xbt/datadesc/ddt_parse.c index 7165982386..9947261eb7 100644 --- a/src/xbt/datadesc/ddt_parse.c +++ b/src/xbt/datadesc/ddt_parse.c @@ -42,7 +42,7 @@ extern char *xbt_ddt_parse_text; /* text being considered in the parser */ /* local functions */ static void parse_type_modifier(type_modifier_t type_modifier) { - XBT_IN(""); + XBT_IN(); do { if (xbt_ddt_parse_tok_num == XBT_DDT_PARSE_TOKEN_STAR) { /* This only used when parsing 'short *' since this function returns when int, float, double,... is encountered */ @@ -96,7 +96,7 @@ static void print_type_modifier(s_type_modifier_t tm) { int i; - XBT_IN(""); + XBT_IN(); if (tm.is_unsigned) printf("(unsigned) "); if (tm.is_short) @@ -121,7 +121,7 @@ static void change_to_fixed_array(xbt_dynar_t dynar, long int size) s_identifier_t former, array; memset(&array, 0, sizeof(array)); - XBT_IN(""); + XBT_IN(); xbt_dynar_pop(dynar, &former); array.type_name = (char *) xbt_malloc(strlen(former.type->name) + 48); XBT_DEBUG("Array specification (size=%ld, elm='%s'), change pushed type", @@ -144,7 +144,7 @@ static void change_to_ref(xbt_dynar_t dynar) s_identifier_t former, ref; memset(&ref, 0, sizeof(ref)); - XBT_IN(""); + XBT_IN(); xbt_dynar_pop(dynar, &former); ref.type_name = (char *) xbt_malloc(strlen(former.type->name) + 2); XBT_DEBUG("Ref specification (elm='%s'), change pushed type", @@ -164,7 +164,7 @@ static void change_to_ref_pop_array(xbt_dynar_t dynar) s_identifier_t former, ref; memset(&ref, 0, sizeof(ref)); - XBT_IN(""); + XBT_IN(); xbt_dynar_pop(dynar, &former); ref.type = xbt_datadesc_ref_pop_arr(former.type); /* redeclaration are ignored */ ref.type_name = (char *) strdup(ref.type->name); @@ -182,7 +182,7 @@ static void change_to_dynar_of(xbt_dynar_t dynar, s_identifier_t former, ref; memset(&ref, 0, sizeof(ref)); - XBT_IN(""); + XBT_IN(); xbt_dynar_pop(dynar, &former); ref.type = xbt_datadesc_dynar(subtype, NULL); /* redeclaration are ignored */ ref.type_name = (char *) strdup(ref.type->name); @@ -200,7 +200,7 @@ static void change_to_matrix_of(xbt_dynar_t dynar, s_identifier_t former, ref; memset(&ref, 0, sizeof(ref)); - XBT_IN(""); + XBT_IN(); xbt_dynar_pop(dynar, &former); ref.type = xbt_datadesc_matrix(subtype, NULL); /* redeclaration are ignored */ ref.type_name = (char *) strdup(ref.type->name); @@ -217,7 +217,7 @@ static void add_free_f(xbt_dynar_t dynar, void_f_pvoid_t free_f) s_identifier_t former, ref; memset(&ref, 0, sizeof(ref)); - XBT_IN(""); + XBT_IN(); xbt_dynar_pop(dynar, &former); memcpy(former.type->extra, free_f, sizeof(free_f)); xbt_dynar_push(dynar, &former); @@ -234,7 +234,7 @@ static void parse_statement(char *definition, int expect_id_separator = 0; - XBT_IN(""); + XBT_IN(); memset(&identifier, 0, sizeof(identifier)); xbt_ddt_parse_tok_num = xbt_ddt_parse_lex_n_dump(); @@ -616,7 +616,7 @@ static xbt_datadesc_type_t parse_struct(char *definition) volatile xbt_datadesc_type_t struct_type; - XBT_IN(""); + XBT_IN(); identifiers = xbt_dynar_new(sizeof(s_identifier_t), NULL); fields_to_push = xbt_dynar_new(sizeof(char *), NULL); @@ -706,7 +706,7 @@ static xbt_datadesc_type_t parse_typedef(char *definition) xbt_datadesc_type_t typedef_desc = NULL; - XBT_IN(""); + XBT_IN(); memset(&tm, 0, sizeof(tm)); /* get the aliased type */ @@ -751,7 +751,7 @@ xbt_datadesc_parse(const char *name, const char *C_statement) int semicolon_count = 0; int def_count, C_count; - XBT_IN(""); + XBT_IN(); /* reput the \n in place for debug */ for (C_count = 0; C_statement[C_count] != '\0'; C_count++) if (C_statement[C_count] == ';' || C_statement[C_count] == '{') diff --git a/src/xbt/xbt_socket.c b/src/xbt/xbt_socket.c index fd4ad3f185..4be45814ac 100644 --- a/src/xbt/xbt_socket.c +++ b/src/xbt/xbt_socket.c @@ -277,7 +277,7 @@ void xbt_socket_meas_send(xbt_socket_t peer, char *chunk = NULL; unsigned long int sent_sofar; - XBT_IN(""); + XBT_IN(); THROWF(unknown_error, 0, "measurement sockets were broken in this release of SimGrid and should be ported back in the future." "If you depend on it, sorry, you have to use an older version, or wait for the future version using it..."); @@ -328,7 +328,7 @@ void xbt_socket_meas_recv(xbt_socket_t peer, char *chunk = NULL; unsigned long int got_sofar; - XBT_IN(""); + XBT_IN(); THROWF(unknown_error,0,"measurement sockets were broken in this release of SimGrid and should be ported back in the future." "If you depend on it, sorry, you have to use an older version, or wait for the future version using it..."); diff --git a/src/xbt/xbt_trp_plugin_tcp.c b/src/xbt/xbt_trp_plugin_tcp.c index bbe7f488af..cf171bf3a6 100644 --- a/src/xbt/xbt_trp_plugin_tcp.c +++ b/src/xbt/xbt_trp_plugin_tcp.c @@ -224,7 +224,7 @@ static xbt_socket_t xbt_trp_sock_socket_accept(xbt_socket_t sock) int failed = 0; - XBT_IN(""); + XBT_IN(); xbt_socket_new_ext(1, &res, sock->plugin, sock->buf_size, 0); sd = accept(sock->sd, (struct sockaddr *) &peer_in, &peer_in_len); @@ -419,7 +419,7 @@ static void xbt_trp_bufiov_flush(xbt_socket_t sock) int size; #endif xbt_trp_bufdata_t *data = sock->bufdata; - XBT_IN(""); + XBT_IN(); XBT_DEBUG("Flush"); if (data->out == buffering_buf) { @@ -468,7 +468,7 @@ xbt_trp_buf_send(xbt_socket_t sock, xbt_trp_bufdata_t *data = (xbt_trp_bufdata_t *) sock->bufdata; int chunk_pos = 0; - XBT_IN(""); + XBT_IN(); while (chunk_pos < size) { /* size of the chunk to receive in that shot */ @@ -502,7 +502,7 @@ xbt_trp_buf_recv(xbt_socket_t sock, char *chunk, unsigned long int size) xbt_trp_bufdata_t *data = sock->bufdata; long int chunk_pos = 0; - XBT_IN(""); + XBT_IN(); while (chunk_pos < size) { /* size of the chunk to receive in that shot */