undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

combine-diff.c: type sanity

Browse Source 
- combine_diff() took cnt (count) which is unsigned in nature but the
  parameter type was declared as "int";
- find_next() took "uninteresting" parameter, which masked a static
  function of the same name;
- show_parent_lno() took an unused parameter "cnt";
- show_patch_diff() used a local variable in nested inner scope with
  the same name with different type, masking the one in the outer scope;
- the last loop in show_patch_diff iterated over lines so it should use
  the local variable "lno"

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-06-28 01:38:19 -07:00
parent 8dcaefb52f
commit 2386c2975d
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
combine-diff.c
View File

@ -205,7 +205,8 @@ static void consume_line(void *state_, char *line, unsigned long len)
} }
static void combine_diff(const unsigned char *parent, mmfile_t *result_file, static void combine_diff(const unsigned char *parent, mmfile_t *result_file,
struct sline *sline, int cnt, int n, int num_parent) struct sline *sline, unsigned int cnt, int n,
int num_parent)
{ {
unsigned int p_lno, lno; unsigned int p_lno, lno;
unsigned long nmask = (1UL << n); unsigned long nmask = (1UL << n);
@ -293,7 +294,7 @@ static unsigned long find_next(struct sline *sline,
unsigned long mark, unsigned long mark,
unsigned long i, unsigned long i,
unsigned long cnt, unsigned long cnt,
int uninteresting) int look_for_uninteresting)
{ {
/* We have examined up to i-1 and are about to look at i. /* We have examined up to i-1 and are about to look at i.
* Find next interesting or uninteresting line. Here, * Find next interesting or uninteresting line. Here,
@ -303,7 +304,7 @@ static unsigned long find_next(struct sline *sline,
* that are surrounded by interesting() ones. * that are surrounded by interesting() ones.
*/ */
while (i <= cnt) while (i <= cnt)
if (uninteresting if (look_for_uninteresting
? !(sline[i].flag & mark) ? !(sline[i].flag & mark)
: (sline[i].flag & mark)) : (sline[i].flag & mark))
return i; return i;
@ -489,7 +490,7 @@ static int make_hunks(struct sline *sline, unsigned long cnt,
return has_interesting; return has_interesting;
} }
static void show_parent_lno(struct sline *sline, unsigned long l0, unsigned long l1, unsigned long cnt, int n) static void show_parent_lno(struct sline *sline, unsigned long l0, unsigned long l1, int n)
{ {
l0 = sline[l0].p_lno[n]; l0 = sline[l0].p_lno[n];
l1 = sline[l1].p_lno[n]; l1 = sline[l1].p_lno[n];
@ -523,7 +524,7 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent)
rlines--; /* pointing at the last delete hunk */ rlines--; /* pointing at the last delete hunk */
for (i = 0; i <= num_parent; i++) putchar(combine_marker); for (i = 0; i <= num_parent; i++) putchar(combine_marker);
for (i = 0; i < num_parent; i++) for (i = 0; i < num_parent; i++)
show_parent_lno(sline, lno, hunk_end, cnt, i); show_parent_lno(sline, lno, hunk_end, i);
printf(" +%lu,%lu ", lno+1, rlines); printf(" +%lu,%lu ", lno+1, rlines);
for (i = 0; i <= num_parent; i++) putchar(combine_marker); for (i = 0; i <= num_parent; i++) putchar(combine_marker);
putchar('\n'); putchar('\n');
@ -619,18 +620,18 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
if (0 <= (fd = open(elem->path, O_RDONLY)) && if (0 <= (fd = open(elem->path, O_RDONLY)) &&
!fstat(fd, &st)) { !fstat(fd, &st)) {
int len = st.st_size; int len = st.st_size;
int cnt = 0; int sz = 0;
elem->mode = canon_mode(st.st_mode); elem->mode = canon_mode(st.st_mode);
result_size = len; result_size = len;
result = xmalloc(len + 1); result = xmalloc(len + 1);
while (cnt < len) { while (sz < len) {
int done = xread(fd, result+cnt, len-cnt); int done = xread(fd, result+sz, len-sz);
if (done == 0) if (done == 0)
break; break;
if (done < 0) if (done < 0)
die("read error '%s'", elem->path); die("read error '%s'", elem->path);
cnt += done; sz += done;
} }
result[len] = 0; result[len] = 0;
} }
@ -645,7 +646,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
close(fd); close(fd);
} }
for (cnt = 0, cp = result; cp - result < result_size; cp++) { for (cnt = 0, cp = result; cp < result + result_size; cp++) {
if (*cp == '\n') if (*cp == '\n')
cnt++; cnt++;
} }
@ -658,7 +659,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
sline[lno].lost_tail = &sline[lno].lost_head; sline[lno].lost_tail = &sline[lno].lost_head;
sline[lno].flag = 0; sline[lno].flag = 0;
} }
for (lno = 0, cp = result; cp - result < result_size; cp++) { for (lno = 0, cp = result; cp < result + result_size; cp++) {
if (*cp == '\n') { if (*cp == '\n') {
sline[lno].len = cp - sline[lno].bol; sline[lno].len = cp - sline[lno].bol;
lno++; lno++;
@ -739,9 +740,9 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
} }
free(result); free(result);
for (i = 0; i < cnt; i++) { for (lno = 0; lno < cnt; lno++) {
if (sline[i].lost_head) { if (sline[lno].lost_head) {
struct lline *ll = sline[i].lost_head; struct lline *ll = sline[lno].lost_head;
while (ll) { while (ll) {
struct lline *tmp = ll; struct lline *tmp = ll;
ll = ll->next; ll = ll->next;