From 22e31cd087b31ca5262261e54a375490a8f50348 Mon Sep 17 00:00:00 2001 From: Alexis Green Date: Sun, 31 Jul 2016 22:35:16 -0700 Subject: [PATCH 1/2] Fixing clang compilation warning warning: shifting a negative signed value is undefined [-Wshift-negative-value] --- client/reveng/poly.c | 4 ++-- zlib/inflate.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/reveng/poly.c b/client/reveng/poly.c index 119a434e9..64e4a2db7 100644 --- a/client/reveng/poly.c +++ b/client/reveng/poly.c @@ -140,7 +140,7 @@ filtop(FILE *input, unsigned long length, int flags, int bperhx) { bmp_t accu = BMP_C(0); bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1); unsigned long iter = 0UL, idx; - int cmask = ~(~0 << CHAR_BIT), c; + int cmask = (1 << CHAR_BIT) - 1, c; int count = 0, ofs; poly_t poly = PZERO; if(bperhx == 0) return(poly); @@ -205,7 +205,7 @@ strtop(const char *string, int flags, int bperhx) { bmp_t accu; bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1); int pass, count, ofs; - int cmask = ~(~0 << CHAR_BIT), c; + int cmask = (1 << CHAR_BIT) - 1 , c; const char *s; poly_t poly = PZERO; diff --git a/zlib/inflate.c b/zlib/inflate.c index 4e9c07ce5..3a945f3ce 100644 --- a/zlib/inflate.c +++ b/zlib/inflate.c @@ -1523,7 +1523,8 @@ z_streamp strm; { struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16; + if (strm == Z_NULL || strm->state == Z_NULL) + return (long)(((unsigned long)0 - 1) << 16); state = (struct inflate_state FAR *)strm->state; return ((long)(state->back) << 16) + (state->mode == COPY ? state->length : From 6e321dd8f3af554fd5f670be4c2e96e993e69ad1 Mon Sep 17 00:00:00 2001 From: Alexis Green Date: Mon, 1 Aug 2016 13:03:46 -0700 Subject: [PATCH 2/2] Fixing warning: warning: ignoring return va 'scanf', declared with attribute warn_unused_result [-Wunused-result] --- client/cmdhflegic.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c index ccdfa1da2..0adf3c596 100644 --- a/client/cmdhflegic.c +++ b/client/cmdhflegic.c @@ -527,8 +527,7 @@ int CmdLegicRfRawWrite(const char *Cmd) { PrintAndLog("# changing the DCF is irreversible #"); PrintAndLog("#####################################"); PrintAndLog("do youe really want to continue? y(es) n(o)"); - scanf(" %c", &answer); - if (answer == 'y' || answer == 'Y') { + if (scanf(" %c", &answer) > 0 && (answer == 'y' || answer == 'Y')) { SendCommand(&c); return 0; }