From: Francois Fleuret Date: Sat, 13 Mar 2010 10:27:37 +0000 (+0100) Subject: Cosmetics (variable name changes). X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=ee66d074b67bbd7a137acffc40175f3a689d3e0f;p=finddup.git Cosmetics (variable name changes). --- diff --git a/finddup.c b/finddup.c index 05c3999..098a623 100644 --- a/finddup.c +++ b/finddup.c @@ -361,7 +361,8 @@ void start(const char *dirname1, const char *dirname2) { struct file_with_size *list1, *list2; struct file_with_size *node1, *node2; int not_in, found; - int k, pp, l1, n; + int nb_groups, nb_nodes; + int list1_length, previous_progress; char *buffer1 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE); char *buffer2 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE); @@ -395,15 +396,15 @@ void start(const char *dirname1, const char *dirname2) { fprintf(stderr, "done.\n"); } - k = 0; - pp = -1; - n = 0; - l1 = file_list_length(list1); + nb_groups = 0; + previous_progress = -1; + nb_nodes = 0; + list1_length = file_list_length(list1); if(not_in) { for(node1 = list1; node1; node1 = node1->next) { - print_progress(l1, n, &pp); - n++; + print_progress(list1_length, nb_nodes, &previous_progress); + nb_nodes++; found = 0; @@ -424,8 +425,8 @@ void start(const char *dirname1, const char *dirname2) { } else { for(node1 = list1; node1; node1 = node1->next) { - print_progress(l1, n, &pp); - n++; + print_progress(list1_length, nb_nodes, &previous_progress); + nb_nodes++; for(node2 = list2; node2; node2 = node2->next) { if(node1->group_id < 0 || node2->group_id < 0) { @@ -434,9 +435,9 @@ void start(const char *dirname1, const char *dirname2) { if(node2->group_id >= 0) { node1->group_id = node2->group_id; } else { - node1->group_id = k; + node1->group_id = nb_groups; node1->dir_id = 1; - k++; + nb_groups++; } } if(node2->group_id < 0) {