From: Martin Quinson Date: Sat, 20 Feb 2016 15:35:20 +0000 (+0100) Subject: fix some dead assignments reported by clang scan-build X-Git-Tag: v3_13~766 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7ea13a508781359049cc52ad576ba66b2c320721?hp=40cf34da0ddd264f8c3b8220f683de617809d464 fix some dead assignments reported by clang scan-build --- diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index 059ab243d4..47b9554636 100644 --- a/src/instr/instr_config.cpp +++ b/src/instr/instr_config.cpp @@ -142,7 +142,7 @@ int TRACE_start() if (TRACE_start_functions != NULL) { void (*func) (); - unsigned int iter = xbt_dynar_length(TRACE_start_functions); + unsigned int iter; xbt_dynar_foreach(TRACE_start_functions, iter, func) { func(); } diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp index 6cee84c608..af26fd6026 100644 --- a/src/simdag/sd_daxloader.cpp +++ b/src/simdag/sd_daxloader.cpp @@ -93,7 +93,7 @@ bool parents_are_marked(SD_task_t task){ } bool acyclic_graph_detail(xbt_dynar_t dag){ - unsigned int count=0, count_current=0; + unsigned int count, count_current=0; bool all_marked = true; SD_task_t task = NULL, parent_task = NULL, child_task = NULL; SD_dependency_t depbefore = NULL, depafter = NULL; @@ -106,19 +106,14 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ xbt_dynar_push(current, &task); } } - task = NULL; - count = 0; //test if something has to be done for the next iteration while(!xbt_dynar_is_empty(current)){ next = xbt_dynar_new(sizeof(SD_task_t),NULL); //test if the current iteration is done - count_current=0; xbt_dynar_foreach(current,count_current,task){ if (task == NULL) continue; - count = 0; //push task in next task->marked = 1; - count = 0; xbt_dynar_foreach(task->tasks_before,count,depbefore){ parent_task = depbefore->src; if(parent_task->kind == SD_TASK_COMM_E2E){ @@ -136,15 +131,12 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ } parent_task = NULL; } - task = NULL; - count = 0; } xbt_dynar_free(¤t); current = next; next = NULL; } xbt_dynar_free(¤t); - current = NULL; all_marked = true; xbt_dynar_foreach(dag,count,task){ if(task->kind == SD_TASK_COMM_E2E) continue; @@ -155,7 +147,6 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ break; } } - task = NULL; if(!all_marked){ XBT_VERB("there is at least one cycle in your task graph"); @@ -167,8 +158,6 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ } } - count = 0; - task = NULL; xbt_dynar_foreach(dag,count,task){ if(task->kind == SD_TASK_COMM_E2E) continue; if(xbt_dynar_is_empty(task->tasks_before)){ @@ -176,19 +165,14 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ xbt_dynar_push(current, &task); } } - task = NULL; - count = 0; //test if something has to be done for the next iteration while(!xbt_dynar_is_empty(current)){ next = xbt_dynar_new(sizeof(SD_task_t),NULL); //test if the current iteration is done - count_current=0; xbt_dynar_foreach(current,count_current,task){ if (task == NULL) continue; - count = 0; //push task in next task->marked = 1; - count = 0; xbt_dynar_foreach(task->tasks_after,count,depafter){ child_task = depbefore->dst; if(child_task->kind == SD_TASK_COMM_E2E){ @@ -206,15 +190,12 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ } child_task = NULL; } - task = NULL; - count = 0; } xbt_dynar_free(¤t); current = next; next = NULL; } xbt_dynar_free(¤t); - current = NULL; all_marked = true; xbt_dynar_foreach(dag,count,task){ if(task->kind == SD_TASK_COMM_E2E) continue; diff --git a/src/smpi/smpi_base.cpp b/src/smpi/smpi_base.cpp index 1a987ed230..f539078982 100644 --- a/src/smpi/smpi_base.cpp +++ b/src/smpi/smpi_base.cpp @@ -119,7 +119,6 @@ static xbt_dynar_t parse_factor(const char *smpi_coef_string) xbt_dynar_free(&radical_elements2); } xbt_dynar_free(&radical_elements); - iter=0; xbt_dynar_sort(smpi_factor, &factor_cmp); xbt_dynar_foreach(smpi_factor, iter, fact) { XBT_DEBUG("smpi_factor:\t%ld : %d values, first: %f", fact.factor, fact.nb_values ,fact.values[0]); diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp index f23508951a..f8422b4310 100644 --- a/src/surf/network_smpi.cpp +++ b/src/surf/network_smpi.cpp @@ -60,7 +60,6 @@ static xbt_dynar_t parse_factor(const char *smpi_coef_string) xbt_dynar_free(&radical_elements2); } xbt_dynar_free(&radical_elements); - iter=0; xbt_dynar_sort(smpi_factor, &factor_cmp); xbt_dynar_foreach(smpi_factor, iter, fact) { XBT_DEBUG("ordered smpi_factor:\t%ld : %f", fact.factor, fact.value); diff --git a/src/xbt/automaton/automaton.c b/src/xbt/automaton/automaton.c index 45934d2311..35a829f467 100644 --- a/src/xbt/automaton/automaton.c +++ b/src/xbt/automaton/automaton.c @@ -149,24 +149,22 @@ xbt_automaton_state_t xbt_automaton_state_exists(xbt_automaton_t a, char *id){ } void xbt_automaton_display(xbt_automaton_t a){ - unsigned int cursor = 0; + unsigned int cursor; xbt_automaton_state_t state = NULL; - printf("\n\nEtat courant : %s\n", a->current_state->id); + printf("\n\nCurrent state: %s\n", a->current_state->id); - printf("\nListe des états : %lu\n\n", xbt_dynar_length(a->states)); + printf("\nStates' List: %lu\n\n", xbt_dynar_length(a->states)); - xbt_dynar_foreach(a->states, cursor, state){ - printf("ID : %s, type : %d\n", state->id, state->type); - } + xbt_dynar_foreach(a->states, cursor, state) + printf("ID: %s, type: %d\n", state->id, state->type); - cursor=0; - xbt_automaton_transition_t transition = NULL; - printf("\nListe des transitions : %lu\n\n", xbt_dynar_length(a->transitions)); + xbt_automaton_transition_t transition; + printf("\nTransitions: %lu\n\n", xbt_dynar_length(a->transitions)); xbt_dynar_foreach(a->transitions, cursor, transition){ - printf("label :"); + printf("label:"); xbt_automaton_exp_label_display(transition->label); printf(", %s -> %s\n", transition->src->id, transition->dst->id); } diff --git a/src/xbt/graph.c b/src/xbt/graph.c index 1db1686e66..5e47cf9598 100644 --- a/src/xbt/graph.c +++ b/src/xbt/graph.c @@ -316,7 +316,6 @@ double *xbt_graph_get_length_matrix(xbt_graph_t g) } xbt_dynar_foreach(g->nodes, cursor, node) { - in_cursor = 0; D(cursor, cursor) = 0; xbt_dynar_foreach(node->out, in_cursor, edge) { diff --git a/src/xbt/log.c b/src/xbt/log.c index 03ceb2cc34..49d4529635 100644 --- a/src/xbt/log.c +++ b/src/xbt/log.c @@ -1095,7 +1095,6 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string) dot = control_string; control_string += strcspn(control_string, ":= "); eq = control_string; - control_string += strcspn(control_string, " "); if(*dot != '.' && (*eq == '=' || *eq == ':')) xbt_die ("Invalid control string '%s'", orig_control_string);