From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH] builtin/mv.c: use correct type to compute size of an array element
Date: Wed, 06 Jul 2022 19:02:18 -0700 [thread overview]
Message-ID: <xmqq8rp54r4l.fsf@gitster.g> (raw)
The variables 'source', 'destination', and 'submodule_gitfile' are
all of type "const char **", and an element of such an array is of
"type const char *".
Noticed while running "make contrib/coccinelle/array.cocci.patch".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* There is this rule in the array.cocci file:
@@
type T;
T *dst;
T *src;
expression n;
@@
(
- memmove(dst, src, (n) * sizeof(*dst));
+ MOVE_ARRAY(dst, src, n);
|
- memmove(dst, src, (n) * sizeof(*src));
+ MOVE_ARRAY(dst, src, n);
|
- memmove(dst, src, (n) * sizeof(T));
+ MOVE_ARRAY(dst, src, n);
)
but it triggered only for modes[] array among the four parallel
arrays that are being moved here.
There are a few tangents.
* Should we in general use sizeof(TYPE) in these cases, instead
of the size of the zeroth element, e.g.
memmove(source + i, source + i + 1,
n * sizeof(source[i]));
It would have been caught by the above Coccinelle rule (we are
taking the size of *dst).
* Shouldn't we have an array of struct with four members, instead
of four parallel arrays, e.g.
struct {
const char *source;
const char *destination;
enum update_mode mode;
const char *submodule_gitfile;
} *mv_file;
The latter question is important to answer before we accept
Coccinelle-suggested rewrite to use four MOVE_ARRAY() on these
four parallel arrays on top of this fix.
builtin/mv.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git c/builtin/mv.c w/builtin/mv.c
index 2a38e2af46..d419e83f0f 100644
--- c/builtin/mv.c
+++ w/builtin/mv.c
@@ -377,13 +377,13 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
if (--argc > 0) {
int n = argc - i;
memmove(source + i, source + i + 1,
- n * sizeof(char *));
+ n * sizeof(const char *));
memmove(destination + i, destination + i + 1,
- n * sizeof(char *));
+ n * sizeof(const char *));
memmove(modes + i, modes + i + 1,
n * sizeof(enum update_mode));
memmove(submodule_gitfile + i, submodule_gitfile + i + 1,
- n * sizeof(char *));
+ n * sizeof(const char *));
i--;
}
}
next reply other threads:[~2022-07-07 2:02 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-07 2:02 Junio C Hamano [this message]
2022-07-07 5:52 ` [PATCH v2] builtin/mv.c: use the MOVE_ARRAY() macro instead of memmove() Junio C Hamano
2022-07-10 1:33 ` [PATCH v3] " Junio C Hamano
2022-07-18 20:30 ` Derrick Stolee
2022-07-07 12:11 ` [PATCH] builtin/mv.c: use correct type to compute size of an array element Ævar Arnfjörð Bjarmason
2022-07-07 18:10 ` Junio C Hamano
2022-07-07 19:11 ` René Scharfe
2022-07-09 8:16 ` René Scharfe
2022-07-10 5:38 ` Junio C Hamano
2022-07-10 10:05 ` [PATCH] cocci: avoid normalization rules for memcpy René Scharfe
2022-07-10 14:45 ` Ævar Arnfjörð Bjarmason
2022-07-10 16:32 ` Ævar Arnfjörð Bjarmason
2022-07-10 19:30 ` Junio C Hamano
2022-07-11 17:11 ` René Scharfe
2022-07-11 20:05 ` Ævar Arnfjörð Bjarmason
2022-07-07 18:27 ` [PATCH] builtin/mv.c: use correct type to compute size of an array element René Scharfe
2022-07-07 18:42 ` Jeff King
2022-07-07 20:25 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq8rp54r4l.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).