Skip to content

Commit

Permalink
Merge branch 'ab/clang-lints' into maint-1.7.7
Browse files Browse the repository at this point in the history
* ab/clang-lints:
  cast variable in call to free() in builtin/diff.c and submodule.c
  apply: get rid of useless x < 0 comparison on a size_t type
  • Loading branch information
Junio C Hamano committed Dec 14, 2011
2 parents 3b42565 + 83838d5 commit c0eb9cc
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
3 changes: 0 additions & 3 deletions builtin/apply.c
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,6 @@ static int fuzzy_matchlines(const char *s1, size_t n1,
const char *last2 = s2 + n2 - 1;
int result = 0;

if (n1 < 0 || n2 < 0)
return 0;

/* ignore line endings */
while ((*last1 == '\r') || (*last1 == '\n'))
last1--;
Expand Down
2 changes: 1 addition & 1 deletion builtin/diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ static int builtin_diff_combined(struct rev_info *revs,
hashcpy((unsigned char *)(parent + i), ent[i].item->sha1);
diff_tree_combined(parent[0], parent + 1, ents - 1,
revs->dense_combined_merges, revs);
free(parent);
free((void *)parent);
return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion submodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ static void commit_need_pushing(struct commit *commit, struct commit_list *paren
rev.diffopt.format_callback_data = needs_pushing;
diff_tree_combined(commit->object.sha1, parents, n, 1, &rev);

free(parents);
free((void *)parents);
}

int check_submodule_needs_pushing(unsigned char new_sha1[20], const char *remotes_name)
Expand Down

0 comments on commit c0eb9cc

Please sign in to comment.