From d87f70faee1aeead5d32c388bfde8c41e859fb2f Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 28 Feb 2011 14:15:36 +0100 Subject: [PATCH 1/1] Fix warning and code WRT uninit var (sort) --- index/zsets.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/index/zsets.c b/index/zsets.c index cbe2b52..4a8c74c 100644 --- a/index/zsets.c +++ b/index/zsets.c @@ -905,7 +905,6 @@ ZEBRA_RES resultSetSortSingle(ZebraHandle zh, NMEM nmem, { Z_SortKeySpec *sks = sort_sequence->specs[i]; Z_SortKey *sk; - ZEBRA_RES res; sort_criteria[i].ord = (int *) nmem_malloc(nmem, sizeof(int)*numbases); @@ -977,13 +976,12 @@ ZEBRA_RES resultSetSortSingle(ZebraHandle zh, NMEM nmem, for (ib = 0; ib < numbases; ib++) { zebraExplain_curDatabase(zh->reg->zei, zh->basenames[ib]); - res = zebra_sort_get_ord(zh, sk->u.sortAttributes, - &sort_criteria[i].ord[ib], - &sort_criteria[i].numerical[ib]); + if (zebra_sort_get_ord(zh, sk->u.sortAttributes, + &sort_criteria[i].ord[ib], + &sort_criteria[i].numerical[ib]) != + ZEBRA_OK && sks->which != Z_SortKeySpec_null) + return ZEBRA_FAIL; } - - if (sks->which != Z_SortKeySpec_null && res != ZEBRA_OK) - return ZEBRA_FAIL; break; } /* right now we look up the index type based on the first database -- 1.7.10.4