summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2015-04-16 12:34:03 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2015-04-16 12:34:03 (GMT)
commit9e92bee0443b45efa3de6b71f51863e8d66ead20 (patch)
treea55fa7daa84eaf131cfc2ff78efe3788ca1c6813
parent2ed9dcc900a8a662a52d11968baf27f61a9bedd3 (diff)
downloadlz4-9e92bee0443b45efa3de6b71f51863e8d66ead20.zip
lz4-9e92bee0443b45efa3de6b71f51863e8d66ead20.tar.gz
lz4-9e92bee0443b45efa3de6b71f51863e8d66ead20.tar.bz2
stronger arm tests
-rw-r--r--Makefile4
-rw-r--r--programs/lz4io.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index a9990df..88c4016 100644
--- a/Makefile
+++ b/Makefile
@@ -110,8 +110,8 @@ staticAnalyze: clean
scan-build --status-bugs -v $(MAKE) all CFLAGS=-g
armtest: clean
- cd lib; $(MAKE) -e all CC=arm-linux-gnueabi-gcc CFLAGS="-O3 -Werror"
- cd programs; $(MAKE) -e bins CC=arm-linux-gnueabi-gcc CFLAGS="-O3 -Werror"
+ cd lib; $(MAKE) -e all CC=arm-linux-gnueabi-gcc CPPFLAGS="-Werror"
+ cd programs; $(MAKE) -e bins CC=arm-linux-gnueabi-gcc CPPFLAGS="-Werror"
streaming-examples:
cd examples; $(MAKE) -e test
diff --git a/programs/lz4io.c b/programs/lz4io.c
index e2f2801..e262304 100644
--- a/programs/lz4io.c
+++ b/programs/lz4io.c
@@ -289,12 +289,12 @@ static int LZ4IO_getFiles(const char* input_filename, const char* output_filenam
fclose(*pfoutput);
if (!g_overwrite)
{
- char ch = 'Y';
+ int ch = 'Y';
DISPLAYLEVEL(2, "Warning : %s already exists\n", output_filename);
if ((g_displayLevel <= 1) || (*pfinput == stdin))
EXM_THROW(11, "Operation aborted : %s already exists", output_filename); /* No interaction possible */
DISPLAYLEVEL(2, "Overwrite ? (Y/n) : ");
- while((ch = (char)getchar()) != '\n' && ch != EOF) /* flush integrated */
+ while((ch = getchar()) != '\n' && ch != EOF) /* flush integrated */
if ((ch!='Y') && (ch!='y')) EXM_THROW(12, "No. Operation aborted : %s already exists", output_filename);
}
}