null+****@clear*****
null+****@clear*****
2011年 11月 12日 (土) 18:05:26 JST
Kouhei Sutou 2011-11-12 09:05:26 +0000 (Sat, 12 Nov 2011)
New Revision: 9a9b1cd9ddc6679a9680029a36a73672218c19a1
Log:
suppress warnings by -Wuninitialized and -O2.
Modified files:
lib/db.c
lib/geo.c
lib/ii.c
lib/proc.c
Modified: lib/db.c (+2 -2)
===================================================================
--- lib/db.c 2011-11-12 08:55:07 +0000 (31001fe)
+++ lib/db.c 2011-11-12 09:05:26 +0000 (fb9e27e)
@@ -5882,9 +5882,9 @@ remove_columns(grn_ctx *ctx, grn_obj *obj)
grn_rc
grn_obj_remove(grn_ctx *ctx, grn_obj *obj)
{
- grn_id id;
+ grn_id id = GRN_ID_NIL;
+ grn_obj *db = NULL;
char *path;
- grn_obj *db;
GRN_API_ENTER;
if (ctx->impl && ctx->impl->db) {
uint32_t s = 0;
Modified: lib/geo.c (+1 -1)
===================================================================
--- lib/geo.c 2011-11-12 08:55:07 +0000 (9fc1205)
+++ lib/geo.c 2011-11-12 09:05:26 +0000 (983b5fd)
@@ -972,7 +972,7 @@ grn_geo_cursor_each(grn_ctx *ctx, grn_obj *geo_cursor,
grn_geo_point *current, *base, *top_left, *bottom_right;
int diff_bit, distance, end_mesh_point;
grn_geo_mesh_direction direction;
- int mesh_point;
+ int mesh_point = 0;
grn_id index_id;
cursor = (grn_geo_cursor_in_rectangle *)geo_cursor;
Modified: lib/ii.c (+1 -1)
===================================================================
--- lib/ii.c 2011-11-12 08:55:07 +0000 (b9255e1)
+++ lib/ii.c 2011-11-12 09:05:26 +0000 (b134b97)
@@ -3478,7 +3478,7 @@ grn_rc
grn_ii_truncate(grn_ctx *ctx, grn_ii *ii)
{
grn_rc rc;
- char *segpath, *chunkpath;
+ char *segpath, *chunkpath = NULL;
grn_obj *lexicon;
uint32_t flags;
if ((segpath = (char *)grn_io_path(ii->seg)) && *segpath != '\0') {
Modified: lib/proc.c (+6 -3)
===================================================================
--- lib/proc.c 2011-11-12 08:55:07 +0000 (0e88638)
+++ lib/proc.c 2011-11-12 09:05:26 +0000 (c52a49c)
@@ -202,7 +202,7 @@ grn_select(grn_ctx *ctx, const char *table, unsigned table_len,
drilldown_len + 1 + drilldown_sortby_len + 1 + drilldown_output_columns_len +
match_escalation_threshold_len + 1 + query_expansion_len + 1 +
sizeof(grn_content_type) + sizeof(int) * 4;
- long long int threshold, original_threshold;
+ long long int threshold, original_threshold = 0;
if (cache_key_size <= GRN_TABLE_MAX_KEY_SIZE) {
grn_obj *cache;
char *cp = cache_key;
@@ -1505,7 +1505,7 @@ proc_get_resolve_parameters(grn_ctx *ctx, grn_user_data *user_data, grn_obj **ta
static grn_obj *
proc_get(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data)
{
- grn_id id;
+ grn_id id = GRN_ID_NIL;
grn_obj *table = NULL;
if (!proc_get_resolve_parameters(ctx, user_data, &table, &id)) {
grn_obj obj;
@@ -1524,13 +1524,14 @@ proc_get(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data)
static grn_obj *
proc_delete(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data)
{
- grn_rc rc;
+ grn_rc rc = GRN_INVALID_ARGUMENT;
grn_obj *table = grn_ctx_get(ctx,
GRN_TEXT_VALUE(VAR(0)),
GRN_TEXT_LEN(VAR(0)));
if (table) {
if (GRN_TEXT_LEN(VAR(1)) && GRN_TEXT_LEN(VAR(2))) {
ERR(GRN_INVALID_ARGUMENT, "both id and key are specified");
+ rc = ctx->rc;
} else if (GRN_TEXT_LEN(VAR(1))) {
grn_obj *p_key = VAR(1);
grn_obj key;
@@ -1552,10 +1553,12 @@ proc_delete(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data)
rc = grn_table_delete_by_id(ctx, table, id);
} else {
ERR(GRN_INVALID_ARGUMENT, "invalid id");
+ rc = ctx->rc;
}
}
} else {
ERR(GRN_INVALID_ARGUMENT, "unknown table name");
+ rc = ctx->rc;
}
GRN_OUTPUT_BOOL(!rc);
return NULL;