From 7fa4be57aa540b995909150f4026d689c661b80d Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja.osipov@gmail.com>
Date: Mon, 4 Jul 2011 12:11:48 +0400
Subject: [PATCH] Fix Bug#805350 Make warnings - stops compile -Werror
Remove compilation warnings about unused variables.
Make sure Release and RelWithDebugInfo do
not include -Werror - we don't know compiler version
at the client and shouldn't plant time bombs for him/her.
---
CMakeLists.txt | 9 ++++++++-
core/admin.m | 2 +-
core/admin.rl | 2 +-
core/fiber.m | 6 ++----
include/fiber.h | 6 +-----
mod/box/box.m | 6 +++---
6 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2db72d8c5..ac2bda1b96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,10 +143,17 @@ set (CMAKE_C_FLAGS
if (${CMAKE_BUILD_TYPE} STREQUAL "None")
set (core_cflags "-std=gnu99")
else()
- set (core_cflags "-std=gnu99 -Wall -Wextra -Werror")
+ set (core_cflags "-std=gnu99 -Wall -Wextra")
set (core_cflags "${core_cflags} -Wno-sign-compare -Wno-strict-aliasing")
endif()
+# Only add -Werror if it's a debug build, done by developers.
+# Community builds should not cause extra trouble.
+
+if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+ set (core_cflags "${core_cflags} -Werror")
+endif()
+
#
# Specify where to look for include files.
#
diff --git a/core/admin.m b/core/admin.m
index 6ffc97035e..412dc7b886 100644
--- a/core/admin.m
+++ b/core/admin.m
@@ -1477,7 +1477,7 @@ admin_handler(void *_data __attribute__((unused)))
int
admin_init(void)
{
- if (fiber_server(tcp_server, cfg.admin_port, admin_handler, NULL, NULL) == NULL) {
+ if (fiber_server(cfg.admin_port, admin_handler, NULL, NULL) == NULL) {
say_syserror("can't bind to %d", cfg.admin_port);
return -1;
}
diff --git a/core/admin.rl b/core/admin.rl
index 2e10c8968c..81265ecf7a 100644
--- a/core/admin.rl
+++ b/core/admin.rl
@@ -223,7 +223,7 @@ admin_handler(void *_data __attribute__((unused)))
int
admin_init(void)
{
- if (fiber_server(tcp_server, cfg.admin_port, admin_handler, NULL, NULL) == NULL) {
+ if (fiber_server(cfg.admin_port, admin_handler, NULL, NULL) == NULL) {
say_syserror("can't bind to %d", cfg.admin_port);
return -1;
}
diff --git a/core/fiber.m b/core/fiber.m
index 74876d70dc..c0b83055f0 100644
--- a/core/fiber.m
+++ b/core/fiber.m
@@ -286,7 +286,7 @@ fiber_io_yield()
}
static void
-fiber_io_stop(int events)
+fiber_io_stop(int events __attribute__((unused)))
{
ev_io *io = &fiber->io;
@@ -1175,15 +1175,13 @@ tcp_server_handler(void *data)
}
struct fiber *
-fiber_server(fiber_server_type type, int port, void (*handler) (void *data), void *data,
+fiber_server(int port, void (*handler) (void *data), void *data,
void (*on_bind) (void *data))
{
char *server_name;
struct fiber_server *server;
struct fiber *s;
- assert(type == tcp_server);
-
server_name = palloc(eter_pool, 64);
snprintf(server_name, 64, "%i/acceptor", port);
s = fiber_create(server_name, -1, -1, tcp_server_handler, data);
diff --git a/include/fiber.h b/include/fiber.h
index caa49da8b5..ab8cd7e679 100644
--- a/include/fiber.h
+++ b/include/fiber.h
@@ -191,13 +191,9 @@ void fiber_sleep(ev_tstamp s);
void fiber_info(struct tbuf *out);
int set_nonblock(int sock);
-typedef enum fiber_server_type {
- tcp_server,
-} fiber_server_type;
-
typedef void (*fiber_server_callback)(void *);
-struct fiber *fiber_server(fiber_server_type type, int port,
+struct fiber *fiber_server(int port,
fiber_server_callback callback, void *,
void (*on_bind) (void *));
diff --git a/mod/box/box.m b/mod/box/box.m
index 6e6084ed94..2672173919 100644
--- a/mod/box/box.m
+++ b/mod/box/box.m
@@ -1406,16 +1406,16 @@ mod_init(void)
}
if (cfg.memcached != 0) {
- fiber_server(tcp_server, cfg.primary_port, memcached_handler, NULL,
+ fiber_server(cfg.primary_port, memcached_handler, NULL,
box_leave_local_hot_standby_mode);
} else {
if (cfg.secondary_port != 0)
- fiber_server(tcp_server, cfg.secondary_port,
+ fiber_server(cfg.secondary_port,
(fiber_server_callback) iproto_interact,
&ro_callback, NULL);
if (cfg.primary_port != 0)
- fiber_server(tcp_server, cfg.primary_port,
+ fiber_server(cfg.primary_port,
(fiber_server_callback) iproto_interact,
&rw_callback, box_leave_local_hot_standby_mode);
}
--
GitLab