Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'bug984669'

  • Loading branch information...
commit f752e621724b2c3a4ac7f57e286579c3a9e174e1 2 parents d71d2b9 + 19fef7f
@kostya-shulgin kostya-shulgin authored
View
9 core/replication.m
@@ -437,13 +437,18 @@ static void spawner_signal_handler(int signal)
static void
spawner_sigchld_handler(int signo __attribute__((unused)))
{
+ static const char waitpid_failed[] = "spawner: waitpid() failed\n";
do {
int exit_status;
pid_t pid = waitpid(-1, &exit_status, WNOHANG);
switch (pid) {
case -1:
- if (errno != ECHILD)
- write(sayfd, "spawner: waitpid() failed\n", 26);
+ if (errno != ECHILD) {
+ int r = write(sayfd, waitpid_failed,
+ sizeof(waitpid_failed) - 1);
+ (void) r; /* -Wunused-result warning suppression */
+ }
+ return;
case 0: /* no more changes in children status */
return;
default:
View
3  core/tarantool_lua.m
@@ -986,7 +986,8 @@ static char format_to_opcode(char format)
if (! isdigit(*str))
return true;
char *endptr;
- (void) strtod(str, &endptr);
+ double r = strtod(str, &endptr);
+ (void) r; /* -Wunused-result warning suppression */
return *endptr != '\0';
}
View
6 mod/box/tree.m
@@ -585,7 +585,8 @@
* Compare a part for two dense keys with parts in linear order.
*/
static int
-linear_node_compare(struct key_def *key_def, u32 first_field,
+linear_node_compare(struct key_def *key_def,
+ u32 first_field __attribute__((unused)),
struct box_tuple *tuple_a, u32 offset_a,
struct box_tuple *tuple_b, u32 offset_b)
{
@@ -701,7 +702,8 @@
static int
linear_key_node_compare(struct key_def *key_def,
const struct key_data *key_data,
- u32 first_field, struct box_tuple *tuple, u32 offset)
+ u32 first_field __attribute__((unused)),
+ struct box_tuple *tuple, u32 offset)
{
int part_count = key_def->part_count;
assert(first_field + part_count <= tuple->cardinality);
View
2  third_party/valgrind/valgrind.h
@@ -4346,7 +4346,7 @@ typedef
#define VALGRIND_DO_CLIENT_REQUEST_EXPR( \
_zzq_default, _zzq_request, \
_zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5) \
- (_zzq_default)
+ (void)(_zzq_default)
#else /*defined(NVALGRIND)*/
Please sign in to comment.
Something went wrong with that request. Please try again.