Mercurial > hg > octave-nkf > gnulib-hg
changeset 17417:3e765e2f4c46
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]'.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Sat, 18 May 2013 17:20:41 -0700 |
parents | 015e28e70535 |
children | b876bfd31d0f |
files | ChangeLog lib/parse-datetime.y tests/test-fchdir.c tests/test-snprintf-posix.h tests/test-snprintf.c tests/test-vasnprintf-posix.c tests/test-vasnprintf.c tests/test-vsnprintf.c tests/unistdio/test-ulc-asnprintf1.h |
diffstat | 9 files changed, 26 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2013-05-18 Paul Eggert <eggert@cs.ucla.edu> + + 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 <adl@lrde.epita.fr> argmatch: port to C++
--- a/lib/parse-datetime.y +++ b/lib/parse-datetime.y @@ -1472,7 +1472,7 @@ + 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;
--- a/tests/test-fchdir.c +++ b/tests/test-fchdir.c @@ -70,7 +70,7 @@ /* 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;
--- a/tests/test-snprintf-posix.h +++ b/tests/test-snprintf-posix.h @@ -96,7 +96,7 @@ 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 {
--- a/tests/test-snprintf.c +++ b/tests/test-snprintf.c @@ -52,7 +52,7 @@ #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 {
--- a/tests/test-vasnprintf-posix.c +++ b/tests/test-vasnprintf-posix.c @@ -118,7 +118,7 @@ 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); }
--- a/tests/test-vasnprintf.c +++ b/tests/test-vasnprintf.c @@ -55,7 +55,7 @@ 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); }
--- a/tests/test-vsnprintf.c +++ b/tests/test-vsnprintf.c @@ -65,7 +65,7 @@ #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 {
--- a/tests/unistdio/test-ulc-asnprintf1.h +++ b/tests/unistdio/test-ulc-asnprintf1.h @@ -47,7 +47,7 @@ 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); }