From 12335899d0089131d854aa1b074f0c4d841dff42 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 18 May 2013 17:20:41 -0700 Subject: [PATCH] parse-datetime, tests: don't use "string" + int Recent versions of 'clang' complain about C source code that uses expressions of the form '"string literal" + integer', I guess on the theory that it's confusing for readers who are used to C++. On those grounds I suppose it's OK to make this minor style change. * lib/parse-datetime.y (parse_datetime): * tests/test-fchdir.c (main): * tests/test-snprintf-posix.h (test_function): * tests/test-snprintf.c (main): * tests/test-vasnprintf-posix.c (test_function): * tests/test-vasnprintf.c (test_function): * tests/test-vsnprintf.c (main): * tests/unistdio/test-ulc-asnprintf1.h (test_function): Rewrite '"str" + E' to '&"str"[E]'. --- ChangeLog | 18 ++++++++++++++++++ lib/parse-datetime.y | 2 +- tests/test-fchdir.c | 2 +- tests/test-snprintf-posix.h | 2 +- tests/test-snprintf.c | 2 +- tests/test-vasnprintf-posix.c | 2 +- tests/test-vasnprintf.c | 2 +- tests/test-vsnprintf.c | 2 +- tests/unistdio/test-ulc-asnprintf1.h | 2 +- 9 files changed, 26 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index de7f53993..69639940e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2013-05-18 Paul Eggert + + parse-datetime, tests: don't use "string" + int + Recent versions of 'clang' complain about C source code that + uses expressions of the form '"string literal" + integer', + I guess on the theory that it's confusing for readers who are + used to C++. On those grounds I suppose it's OK to make this + minor style change. + * lib/parse-datetime.y (parse_datetime): + * tests/test-fchdir.c (main): + * tests/test-snprintf-posix.h (test_function): + * tests/test-snprintf.c (main): + * tests/test-vasnprintf-posix.c (test_function): + * tests/test-vasnprintf.c (test_function): + * tests/test-vsnprintf.c (main): + * tests/unistdio/test-ulc-asnprintf1.h (test_function): + Rewrite '"str" + E' to '&"str"[E]'. + 2013-05-17 Alexandre Duret-Lutz argmatch: port to C++ diff --git a/lib/parse-datetime.y b/lib/parse-datetime.y index 77d95b703..4dce7fa64 100644 --- a/lib/parse-datetime.y +++ b/lib/parse-datetime.y @@ -1472,7 +1472,7 @@ parse_datetime (struct timespec *result, char const *p, + sizeof pc.time_zone * CHAR_BIT / 3]; if (!tz_was_altered) tz0 = get_tz (tz0buf); - sprintf (tz1buf, "XXX%s%ld:%02d", "-" + (time_zone < 0), + sprintf (tz1buf, "XXX%s%ld:%02d", &"-"[time_zone < 0], abs_time_zone_hour, abs_time_zone_min); if (setenv ("TZ", tz1buf, 1) != 0) goto fail; diff --git a/tests/test-fchdir.c b/tests/test-fchdir.c index 7ffc71baa..7a6de8049 100644 --- a/tests/test-fchdir.c +++ b/tests/test-fchdir.c @@ -70,7 +70,7 @@ main (void) /* Repeat test twice, once in '.' and once in '..'. */ for (i = 0; i < 2; i++) { - ASSERT (chdir (".." + 1 - i) == 0); + ASSERT (chdir (&".."[1 - i]) == 0); ASSERT (fchdir (fd) == 0); { size_t len = strlen (cwd) + 1; diff --git a/tests/test-snprintf-posix.h b/tests/test-snprintf-posix.h index 72b8c4ae3..f71b3f73f 100644 --- a/tests/test-snprintf-posix.h +++ b/tests/test-snprintf-posix.h @@ -96,7 +96,7 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) ASSERT (memcmp (buf, "12345", size - 1) == 0); ASSERT (buf[size - 1] == '\0'); } - ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0); + ASSERT (memcmp (buf + size, &"DEADBEEF"[size], 8 - size) == 0); } else { diff --git a/tests/test-snprintf.c b/tests/test-snprintf.c index 805735769..108346e12 100644 --- a/tests/test-snprintf.c +++ b/tests/test-snprintf.c @@ -52,7 +52,7 @@ main (int argc, char *argv[]) #if !CHECK_SNPRINTF_POSIX if (size > 0) #endif - ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0); + ASSERT (memcmp (buf + size, &"DEADBEEF"[size], 8 - size) == 0); } else { diff --git a/tests/test-vasnprintf-posix.c b/tests/test-vasnprintf-posix.c index 70582b712..af779cd72 100644 --- a/tests/test-vasnprintf-posix.c +++ b/tests/test-vasnprintf-posix.c @@ -118,7 +118,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...)) ASSERT (length == 5); if (size < 6) ASSERT (result != buf); - ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0); + ASSERT (memcmp (buf + size, &"DEADBEEF"[size], 8 - size) == 0); if (result != buf) free (result); } diff --git a/tests/test-vasnprintf.c b/tests/test-vasnprintf.c index f29b05aeb..4cce0a947 100644 --- a/tests/test-vasnprintf.c +++ b/tests/test-vasnprintf.c @@ -55,7 +55,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...)) ASSERT (length == 5); if (size < 6) ASSERT (result != buf); - ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0); + ASSERT (memcmp (buf + size, &"DEADBEEF"[size], 8 - size) == 0); if (result != buf) free (result); } diff --git a/tests/test-vsnprintf.c b/tests/test-vsnprintf.c index 3353b2eb4..84b5d8967 100644 --- a/tests/test-vsnprintf.c +++ b/tests/test-vsnprintf.c @@ -65,7 +65,7 @@ main (int argc, char *argv[]) #if !CHECK_VSNPRINTF_POSIX if (size > 0) #endif - ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0); + ASSERT (memcmp (buf + size, &"DEADBEEF"[size], 8 - size) == 0); } else { diff --git a/tests/unistdio/test-ulc-asnprintf1.h b/tests/unistdio/test-ulc-asnprintf1.h index 9342f4204..905e9c6ae 100644 --- a/tests/unistdio/test-ulc-asnprintf1.h +++ b/tests/unistdio/test-ulc-asnprintf1.h @@ -47,7 +47,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...)) ASSERT (length == 5); if (size < 6) ASSERT (result != buf); - ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0); + ASSERT (memcmp (buf + size, &"DEADBEEF"[size], 8 - size) == 0); if (result != buf) free (result); } -- 2.11.0