# [PATCH 4/7] Cast pointers to `void *' when used in a format. 3 messages from 2006-06-18 to 2006-06-18. Participants: Florian Forster. Thread: https://gitlist.dev/t/4560 ## Florian Forster, 2006-06-18 15:18 Subject: [PATCH 3/7] Don't instantiate structures with FAMs. Message-ID: <11506438892551-git-send-email-octo@verplant.org> URL: https://gitlist.dev/e/11506438892551-git-send-email-octo%40verplant.org In-Reply-To: <11506438893796-git-send-email-octo@verplant.org> ``` Since structures with `flexible array members' are an incomplete datatype ANSI C99 forbids creating instances of them. This patch removes such an instance from `diff-lib.c' and replaces it with a pointer to a `struct combine_diff_path'. Since all neccessary memory is allocated at once the number of calls to `xmalloc' is not increased. Signed-off-by: Florian Forster --- diff-lib.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) c163a36f0bd0e07ffb9ee7d4bfb22f1cbb38eef8 diff --git a/diff-lib.c b/diff-lib.c index 2183b41..fdc1173 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -34,21 +34,23 @@ int run_diff_files(struct rev_info *revs continue; if (ce_stage(ce)) { - struct { - struct combine_diff_path p; - struct combine_diff_parent filler[5]; - } combine; + struct combine_diff_path *dpath; int num_compare_stages = 0; + size_t path_len; - combine.p.next = NULL; - combine.p.len = ce_namelen(ce); - combine.p.path = xmalloc(combine.p.len + 1); - memcpy(combine.p.path, ce->name, combine.p.len); - combine.p.path[combine.p.len] = 0; - combine.p.mode = 0; - memset(combine.p.sha1, 0, 20); - memset(&combine.p.parent[0], 0, - sizeof(combine.filler)); + path_len = ce_namelen(ce); + + dpath = xmalloc (combine_diff_path_size (5, path_len)); + dpath->path = (char *) &(dpath->parent[5]); + + dpath->next = NULL; + dpath->len = path_len; + memcpy(dpath->path, ce->name, path_len); + dpath->path[path_len] = '\0'; + dpath->mode = 0; + memset(dpath->sha1, 0, 20); + memset(&(dpath->parent[0]), 0, + sizeof(struct combine_diff_parent)*5); while (i < entries) { struct cache_entry *nce = active_cache[i]; @@ -64,11 +66,11 @@ int run_diff_files(struct rev_info *revs if (2 <= stage) { int mode = ntohl(nce->ce_mode); num_compare_stages++; - memcpy(combine.p.parent[stage-2].sha1, + memcpy(dpath->parent[stage-2].sha1, nce->sha1, 20); - combine.p.parent[stage-2].mode = + dpath->parent[stage-2].mode = canon_mode(mode); - combine.p.parent[stage-2].status = + dpath->parent[stage-2].status = DIFF_STATUS_MODIFIED; } @@ -83,13 +85,14 @@ int run_diff_files(struct rev_info *revs i--; if (revs->combine_merges && num_compare_stages == 2) { - show_combined_diff(&combine.p, 2, + show_combined_diff(dpath, 2, revs->dense_combined_merges, revs); - free(combine.p.path); + free(dpath); continue; } - free(combine.p.path); + free(dpath); + dpath = NULL; /* * Show the diff for the 'ce' if we found the one -- 1.3.3 ``` ## Florian Forster, 2006-06-18 15:18 Subject: [PATCH 4/7] Cast pointers to `void *' when used in a format. Message-ID: <11506438893167-git-send-email-octo@verplant.org> URL: https://gitlist.dev/e/11506438893167-git-send-email-octo%40verplant.org In-Reply-To: <11506438892551-git-send-email-octo@verplant.org> ``` ANSI C99 requires void-pointers when using the `%p' format. This patch adds the neccessary cast in `blame.c'. Signed-off-by: Florian Forster --- blame.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) 372bb52dd567d39c3e64919e100ae9bd8af603ca diff --git a/blame.c b/blame.c index 25d3bcf..51eab2e 100644 --- a/blame.c +++ b/blame.c @@ -301,9 +301,9 @@ static void fill_line_map(struct commit if (DEBUG) printf("map: i1: %d %d %p i2: %d %d %p\n", i1, map[i1], - i1 != -1 ? blame_lines[map[i1]] : NULL, + (void *) (i1 != -1 ? blame_lines[map[i1]] : NULL), i2, map2[i2], - i2 != -1 ? blame_lines[map2[i2]] : NULL); + (void *) (i2 != -1 ? blame_lines[map2[i2]] : NULL)); if (map2[i2] != -1 && blame_lines[map[i1]] && !blame_lines[map2[i2]]) -- 1.3.3 ``` ## Florian Forster, 2006-06-18 15:18 Subject: [PATCH 5/7] Don't use empty structure initializers. Message-ID: <11506438893544-git-send-email-octo@verplant.org> URL: https://gitlist.dev/e/11506438893544-git-send-email-octo%40verplant.org In-Reply-To: <11506438893167-git-send-email-octo@verplant.org> ``` Empty initializers for structures are not allowed in ANSI C99. This patch removes such an initializer from `builtin-read-tree.c'. Since the struct was static (and is therefore implicitely initialized to zero anyway) it wasn't actually needed. Signed-off-by: Florian Forster --- builtin-read-tree.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) 91df4330d35f1f1670dd04af0a14f1ca84a72b2b diff --git a/builtin-read-tree.c b/builtin-read-tree.c index bb50fbd..fdd6706 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -30,8 +30,7 @@ static int merge_size = 0; static struct object_list *trees = NULL; -static struct cache_entry df_conflict_entry = { -}; +static struct cache_entry df_conflict_entry; struct tree_entry_list { struct tree_entry_list *next; -- 1.3.3 ```