From 99fef9fc413810e3eaeafb6623844154d79a0f28 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Fri, 22 Aug 2014 13:37:46 +0200 Subject: Ensure consistent typing across operands of ?: Completes earlier patch for #1 --- src/gnu/lgnu.c | 2 +- src/pcre/lpcre.c | 2 +- src/posix/lposix.c | 2 +- src/tre/ltre.c | 2 +- src/tre/ltre_w.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gnu/lgnu.c b/src/gnu/lgnu.c index a49560e..eb66027 100644 --- a/src/gnu/lgnu.c +++ b/src/gnu/lgnu.c @@ -50,7 +50,7 @@ static const unsigned char *gettranslate (lua_State *L, int pos); lua_pushlstring (L, (text) + ALG_SUBBEG(ud,n), ALG_SUBLEN(ud,n)) #define ALG_PUSHSUB_OR_FALSE(L,ud,text,n) \ - (ALG_SUBVALID(ud,n) ? ALG_PUSHSUB (L,ud,text,n) : lua_pushboolean (L,0)) + (ALG_SUBVALID(ud,n) ? (void) ALG_PUSHSUB (L,ud,text,n) : lua_pushboolean (L,0)) #define ALG_PUSHSTART(L,ud,offs,n) lua_pushinteger(L, (offs) + ALG_SUBBEG(ud,n) + 1) #define ALG_PUSHEND(L,ud,offs,n) lua_pushinteger(L, (offs) + ALG_SUBEND(ud,n)) diff --git a/src/pcre/lpcre.c b/src/pcre/lpcre.c index 7550ecf..8f34112 100644 --- a/src/pcre/lpcre.c +++ b/src/pcre/lpcre.c @@ -48,7 +48,7 @@ static void checkarg_compile (lua_State *L, int pos, TArgComp *argC); lua_pushlstring (L, (text) + ALG_SUBBEG(ud,n), ALG_SUBLEN(ud,n)) #define ALG_PUSHSUB_OR_FALSE(L,ud,text,n) \ - (ALG_SUBVALID(ud,n) ? ALG_PUSHSUB (L,ud,text,n) : lua_pushboolean (L,0)) + (ALG_SUBVALID(ud,n) ? (void) ALG_PUSHSUB (L,ud,text,n) : lua_pushboolean (L,0)) #define ALG_PUSHSTART(L,ud,offs,n) lua_pushinteger(L, (offs) + ALG_SUBBEG(ud,n) + 1) #define ALG_PUSHEND(L,ud,offs,n) lua_pushinteger(L, (offs) + ALG_SUBEND(ud,n)) diff --git a/src/posix/lposix.c b/src/posix/lposix.c index 988a3aa..dd2de4d 100644 --- a/src/posix/lposix.c +++ b/src/posix/lposix.c @@ -61,7 +61,7 @@ lua_pushlstring (L, (text) + ALG_SUBBEG(ud,n), ALG_SUBLEN(ud,n)) #define ALG_PUSHSUB_OR_FALSE(L,ud,text,n) \ - (ALG_SUBVALID(ud,n) ? ALG_PUSHSUB (L,ud,text,n) : lua_pushboolean (L,0)) + (ALG_SUBVALID(ud,n) ? (void) ALG_PUSHSUB (L,ud,text,n) : lua_pushboolean (L,0)) #define ALG_PUSHSTART(L,ud,offs,n) lua_pushinteger(L, (offs) + ALG_SUBBEG(ud,n) + 1) #define ALG_PUSHEND(L,ud,offs,n) lua_pushinteger(L, (offs) + ALG_SUBEND(ud,n)) diff --git a/src/tre/ltre.c b/src/tre/ltre.c index 6c9ed7c..02ba22f 100644 --- a/src/tre/ltre.c +++ b/src/tre/ltre.c @@ -38,7 +38,7 @@ extern void add_wide_lib (lua_State *L); lua_pushlstring (L, (text) + ALG_SUBBEG(ud,n), ALG_SUBLEN(ud,n)) #define ALG_PUSHSUB_OR_FALSE(L,ud,text,n) \ - (ALG_SUBVALID(ud,n) ? ALG_PUSHSUB (L,ud,text,n) : lua_pushboolean (L,0)) + (ALG_SUBVALID(ud,n) ? (void) ALG_PUSHSUB (L,ud,text,n) : lua_pushboolean (L,0)) #define ALG_PUSHSTART(L,ud,offs,n) lua_pushinteger(L, (offs) + ALG_SUBBEG(ud,n) + 1) #define ALG_PUSHEND(L,ud,offs,n) lua_pushinteger(L, (offs) + ALG_SUBEND(ud,n)) diff --git a/src/tre/ltre_w.c b/src/tre/ltre_w.c index 0a6e370..7872b2e 100644 --- a/src/tre/ltre_w.c +++ b/src/tre/ltre_w.c @@ -41,7 +41,7 @@ void bufferZ_putrepstringW (TBuffer *BufRep, int reppos, int nsub); lua_pushlstring (L, (text) + ALG_SUBBEG(ud,n), ALG_SUBLEN(ud,n)) #define ALG_PUSHSUB_OR_FALSE(L,ud,text,n) \ - (ALG_SUBVALID(ud,n) ? ALG_PUSHSUB (L,ud,text,n) : lua_pushboolean (L,0)) + (ALG_SUBVALID(ud,n) ? (void) ALG_PUSHSUB (L,ud,text,n) : lua_pushboolean (L,0)) #define ALG_PUSHSTART(L,ud,offs,n) lua_pushinteger(L, ((offs) + ALG_SUBBEG(ud,n))/ALG_CHARSIZE + 1) #define ALG_PUSHEND(L,ud,offs,n) lua_pushinteger(L, ((offs) + ALG_SUBEND(ud,n))/ALG_CHARSIZE) -- cgit v1.2.1