null+****@clear*****
null+****@clear*****
2012年 5月 1日 (火) 12:34:46 JST
Susumu Yata 2012-05-01 12:34:46 +0900 (Tue, 01 May 2012) New Revision: c85e7e2b43d1c2f8811285c8c6c1331942154789 Log: Fix format strings and their arguments. Modified files: lib/plugin.c lib/proc.c lib/store.c lib/str.c plugins/suggest/suggest.c src/groonga.c Modified: lib/plugin.c (+1 -1) =================================================================== --- lib/plugin.c 2012-05-01 12:01:25 +0900 (18b4cd5) +++ lib/plugin.c 2012-05-01 12:34:46 +0900 (98973fe) @@ -310,7 +310,7 @@ grn_plugin_register_by_path(grn_ctx *ctx, const char *path) if ((path_len += strlen(grn_plugin_get_suffix())) >= PATH_MAX) { ERR(GRN_FILENAME_TOO_LONG, "too long plugin path: <%.*s/.libs%s%s>", - base_name - path, path, base_name, grn_plugin_get_suffix()); + (int)(base_name - path), path, base_name, grn_plugin_get_suffix()); goto exit; } complemented_libs_path[0] = '\0'; Modified: lib/proc.c (+53 -51) =================================================================== --- lib/proc.c 2012-05-01 12:01:25 +0900 (bb72d7d) +++ lib/proc.c 2012-05-01 12:34:46 +0900 (9bf816d) @@ -312,7 +312,7 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len, if ((cache = grn_cache_fetch(ctx, cache_key, cache_key_size))) { GRN_TEXT_PUT(ctx, outbuf, GRN_TEXT_VALUE(cache), GRN_TEXT_LEN(cache)); grn_cache_unref(cache_key, cache_key_size); - LAP(":", "cache(%d)", GRN_TEXT_LEN(cache)); + LAP(":", "cache(%" GRN_FMT_LLD ")", (long long int)GRN_TEXT_LEN(cache)); return ctx->rc; } } @@ -700,7 +700,8 @@ grn_parse_table_create_flags(grn_ctx *ctx, const char *nptr, const char *end) flags |= GRN_OBJ_KEY_WITH_SIS; nptr += 12; } else { - ERR(GRN_INVALID_ARGUMENT, "invalid flags option: %.*s", end - nptr, nptr); + ERR(GRN_INVALID_ARGUMENT, "invalid flags option: %.*s", + (int)(end - nptr), nptr); return 0; } } @@ -738,7 +739,8 @@ grn_parse_column_create_flags(grn_ctx *ctx, const char *nptr, const char *end) flags |= GRN_OBJ_RING_BUFFER; nptr += 11; } else { - ERR(GRN_INVALID_ARGUMENT, "invalid flags option: %.*s", end - nptr, nptr); + ERR(GRN_INVALID_ARGUMENT, "invalid flags option: %.*s", + (int)(end - nptr), nptr); return 0; } } @@ -836,8 +838,8 @@ proc_table_create(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_d if (!key_type) { ERR(GRN_INVALID_ARGUMENT, "[table][create] key type doesn't exist: <%.*s> (%.*s)", - GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)), - GRN_TEXT_LEN(VAR(2)), GRN_TEXT_VALUE(VAR(2))); + (int)GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)), + (int)GRN_TEXT_LEN(VAR(2)), GRN_TEXT_VALUE(VAR(2))); return NULL; } } @@ -847,8 +849,8 @@ proc_table_create(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_d if (!value_type) { ERR(GRN_INVALID_ARGUMENT, "[table][create] value type doesn't exist: <%.*s> (%.*s)", - GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)), - GRN_TEXT_LEN(VAR(3)), GRN_TEXT_VALUE(VAR(3))); + (int)GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)), + (int)GRN_TEXT_LEN(VAR(3)), GRN_TEXT_VALUE(VAR(3))); return NULL; } } @@ -905,14 +907,14 @@ proc_table_rename(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_d rc = GRN_INVALID_ARGUMENT; ERR(rc, "[table][rename] table isn't found: <%.*s>", - GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0))); + (int)GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0))); goto exit; } if (GRN_TEXT_LEN(VAR(1)) == 0) { rc = GRN_INVALID_ARGUMENT; ERR(rc, "[table][rename] new table name isn't specified: <%.*s>", - GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0))); + (int)GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0))); goto exit; } rc = grn_table_rename(ctx, table, @@ -920,8 +922,8 @@ proc_table_rename(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_d if (rc != GRN_SUCCESS && ctx->rc == GRN_SUCCESS) { ERR(rc, "[table][rename] failed to rename: <%.*s> -> <%.*s>", - GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)), - GRN_TEXT_LEN(VAR(1)), GRN_TEXT_VALUE(VAR(1))); + (int)GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)), + (int)GRN_TEXT_LEN(VAR(1)), GRN_TEXT_VALUE(VAR(1))); } exit: GRN_OUTPUT_BOOL(!rc); @@ -945,7 +947,7 @@ proc_column_create(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_ if (!table) { ERR(GRN_INVALID_ARGUMENT, "[column][create] table doesn't exist: <%.*s>", - GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0))); + (int)GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0))); goto exit; } type = grn_ctx_get(ctx, GRN_TEXT_VALUE(VAR(3)), @@ -953,7 +955,7 @@ proc_column_create(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_ if (!type) { ERR(GRN_INVALID_ARGUMENT, "[column][create] type doesn't exist: <%.*s>", - GRN_TEXT_LEN(VAR(3)), GRN_TEXT_VALUE(VAR(3))) ; + (int)GRN_TEXT_LEN(VAR(3)), GRN_TEXT_VALUE(VAR(3))) ; goto exit; } if (GRN_TEXT_LEN(VAR(1))) { @@ -1050,14 +1052,14 @@ proc_column_rename(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_ rc = GRN_INVALID_ARGUMENT; ERR(rc, "[column][rename] table isn't found: <%.*s>", - GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0))); + (int)GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0))); goto exit; } if (GRN_TEXT_LEN(VAR(1)) == 0) { rc = GRN_INVALID_ARGUMENT; ERR(rc, "[column][rename] column name isn't specified: <%.*s>", - GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0))); + (int)GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0))); goto exit; } column = grn_obj_column(ctx, table, @@ -1066,16 +1068,16 @@ proc_column_rename(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_ rc = GRN_INVALID_ARGUMENT; ERR(rc, "[column][rename] column isn't found: <%.*s.%.*s>", - GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)), - GRN_TEXT_LEN(VAR(1)), GRN_TEXT_VALUE(VAR(1))); + (int)GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)), + (int)GRN_TEXT_LEN(VAR(1)), GRN_TEXT_VALUE(VAR(1))); goto exit; } if (GRN_TEXT_LEN(VAR(2)) == 0) { rc = GRN_INVALID_ARGUMENT; ERR(rc, "[column][rename] new column name isn't specified: <%.*s.%.*s>", - GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)), - GRN_TEXT_LEN(VAR(1)), GRN_TEXT_VALUE(VAR(1))); + (int)GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)), + (int)GRN_TEXT_LEN(VAR(1)), GRN_TEXT_VALUE(VAR(1))); goto exit; } rc = grn_column_rename(ctx, column, @@ -1083,10 +1085,10 @@ proc_column_rename(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_ if (rc != GRN_SUCCESS && ctx->rc == GRN_SUCCESS) { ERR(rc, "[column][rename] failed to rename: <%.*s.%.*s> -> <%.*s.%.*s>", - GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)), - GRN_TEXT_LEN(VAR(1)), GRN_TEXT_VALUE(VAR(1)), - GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)), - GRN_TEXT_LEN(VAR(2)), GRN_TEXT_VALUE(VAR(2))); + (int)GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)), + (int)GRN_TEXT_LEN(VAR(1)), GRN_TEXT_VALUE(VAR(1)), + (int)GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0)), + (int)GRN_TEXT_LEN(VAR(2)), GRN_TEXT_VALUE(VAR(2))); } exit: GRN_OUTPUT_BOOL(!rc); @@ -1277,7 +1279,7 @@ proc_column_list(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_da grn_obj_unlink(ctx, table); } else { ERR(GRN_INVALID_ARGUMENT, "table '%.*s' does not exist.", - GRN_TEXT_LEN(VAR(0)), + (int)GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0))); } return NULL; @@ -1715,7 +1717,7 @@ proc_delete_validate_selector(grn_ctx *ctx, grn_obj *table, grn_obj *table_name, rc = GRN_INVALID_ARGUMENT; ERR(rc, "[table][record][delete] table doesn't exist: <%.*s>", - GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name)); + (int)GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name)); return rc; } @@ -1726,7 +1728,7 @@ proc_delete_validate_selector(grn_ctx *ctx, grn_obj *table, grn_obj *table_name, ERR(rc, "[table][record][delete] either key, id or filter must be specified: " "table: <%.*s>", - GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name)); + (int)GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name)); return rc; } @@ -1736,10 +1738,10 @@ proc_delete_validate_selector(grn_ctx *ctx, grn_obj *table, grn_obj *table_name, "[table][record][delete] " "record selector must be one of key, id and filter: " "table: <%.*s>, key: <%.*s>, id: <%.*s>, filter: <%.*s>", - GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name), - GRN_TEXT_LEN(key), GRN_TEXT_VALUE(key), - GRN_TEXT_LEN(id), GRN_TEXT_VALUE(id), - GRN_TEXT_LEN(filter), GRN_TEXT_VALUE(filter)); + (int)GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name), + (int)GRN_TEXT_LEN(key), GRN_TEXT_VALUE(key), + (int)GRN_TEXT_LEN(id), GRN_TEXT_VALUE(id), + (int)GRN_TEXT_LEN(filter), GRN_TEXT_VALUE(filter)); return rc; } @@ -1748,9 +1750,9 @@ proc_delete_validate_selector(grn_ctx *ctx, grn_obj *table, grn_obj *table_name, ERR(rc, "[table][record][delete] " "can't use both key and id: table: <%.*s>, key: <%.*s>, id: <%.*s>", - GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name), - GRN_TEXT_LEN(key), GRN_TEXT_VALUE(key), - GRN_TEXT_LEN(id), GRN_TEXT_VALUE(id)); + (int)GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name), + (int)GRN_TEXT_LEN(key), GRN_TEXT_VALUE(key), + (int)GRN_TEXT_LEN(id), GRN_TEXT_VALUE(id)); return rc; } @@ -1760,9 +1762,9 @@ proc_delete_validate_selector(grn_ctx *ctx, grn_obj *table, grn_obj *table_name, "[table][record][delete] " "can't use both key and filter: " "table: <%.*s>, key: <%.*s>, filter: <%.*s>", - GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name), - GRN_TEXT_LEN(key), GRN_TEXT_VALUE(key), - GRN_TEXT_LEN(filter), GRN_TEXT_VALUE(filter)); + (int)GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name), + (int)GRN_TEXT_LEN(key), GRN_TEXT_VALUE(key), + (int)GRN_TEXT_LEN(filter), GRN_TEXT_VALUE(filter)); return rc; } @@ -1772,9 +1774,9 @@ proc_delete_validate_selector(grn_ctx *ctx, grn_obj *table, grn_obj *table_name, "[table][record][delete] " "can't use both id and filter: " "table: <%.*s>, id: <%.*s>, filter: <%.*s>", - GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name), - GRN_TEXT_LEN(id), GRN_TEXT_VALUE(id), - GRN_TEXT_LEN(filter), GRN_TEXT_VALUE(filter)); + (int)GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name), + (int)GRN_TEXT_LEN(id), GRN_TEXT_VALUE(id), + (int)GRN_TEXT_LEN(filter), GRN_TEXT_VALUE(filter)); return rc; } @@ -1828,11 +1830,11 @@ proc_delete(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) ERR(rc, "[table][record][delete] id should be number: " "table: <%.*s>, id: <%.*s>, detail: <%.*s|%c|%.*s>", - GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name), - GRN_TEXT_LEN(id), GRN_TEXT_VALUE(id), - end - GRN_TEXT_VALUE(id), GRN_TEXT_VALUE(id), + (int)GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name), + (int)GRN_TEXT_LEN(id), GRN_TEXT_VALUE(id), + (int)(end - GRN_TEXT_VALUE(id)), GRN_TEXT_VALUE(id), end[0], - GRN_TEXT_VALUE(id) - end - 1, end + 1); + (int)(GRN_TEXT_VALUE(id) - end - 1), end + 1); } } else if (GRN_TEXT_LEN(filter)) { grn_obj *cond, *v; @@ -1850,8 +1852,8 @@ proc_delete(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) ERR(rc, "[table][record][delete] failed to parse filter: " "table: <%.*s>, filter: <%.*s>, detail: <%s>", - GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name), - GRN_TEXT_LEN(filter), GRN_TEXT_VALUE(filter), + (int)GRN_TEXT_LEN(table_name), GRN_TEXT_VALUE(table_name), + (int)GRN_TEXT_LEN(filter), GRN_TEXT_VALUE(filter), original_error_message); } else { grn_obj *records; @@ -2386,7 +2388,7 @@ dump_selected_tables_records(grn_ctx *ctx, grn_obj *outbuf, grn_obj *tables) p++; } GRN_LOG(ctx, GRN_LOG_WARNING, "invalid table name is ignored: <%.*s>\n", - p - token, token); + (int)(p - token), token); continue; } while (p < e && @@ -2411,7 +2413,7 @@ dump_selected_tables_records(grn_ctx *ctx, grn_obj *outbuf, grn_obj *tables) } else { GRN_LOG(ctx, GRN_LOG_WARNING, "nonexistent table name is ignored: <%.*s>\n", - token_e - token, token); + (int)(token_e - token), token); } } } @@ -2481,7 +2483,7 @@ proc_cache_limit(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_da } else { ERR(GRN_INVALID_ARGUMENT, "max value is invalid unsigned integer format: <%.*s>", - GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0))); + (int)GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0))); } } return NULL; @@ -2510,7 +2512,7 @@ proc_check(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) grn_obj *obj = grn_ctx_get(ctx, GRN_TEXT_VALUE(VAR(0)), GRN_TEXT_LEN(VAR(0))); if (!obj) { ERR(GRN_INVALID_ARGUMENT, - "no such object: <%.*s>", GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0))); + "no such object: <%.*s>", (int)GRN_TEXT_LEN(VAR(0)), GRN_TEXT_VALUE(VAR(0))); GRN_OUTPUT_BOOL(!ctx->rc); } else { switch (obj->header.type) { @@ -2621,7 +2623,7 @@ proc_truncate(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) grn_obj *table = grn_ctx_get(ctx, table_name, table_name_len); if (!table) { ERR(GRN_INVALID_ARGUMENT, - "no such table: <%.*s>", table_name, table_name_len); + "no such table: <%.*s>", table_name_len, table_name); } else { switch (table->header.type) { case GRN_TABLE_HASH_KEY : @@ -2637,7 +2639,7 @@ proc_truncate(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) grn_inspect(ctx, &buffer, table); ERR(GRN_INVALID_ARGUMENT, "not a table object: %.*s", - GRN_TEXT_LEN(&buffer), GRN_TEXT_VALUE(&buffer)); + (int)GRN_TEXT_LEN(&buffer), GRN_TEXT_VALUE(&buffer)); GRN_OBJ_FIN(ctx, &buffer); } break; Modified: lib/store.c (+2 -2) =================================================================== --- lib/store.c 2012-05-01 12:01:25 +0900 (6d80f97) +++ lib/store.c 2012-05-01 12:34:46 +0900 (a39804d) @@ -1290,8 +1290,8 @@ grn_ja_defrag_seg(grn_ctx *ctx, grn_ja *ja, uint32_t seg) if (grn_ja_element_info(ctx, ja, id, &cas, &pos, &element_size)) { break; } if (v + sizeof(uint32_t) != ve - JA_SEGMENT_SIZE + pos) { GRN_LOG(ctx, GRN_LOG_WARNING, - "dseges[%d] = pos unmatch (%d != %d)", - seg, pos, v + sizeof(uint32_t) + JA_SEGMENT_SIZE - ve); + "dseges[%d] = pos unmatch (%d != %" GRN_FMT_LLD ")", + seg, pos, (long long int)(v + sizeof(uint32_t) + JA_SEGMENT_SIZE - ve)); break; } if (grn_ja_put(ctx, ja, id, v + sizeof(uint32_t), element_size, GRN_OBJ_SET, &cas)) { Modified: lib/str.c (+2 -2) =================================================================== --- lib/str.c 2012-05-01 12:01:25 +0900 (6a2bfa9) +++ lib/str.c 2012-05-01 12:34:46 +0900 (cac9444) @@ -3163,7 +3163,7 @@ grn_text_urldec(grn_ctx *ctx, grn_obj *buf, const char *p, const char *e, char d GRN_TEXT_PUTC(ctx, buf, c); p += 3; } else { - GRN_LOG(ctx, GRN_LOG_NOTICE, "invalid %% sequence (%c%c)", p + 1, p + 2); + GRN_LOG(ctx, GRN_LOG_NOTICE, "invalid %% sequence (%c%c)", p[1], p[2]); GRN_TEXT_PUTC(ctx, buf, '%'); p += 1; } @@ -3191,7 +3191,7 @@ grn_text_cgidec(grn_ctx *ctx, grn_obj *buf, const char *p, const char *e, char d GRN_TEXT_PUTC(ctx, buf, c); p += 3; } else { - GRN_LOG(ctx, GRN_LOG_NOTICE, "invalid %% sequence (%c%c)", p + 1, p + 2); + GRN_LOG(ctx, GRN_LOG_NOTICE, "invalid %% sequence (%c%c)", p[1], p[2]); GRN_TEXT_PUTC(ctx, buf, '%'); p += 1; } Modified: plugins/suggest/suggest.c (+2 -2) =================================================================== --- plugins/suggest/suggest.c 2012-05-01 12:01:25 +0900 (5f6b984) +++ plugins/suggest/suggest.c 2012-05-01 12:34:46 +0900 (6bb95c2) @@ -563,12 +563,12 @@ command_suggest(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_dat GRN_OUTPUT_MAP_CLOSE(); } else { ERR(GRN_INVALID_ARGUMENT, "nonexistent column: <%.*s.boost>", - GRN_TEXT_LEN(VAR(1)), GRN_TEXT_VALUE(VAR(1))); + (int)GRN_TEXT_LEN(VAR(1)), GRN_TEXT_VALUE(VAR(1))); } grn_obj_unlink(ctx, items); } else { ERR(GRN_INVALID_ARGUMENT, "nonexistent table: <%.*s>", - GRN_TEXT_LEN(VAR(1)), GRN_TEXT_VALUE(VAR(1))); + (int)GRN_TEXT_LEN(VAR(1)), GRN_TEXT_VALUE(VAR(1))); } return NULL; } Modified: src/groonga.c (+7 -4) =================================================================== --- src/groonga.c 2012-05-01 12:01:25 +0900 (0f75e53) +++ src/groonga.c 2012-05-01 12:34:46 +0900 (87dba46) @@ -1066,8 +1066,9 @@ h_output(grn_ctx *ctx, int flags, void *arg) len = GRN_TEXT_LEN(body) + GRN_TEXT_LEN(&head) + GRN_TEXT_LEN(outbuf) + GRN_TEXT_LEN(&foot); if (ret != len) { - GRN_LOG(&grn_gctx, GRN_LOG_NOTICE, "couldn't send all data (%d/%d)", - ret, len); + GRN_LOG(&grn_gctx, GRN_LOG_NOTICE, + "couldn't send all data (%" GRN_FMT_LLD "/%" GRN_FMT_LLD ")", + (long long int)ret, (long long int)len); } } GRN_BULK_REWIND(body); @@ -1768,7 +1769,8 @@ h_server(char *path) lim.rlim_cur = 0; lim.rlim_max = 0; getrlimit(RLIMIT_NOFILE, &lim); - GRN_LOG(ctx, GRN_LOG_NOTICE, "RLIMIT_NOFILE(%d,%d)", lim.rlim_cur, lim.rlim_max); + GRN_LOG(ctx, GRN_LOG_NOTICE, "RLIMIT_NOFILE(%" GRN_FMT_LLD ",%" GRN_FMT_LLD ")", + (long long int)lim.rlim_cur, (long long int)lim.rlim_max); } #endif /* WIN32 */ if (!grn_com_event_init(ctx, &ev, MAX_CON, sizeof(grn_com))) { @@ -1951,7 +1953,8 @@ g_server(char *path) lim.rlim_cur = 0; lim.rlim_max = 0; getrlimit(RLIMIT_NOFILE, &lim); - GRN_LOG(ctx, GRN_LOG_NOTICE, "RLIMIT_NOFILE(%d,%d)", lim.rlim_cur, lim.rlim_max); + GRN_LOG(ctx, GRN_LOG_NOTICE, "RLIMIT_NOFILE(%" GRN_FMT_LLD ",%" GRN_FMT_LLD ")", + (long long int)lim.rlim_cur, (long long int)lim.rlim_max); } #endif /* WIN32 */ if (!grn_com_event_init(ctx, &ev, MAX_CON, sizeof(grn_com))) {