Skip to content

Commit 44ba10d

Browse files
committed
revision: use C99 declaration of variable in for() loop
There are certain C99 features that might be nice to use in our code base, but we've hesitated to do so in order to avoid breaking compatibility with older compilers. But we don't actually know if people are even using pre-C99 compilers these days. One way to figure that out is to introduce a very small use of a feature, and see if anybody complains, and we've done so to probe the portability for a few features like "trailing comma in enum declaration", "designated initializer for struct", and "designated initializer for array". A few years ago, we tried to use a handy for (int i = 0; i < n; i++) use(i); to introduce a new variable valid only in the loop, but found that some compilers we cared about didn't like it back then. Two years is a long-enough time, so let's try it again. If this patch can survive a few releases without complaint, then we can feel more confident that variable declaration in for() loop is supported by the compilers our user base use. And if we do get complaints, then we'll have gained some data and we can easily revert this patch. Helped-by: Martin Ågren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 71ca53e commit 44ba10d

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,6 +1198,7 @@ endif
11981198
# Set CFLAGS, LDFLAGS and other *FLAGS variables. These might be
11991199
# tweaked by config.* below as well as the command-line, both of
12001200
# which'll override these defaults.
1201+
# Older versions of GCC may require adding "-std=gnu99" at the end.
12011202
CFLAGS = -g -O2 -Wall
12021203
LDFLAGS =
12031204
CC_LD_DYNPATH = -Wl,-rpath,

revision.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,15 @@ static inline int want_ancestry(const struct rev_info *revs);
4343

4444
void show_object_with_name(FILE *out, struct object *obj, const char *name)
4545
{
46-
const char *p;
47-
4846
fprintf(out, "%s ", oid_to_hex(&obj->oid));
49-
for (p = name; *p && *p != '\n'; p++)
47+
/*
48+
* This "for (const char *p = ..." is made as a first step towards
49+
* making use of such declarations elsewhere in our codebase. If
50+
* it causes compilation problems on your platform, please report
51+
* it to the Git mailing list at [email protected]. In the meantime,
52+
* adding -std=gnu99 to CFLAGS may help if you are with older GCC.
53+
*/
54+
for (const char *p = name; *p && *p != '\n'; p++)
5055
fputc(*p, out);
5156
fputc('\n', out);
5257
}

0 commit comments

Comments
 (0)