luo980/hiredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add -Werror as a default. (#1193)

Browse Source
This commit is contained in:
Yossi Gottlieb 2023-06-01 19:03:24 +03:00 committed by GitHub
parent af14456383
commit 5cbd1f2960
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -39,7 +39,7 @@ export REDIS_TEST_CONFIG
CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
OPTIMIZATION?=-O3 OPTIMIZATION?=-O3
WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
DEBUG_FLAGS?= -g -ggdb DEBUG_FLAGS?= -g -ggdb
REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS)
REAL_LDFLAGS=$(LDFLAGS) REAL_LDFLAGS=$(LDFLAGS)

4
hiredis.c
View File

@ -392,12 +392,12 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
while (*_p != '\0' && strchr(flags,*_p) != NULL) _p++; while (*_p != '\0' && strchr(flags,*_p) != NULL) _p++;
/* Field width */ /* Field width */
while (*_p != '\0' && isdigit(*_p)) _p++; while (*_p != '\0' && isdigit((int) *_p)) _p++;
/* Precision */ /* Precision */
if (*_p == '.') { if (*_p == '.') {
_p++; _p++;
while (*_p != '\0' && isdigit(*_p)) _p++; while (*_p != '\0' && isdigit((int) *_p)) _p++;
} }
/* Copy va_list before consuming with va_arg */ /* Copy va_list before consuming with va_arg */

12
sds.c
View File

@ -886,7 +886,7 @@ sds sdscatrepr(sds s, const char *p, size_t len) {
case '\a': s = sdscatlen(s,"\\a",2); break; case '\a': s = sdscatlen(s,"\\a",2); break;
case '\b': s = sdscatlen(s,"\\b",2); break; case '\b': s = sdscatlen(s,"\\b",2); break;
default: default:
if (isprint(*p)) if (isprint((int) *p))
s = sdscatprintf(s,"%c",*p); s = sdscatprintf(s,"%c",*p);
else else
s = sdscatprintf(s,"\\x%02x",(unsigned char)*p); s = sdscatprintf(s,"\\x%02x",(unsigned char)*p);
@ -948,7 +948,7 @@ sds *sdssplitargs(const char *line, int *argc) {
*argc = 0; *argc = 0;
while(1) { while(1) {
/* skip blanks */ /* skip blanks */
while(*p && isspace(*p)) p++; while(*p && isspace((int) *p)) p++;
if (*p) { if (*p) {
/* get a token */ /* get a token */
int inq=0; /* set to 1 if we are in "quotes" */ int inq=0; /* set to 1 if we are in "quotes" */
@ -959,8 +959,8 @@ sds *sdssplitargs(const char *line, int *argc) {
while(!done) { while(!done) {
if (inq) { if (inq) {
if (*p == '\\' && *(p+1) == 'x' && if (*p == '\\' && *(p+1) == 'x' &&
isxdigit(*(p+2)) && isxdigit((int) *(p+2)) &&
isxdigit(*(p+3))) isxdigit((int) *(p+3)))
{ {
unsigned char byte; unsigned char byte;
@ -984,7 +984,7 @@ sds *sdssplitargs(const char *line, int *argc) {
} else if (*p == '"') { } else if (*p == '"') {
/* closing quote must be followed by a space or /* closing quote must be followed by a space or
* nothing at all. */ * nothing at all. */
if (*(p+1) && !isspace(*(p+1))) goto err; if (*(p+1) && !isspace((int) *(p+1))) goto err;
done=1; done=1;
} else if (!*p) { } else if (!*p) {
/* unterminated quotes */ /* unterminated quotes */
@ -999,7 +999,7 @@ sds *sdssplitargs(const char *line, int *argc) {
} else if (*p == '\'') { } else if (*p == '\'') {
/* closing quote must be followed by a space or /* closing quote must be followed by a space or
* nothing at all. */ * nothing at all. */
if (*(p+1) && !isspace(*(p+1))) goto err; if (*(p+1) && !isspace((int) *(p+1))) goto err;
done=1; done=1;
} else if (!*p) { } else if (!*p) {
/* unterminated quotes */ /* unterminated quotes */

3
test.c
View File

@ -1567,6 +1567,9 @@ static void test_throughput(struct config config) {
// } // }
#ifdef HIREDIS_TEST_ASYNC #ifdef HIREDIS_TEST_ASYNC
#pragma GCC diagnostic ignored "-Woverlength-strings" /* required on gcc 4.8.x due to assert statements */
struct event_base *base; struct event_base *base;
typedef struct TestState { typedef struct TestState {