mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed compiler warnings from gcc and clang 5.0.1

Browse source
This commit is contained in:
Monty 2020-05-12 18:56:41 +03:00
commit 4ea171ffab
16 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/mroonga/vendor/groonga/lib/proc/proc_column.c vendored
View file

@ -41,7 +41,7 @@ grn_proc_column_parse_flags(grn_ctx *ctx,
#define CHECK_FLAG(name) \
name_size = strlen(#name); \
if ((end - text) >= name_size && \
if ((unsigned long) (end - text) >= (unsigned long) name_size && \
memcmp(text, #name, name_size) == 0) { \
flags |= GRN_OBJ_ ## name; \
text += name_size; \

2
storage/mroonga/vendor/groonga/lib/proc/proc_dump.c vendored
View file

@ -495,7 +495,7 @@ dump_record(grn_ctx *ctx, grn_dumper *dumper,
}
}
GRN_TEXT_PUTC(ctx, dumper->output, ']');
if (GRN_TEXT_LEN(dumper->output) >= DUMP_FLUSH_THRESHOLD_SIZE) {
if ((size_t) GRN_TEXT_LEN(dumper->output) >= DUMP_FLUSH_THRESHOLD_SIZE) {
grn_ctx_output_flush(ctx, 0);
}
}

6
storage/mroonga/vendor/groonga/lib/proc/proc_fuzzy_search.c vendored
View file

@ -232,7 +232,7 @@ sequential_fuzzy_search(grn_ctx *ctx, grn_obj *table, grn_obj *column, grn_obj *
key_length = grn_table_get_key(ctx, domain, rid, key_name, GRN_TABLE_MAX_KEY_SIZE);
if (!prefix_match_size ||
(prefix_match_size > 0 && key_length >= prefix_match_size &&
(prefix_match_size > 0 && key_length >= (int) prefix_match_size &&
!memcmp(sx, key_name, prefix_match_size))) {
distance = calc_edit_distance(ctx, sx, ex,
key_name, key_name + key_length, flags);
@ -250,7 +250,7 @@ sequential_fuzzy_search(grn_ctx *ctx, grn_obj *table, grn_obj *column, grn_obj *
rid = GRN_RECORD_VALUE(&value);
key_length = grn_table_get_key(ctx, domain, rid, key_name, GRN_TABLE_MAX_KEY_SIZE);
if (!prefix_match_size ||
(prefix_match_size > 0 && key_length >= prefix_match_size &&
(prefix_match_size > 0 && key_length >= (int) prefix_match_size &&
!memcmp(sx, key_name, prefix_match_size))) {
distance = calc_edit_distance(ctx, sx, ex,
key_name, key_name + key_length, flags);
@ -277,7 +277,7 @@ sequential_fuzzy_search(grn_ctx *ctx, grn_obj *table, grn_obj *column, grn_obj *
grn_obj_unlink(ctx, &value);
for (i = 0; i < heap->n_entries; i++) {
if (max_expansion > 0 && i >= max_expansion) {
if (max_expansion > 0 && (uint32_t) i >= max_expansion) {
break;
}
{

6
storage/mroonga/vendor/groonga/lib/proc/proc_select.c vendored
View file

@ -297,7 +297,7 @@ grn_parse_table_group_calc_types(grn_ctx *ctx,
}
#define CHECK_TABLE_GROUP_CALC_TYPE(name)\
if (((calc_types_end - calc_types) >= (sizeof(#name) - 1)) &&\
if (((unsigned long) (calc_types_end - calc_types) >= (unsigned long) (sizeof(#name) - 1)) && \
(!memcmp(calc_types, #name, sizeof(#name) - 1))) {\
flags |= GRN_TABLE_GROUP_CALC_ ## name;\
calc_types += sizeof(#name) - 1;\
@ -577,7 +577,7 @@ grn_columns_collect(grn_ctx *ctx,
while (grn_table_cursor_next(ctx, cursor)) {
void *key;
char *variable_name;
int variable_name_len;
unsigned int variable_name_len;
char *column_name;
size_t column_name_len;
void *value_raw;
@ -1057,7 +1057,7 @@ grn_proc_expr_query_flags_parse(grn_ctx *ctx,
}
#define CHECK_EXPR_FLAG(name) \
if (((query_flags_end - query_flags) >= (sizeof(#name) - 1)) && \
if (((unsigned long) (query_flags_end - query_flags) >= (unsigned long) (sizeof(#name) - 1)) && \
(memcmp(query_flags, #name, sizeof(#name) - 1) == 0) && \
(((query_flags_end - query_flags) == (sizeof(#name) - 1)) || \
(query_flags[sizeof(#name) - 1] == '|') || \

2
storage/mroonga/vendor/groonga/lib/proc/proc_table.c vendored
View file

@ -40,7 +40,7 @@ command_table_create_parse_flags(grn_ctx *ctx,
#define CHECK_FLAG(name) \
name_size = strlen(#name); \
if ((end - nptr) >= name_size && \
if ((unsigned long) (end - nptr) >= (unsigned long) name_size && \
memcmp(nptr, #name, name_size) == 0) { \
flags |= GRN_OBJ_ ## name; \
nptr += name_size; \

2
storage/mroonga/vendor/groonga/lib/proc/proc_tokenize.c vendored
View file

@ -39,7 +39,7 @@ parse_tokenize_flags(grn_ctx *ctx, grn_obj *flag_names)
}
#define CHECK_FLAG(name)\
if (((names_end - names) >= (sizeof(#name) - 1)) &&\
if (((unsigned long) (names_end - names) >= (unsigned long) (sizeof(#name) - 1)) &&\
(!memcmp(names, #name, sizeof(#name) - 1))) {\
flags |= GRN_TOKEN_CURSOR_ ## name;\
names += sizeof(#name) - 1;\