From 6d483908f32090e82a52325c3407776a518ed2a3 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 8 Mar 2012 13:29:55 -0800 Subject: [PATCH] fmt-merge-msg.c: make util_as_int() return "int" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As its name says, the return value from util_as_int() should be usable where an int is called for without casting. Spotted-by: René Scharfe Signed-off-by: Junio C Hamano --- builtin/fmt-merge-msg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index 40b90b1fd2..8ddefb39db 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -182,7 +182,7 @@ static void add_branch_desc(struct strbuf *out, const char *name) strbuf_release(&desc); } -#define util_as_int(elem) ((intptr_t)((elem)->util)) +#define util_as_int(elem) ((int)((elem)->util)) static void record_person(int which, struct string_list *people, struct commit *commit) @@ -210,7 +210,7 @@ static void record_person(int which, struct string_list *people, elem = string_list_insert(people, name_buf); elem->util = (void *)0; } - elem->util = (void*)(util_as_int(elem) + 1); + elem->util = (void*)((intptr_t)(util_as_int(elem) + 1)); } static int cmp_string_list_util_as_int(const void *a_, const void *b_) @@ -226,13 +226,13 @@ static void add_people_count(struct strbuf *out, struct string_list *people) else if (people->nr == 2) strbuf_addf(out, "%s (%d) and %s (%d)", people->items[0].string, - (int)util_as_int(&people->items[0]), + util_as_int(&people->items[0]), people->items[1].string, - (int)util_as_int(&people->items[1])); + util_as_int(&people->items[1])); else if (people->nr) strbuf_addf(out, "%s (%d) and others", people->items[0].string, - (int)util_as_int(&people->items[0])); + util_as_int(&people->items[0])); } static int committer_is_me(const char *name)