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.
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index 209ede4..e19874a 100644
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -722,7 +722,7 @@
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 @@
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)