From: Arnaud Giersch Date: Thu, 14 Feb 2013 14:28:03 +0000 (+0100) Subject: Use xbt_XXX_is_empty() instead of testing xbt_XXX_length() against 0. X-Git-Tag: v3_9_90~491^2~21 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a3ebaa86f4ddc2bc225d676e9ce5028aad78f71a Use xbt_XXX_is_empty() instead of testing xbt_XXX_length() against 0. XXX is 'dict' or 'dynar'. --- diff --git a/examples/msg/bittorrent/peer.c b/examples/msg/bittorrent/peer.c index 2a9db33a5c..4c930b74d9 100644 --- a/examples/msg/bittorrent/peer.c +++ b/examples/msg/bittorrent/peer.c @@ -571,7 +571,7 @@ void update_choked_peers(peer_t peer) //remove a peer from the list xbt_dict_cursor_t cursor = NULL; xbt_dict_cursor_first(peer->active_peers, &cursor); - if (xbt_dict_length(peer->active_peers) > 0) { + if (!xbt_dict_is_empty(peer->active_peers)) { key = xbt_dict_cursor_get_key(cursor); connection_t peer_choked = xbt_dict_cursor_get_data(cursor); if (peer_choked) { diff --git a/examples/msg/kademlia/routing_table.c b/examples/msg/kademlia/routing_table.c index 022a98669d..62a73e1aba 100644 --- a/examples/msg/kademlia/routing_table.c +++ b/examples/msg/kademlia/routing_table.c @@ -58,7 +58,7 @@ void routing_table_print(routing_table_t table) XBT_INFO("Routing table of %08x:", table->id); for (i = 0; i <= identifier_size; i++) { - if (xbt_dynar_length(table->buckets[i].nodes) > 0) { + if (!xbt_dynar_is_empty(table->buckets[i].nodes)) { XBT_INFO("Bucket number %d: ", i); xbt_dynar_foreach(table->buckets[i].nodes, j, value) { XBT_INFO("Element %d: %08x", j, value); diff --git a/src/bindings/java/smx_context_cojava.c b/src/bindings/java/smx_context_cojava.c index 4d5dd53adc..5e135f21f3 100644 --- a/src/bindings/java/smx_context_cojava.c +++ b/src/bindings/java/smx_context_cojava.c @@ -247,7 +247,7 @@ static void smx_ctx_cojava_runall(void) { cojava_processes = SIMIX_process_get_runnable(); smx_process_t process; - if (xbt_dynar_length(cojava_processes) > 0) { + if (!xbt_dynar_is_empty(cojava_processes)) { process = xbt_dynar_get_as(cojava_processes, 0, smx_process_t); cojava_process_index = 1; /* Execute the first process */ diff --git a/src/instr/instr_paje_containers.c b/src/instr/instr_paje_containers.c index 68464748a6..7febbb3cef 100644 --- a/src/instr/instr_paje_containers.c +++ b/src/instr/instr_paje_containers.c @@ -229,7 +229,7 @@ void PJ_container_free_all () rootContainer = NULL; //checks - if (xbt_dict_length(allContainers) != 0){ + if (!xbt_dict_is_empty(allContainers)){ THROWF(tracing_error, 0, "some containers still present even after destroying all of them"); } } diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index d96dd72e4b..a8591eec76 100644 --- a/src/mc/mc_checkpoint.c +++ b/src/mc/mc_checkpoint.c @@ -498,7 +498,7 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap) cursor2++; } - if(xbt_dynar_length(compose) > 0){ + if(!xbt_dynar_is_empty(compose)){ frame_pointer_address = xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address ; } break; @@ -546,7 +546,7 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap) cursor++; } - if(xbt_dynar_length(compose) > 0){ + if(!xbt_dynar_is_empty(compose)){ if(strcmp(xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->type, "value") == 0){ to_append = bprintf("%s=%lx\n", current_variable->name, xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.res); xbt_strbuff_append(variables, to_append); diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c index f46e7ca6c8..11435255eb 100644 --- a/src/msg/msg_vm.c +++ b/src/msg/msg_vm.c @@ -171,7 +171,7 @@ void MSG_vm_shutdown(msg_vm_t vm) { msg_process_t process; XBT_DEBUG("%lu processes in the VM", xbt_dynar_length(vm->processes)); - while (xbt_dynar_length(vm->processes) > 0) { + while (!xbt_dynar_is_empty(vm->processes)) { process = xbt_dynar_get_as(vm->processes,0,msg_process_t); MSG_process_kill(process); }