From fe70acb3767ef10badd2eeb9928988c39ebebae8 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 21 Jun 2013 18:31:23 +0200 Subject: updated for version 7.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. --- src/xxd/xxd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/xxd') 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) -- cgit v1.2.3