[tarantool-patches] [PATCH v3] Fix warnings
dmarc-noreply at freelists.org
dmarc-noreply at freelists.org
Mon May 7 15:05:12 MSK 2018
From: Gleb <gleb-skiba at mail.ru>
Ensure -Werror -Wall set for the whole src/.
Fix warnings which have been found with -Werror and -Wall.
Add new build target RelWithDebInfoWError.
Change build target on RelWithDebInfoWError in CI.
Fixes #3238
---
Issue from https://github.com/tarantool/tarantool/issues/3238.
Source from https://github.com/tarantool/tarantool/tree/gh-3238-check-warnings.
Changes in v3:
-add MAYBE_UNUSED
-break too long line.
.travis.mk | 4 ++--
cmake/compiler.cmake | 8 +++++++-
src/box/space_def.c | 4 ++--
src/box/sql/CMakeLists.txt | 3 ---
src/box/sql/alter.c | 3 ++-
src/box/sql/insert.c | 5 ++---
src/box/sql/pragma.c | 3 +--
src/box/vy_read_iterator.c | 2 +-
src/box/xrow.c | 8 ++++----
src/httpc.c | 2 +-
src/lua/init.c | 2 +-
src/say.c | 5 +++--
12 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/.travis.mk b/.travis.mk
index 393d78f..2328e0d 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -40,7 +40,7 @@ deps_ubuntu:
lcov ruby tcl
test_ubuntu: deps_ubuntu
- cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfoWError
make -j8
cd test && /usr/bin/python test-run.py -j -1
@@ -49,7 +49,7 @@ deps_osx:
brew install openssl readline curl icu4c --force
test_osx: deps_osx
- cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfoWError
# Increase the maximum number of open file descriptors on macOS
sudo sysctl -w kern.maxfiles=20480 || :
sudo sysctl -w kern.maxfilesperproc=20480 || :
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index 05d33ab..12fc335 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -251,12 +251,18 @@ macro(enable_tnt_compile_flags)
add_definitions("-D__STDC_LIMIT_MACROS=1")
add_definitions("-D__STDC_CONSTANT_MACROS=1")
- # Only add -Werror if it's a debug build, done by developers.
+ # Only add -Werror if it's a Debug or
+ # RelWithDebInfoWError build, done by developers.
# Release builds should not cause extra trouble.
if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug")
AND HAVE_STD_C11 AND HAVE_STD_CXX11)
add_compile_flags("C;CXX" "-Werror")
endif()
+
+ if ((${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfoWError")
+ AND HAVE_STD_C11 AND HAVE_STD_CXX11)
+ add_compile_flags("C;CXX" "-Werror")
+ endif()
endmacro(enable_tnt_compile_flags)
if (HAVE_OPENMP)
diff --git a/src/box/space_def.c b/src/box/space_def.c
index 22bd3ca..313a547 100644
--- a/src/box/space_def.c
+++ b/src/box/space_def.c
@@ -120,7 +120,7 @@ space_def_dup(const struct space_def *src)
struct Expr *e =
src->fields[i].default_value_expr;
assert(e != NULL);
- char *expr_pos_old = expr_pos;
+ MAYBE_UNUSED char *expr_pos_old = expr_pos;
e = sql_expr_dup(sql_get(), e, 0, &expr_pos);
assert(e != NULL);
/* Note: due to SQL legacy
@@ -205,7 +205,7 @@ space_def_new(uint32_t id, uint32_t uid, uint32_t exact_field_count,
struct Expr *e =
fields[i].default_value_expr;
assert(e != NULL);
- char *expr_pos_old = expr_pos;
+ MAYBE_UNUSED char *expr_pos_old = expr_pos;
e = sql_expr_dup(sql_get(), e, 0, &expr_pos);
assert(e != NULL);
/* Note: due to SQL legacy
diff --git a/src/box/sql/CMakeLists.txt b/src/box/sql/CMakeLists.txt
index 678eb4c..526d9fe 100644
--- a/src/box/sql/CMakeLists.txt
+++ b/src/box/sql/CMakeLists.txt
@@ -4,9 +4,6 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
add_definitions(-DSQLITE_DEBUG=1)
add_definitions(-DSQLITE_ENABLE_SELECTTRACE)
add_definitions(-DSQLITE_ENABLE_WHERETRACE)
-
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
endif()
set(SRCDIR ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/box/sql/alter.c b/src/box/sql/alter.c
index b30a973..60933d5 100644
--- a/src/box/sql/alter.c
+++ b/src/box/sql/alter.c
@@ -149,7 +149,8 @@ sqlite3AlterFinishAddColumn(Parse * pParse, Token * pColDef)
Column *pCol; /* The new column */
Expr *pDflt; /* Default value for the new column */
sqlite3 *db; /* The database connection; */
- Vdbe *v = pParse->pVdbe; /* The prepared statement under construction */
+ MAYBE_UNUSED Vdbe *v = pParse->pVdbe;
+ /* The prepared statement under construction */
struct session *user_session = current_session();
db = pParse->db;
diff --git a/src/box/sql/insert.c b/src/box/sql/insert.c
index f04496a..ca81adf 100644
--- a/src/box/sql/insert.c
+++ b/src/box/sql/insert.c
@@ -46,10 +46,9 @@ void
sqlite3OpenTable(Parse * pParse, /* Generate code into this VDBE */
int iCur, /* The cursor number of the table */
Table * pTab, /* The table to be opened */
- int opcode) /* OP_OpenRead or OP_OpenWrite */
+ MAYBE_UNUSED int opcode) /* OP_OpenRead or OP_OpenWrite */
{
- Vdbe *v;
- v = sqlite3GetVdbe(pParse);
+ MAYBE_UNUSED Vdbe *v = sqlite3GetVdbe(pParse);
assert(opcode == OP_OpenWrite || opcode == OP_OpenRead);
Index *pPk = sqlite3PrimaryKeyIndex(pTab);
assert(pPk != 0);
diff --git a/src/box/sql/pragma.c b/src/box/sql/pragma.c
index a2a6391..866fdcd 100644
--- a/src/box/sql/pragma.c
+++ b/src/box/sql/pragma.c
@@ -256,7 +256,6 @@ sqlite3Pragma(Parse * pParse, Token * pId, /* First part of [schema.]id field */
char *zLeft = 0; /* Nul-terminated UTF-8 string <id> */
char *zRight = 0; /* Nul-terminated UTF-8 string <value>, or NULL */
char *zTable = 0; /* Nul-terminated UTF-8 string <value2> or NULL */
- int rc; /* return value form SQLITE_FCNTL_PRAGMA */
sqlite3 *db = pParse->db; /* The database connection */
Vdbe *v = sqlite3GetVdbe(pParse); /* Prepared statement */
const PragmaName *pPragma; /* The pragma */
@@ -523,7 +522,7 @@ sqlite3Pragma(Parse * pParse, Token * pId, /* First part of [schema.]id field */
box_tuple_t *tuple;
box_iterator_t* iter;
iter = box_index_iterator(space_id, 0,ITER_ALL, key_buf, key_end);
- rc = box_iterator_next(iter, &tuple);
+ MAYBE_UNUSED int rc = box_iterator_next(iter, &tuple);
assert(rc==0);
for (i = 0; tuple!=NULL; i++, box_iterator_next(iter, &tuple)){
/* 1 is name field number */
diff --git a/src/box/vy_read_iterator.c b/src/box/vy_read_iterator.c
index 2cad233..fea2c46 100644
--- a/src/box/vy_read_iterator.c
+++ b/src/box/vy_read_iterator.c
@@ -552,7 +552,7 @@ vy_read_iterator_next_lsn(struct vy_read_iterator *itr, struct tuple **ret)
{
uint32_t i;
bool unused;
- struct vy_read_src *src;
+ struct vy_read_src *src = NULL;
assert(itr->curr_stmt != NULL);
assert(itr->curr_src < itr->skipped_src);
diff --git a/src/box/xrow.c b/src/box/xrow.c
index 64dc625..2cad537 100644
--- a/src/box/xrow.c
+++ b/src/box/xrow.c
@@ -304,7 +304,7 @@ iproto_reply_request_vote(struct obuf *out, uint64_t sync,
iproto_header_encode(buf, IPROTO_OK, sync, schema_version,
size - IPROTO_HEADER_LEN);
- char *ptr = obuf_alloc(out, size);
+ MAYBE_UNUSED char *ptr = obuf_alloc(out, size);
assert(ptr == buf);
return 0;
}
@@ -343,9 +343,9 @@ iproto_write_error(int fd, const struct error *e, uint32_t schema_version,
schema_version, sizeof(body) + msg_len);
body.v_data_len = mp_bswap_u32(msg_len);
- (void) write(fd, header, sizeof(header));
- (void) write(fd, &body, sizeof(body));
- (void) write(fd, e->errmsg, msg_len);
+ MAYBE_UNUSED ssize_t unused = write(fd, header, sizeof(header));
+ unused = write(fd, &body, sizeof(body));
+ unused = write(fd, e->errmsg, msg_len);
}
int
diff --git a/src/httpc.c b/src/httpc.c
index 633e688..a720cf3 100644
--- a/src/httpc.c
+++ b/src/httpc.c
@@ -249,7 +249,7 @@ httpc_set_low_speed_limit(struct httpc_request *req, long low_speed_limit)
void
httpc_set_verbose(struct httpc_request *req, bool curl_verbose)
{
- curl_easy_setopt(req->curl_request.easy, CURLOPT_VERBOSE, curl_verbose);
+ curl_easy_setopt(req->curl_request.easy, CURLOPT_VERBOSE, (long) curl_verbose);
}
void
diff --git a/src/lua/init.c b/src/lua/init.c
index 76e978c..586db10 100644
--- a/src/lua/init.c
+++ b/src/lua/init.c
@@ -279,7 +279,7 @@ tarantool_lua_setpaths(struct lua_State *L)
{
const char *home = getenv("HOME");
char cwd[PATH_MAX] = {'\0'};
- getcwd(cwd, sizeof(cwd));
+ MAYBE_UNUSED char *unused = getcwd(cwd, sizeof(cwd));
lua_getglobal(L, "package");
int top = lua_gettop(L);
diff --git a/src/say.c b/src/say.c
index 4312408..18a5310 100644
--- a/src/say.c
+++ b/src/say.c
@@ -1130,8 +1130,9 @@ log_vsay(struct log *log, int level, const char *filename, int line,
break;
case SAY_LOGGER_SYSLOG:
write_to_syslog(log, total);
- if (level == S_FATAL && log->fd != STDERR_FILENO)
- (void) safe_write(STDERR_FILENO, buf, total);
+ if (level == S_FATAL && log->fd != STDERR_FILENO) {
+ MAYBE_UNUSED ssize_t unused = safe_write(STDERR_FILENO, buf, total);
+ }
break;
case SAY_LOGGER_BOOT:
{
--
2.7.4
More information about the Tarantool-patches
mailing list