diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-06-21 18:31:23 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-06-21 18:31:23 +0200 |
| commit | fe70acb3767ef10badd2eeb9928988c39ebebae8 (patch) | |
| tree | 5da377fd1d857e55bb357187ec784ea05d9b329f /src | |
| parent | d73895ec00b56e22bf4f95857aa88dd129e11d06 (diff) | |
| download | vim-git-fe70acb3767ef10badd2eeb9928988c39ebebae8.tar.gz | |
updated for version 7.3.1224v7.3.1224
Problem: Clang gives warnings on xxd.
Solution: Change how to use part of a string. (Dominique Pelle) Also avoid
warning for return not reached.
Diffstat (limited to 'src')
| -rw-r--r-- | src/regexp_nfa.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xxd/xxd.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index f11c01a9c..01bc065b9 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -2611,7 +2611,7 @@ nfa_max_width(startstate, depth) if (depth > 4) return -1; - for (;;) + while (state != NULL) { switch (state->c) { @@ -2810,7 +2810,7 @@ nfa_max_width(startstate, depth) state = state->out; } - /* unrecognized */ + /* unrecognized, "cannot happen" */ return -1; } diff --git a/src/version.c b/src/version.c index 9a484dd08..1bc2bae5d 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1224, +/**/ 1223, /**/ 1222, diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c index 209ede43d..e19874ad7 100644 --- a/src/xxd/xxd.c +++ b/src/xxd/xxd.c @@ -722,7 +722,7 @@ main(argc, argv) while ((length < 0 || p < length) && (c = getc(fp)) != EOF) { if (fprintf(fpo, (hexx == hexxa) ? "%s0x%02x" : "%s0X%02X", - (p % cols) ? ", " : ",\n "+2*!p, c) < 0) + (p % cols) ? ", " : &",\n "[2*!p], c) < 0) die(3); p++; } @@ -731,7 +731,7 @@ main(argc, argv) if (p && fputs("\n", fpo) == EOF) die(3); - if (fputs("};\n" + 3 * (fp == stdin), fpo) == EOF) + if (fputs(&"};\n"[3 * (fp == stdin)], fpo) == EOF) die(3); if (fp != stdin) |