1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#45288: pb2 returns a lot of compilation warnings on linux

Browse Source 
Use UNINIT_VAR workaround instead of LINT_INIT. The former can
also be used to silence false-positives in non-debug builds as
it actually does not cause new code to be generated.
This commit is contained in:
Davi Arnaut 2010-09-24 19:13:51 -03:00
parent 930a50f9d3
commit 58dfba2899
5 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysys/my_getopt.c
View File

@ -112,7 +112,7 @@ int handle_options(int *argc, char ***argv,
const struct my_option *longopts, const struct my_option *longopts,
my_get_one_option get_one_option) my_get_one_option get_one_option)
{ {
uint opt_found, argvpos= 0, length; uint UNINIT_VAR(opt_found), argvpos= 0, length;
my_bool end_of_options= 0, must_be_var, set_maximum_value, my_bool end_of_options= 0, must_be_var, set_maximum_value,
option_is_loose; option_is_loose;
char **pos, **pos_end, *optend, *opt_str, key_name[FN_REFLEN]; char **pos, **pos_end, *optend, *opt_str, key_name[FN_REFLEN];
@ -121,7 +121,6 @@ int handle_options(int *argc, char ***argv,
void *value; void *value;
int error, i; int error, i;
LINT_INIT(opt_found);
/* handle_options() assumes arg0 (program name) always exists */ /* handle_options() assumes arg0 (program name) always exists */
DBUG_ASSERT(argc && *argc >= 1); DBUG_ASSERT(argc && *argc >= 1);
DBUG_ASSERT(argv && *argv); DBUG_ASSERT(argv && *argv);

3
storage/myisam/mi_range.c
View File

@ -193,12 +193,11 @@ static double _mi_search_pos(register MI_INFO *info,
register my_off_t pos) register my_off_t pos)
{ {
int flag; int flag;
uint nod_flag,keynr,max_keynr; uint nod_flag,keynr,UNINIT_VAR(max_keynr);
my_bool after_key; my_bool after_key;
uchar *keypos,*buff; uchar *keypos,*buff;
double offset; double offset;
DBUG_ENTER("_mi_search_pos"); DBUG_ENTER("_mi_search_pos");
LINT_INIT(max_keynr);
if (pos == HA_OFFSET_ERROR) if (pos == HA_OFFSET_ERROR)
DBUG_RETURN(0.5); DBUG_RETURN(0.5);

10
storage/myisam/mi_search.c
View File

@ -296,9 +296,9 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
flag is the value returned by ha_key_cmp and as treated as final flag is the value returned by ha_key_cmp and as treated as final
*/ */
int flag=0, my_flag=-1; int flag=0, my_flag=-1;
uint nod_flag, length, len, matched, cmplen, kseg_len; uint nod_flag, UNINIT_VAR(length), len, matched, cmplen, kseg_len;
uint prefix_len,suffix_len; uint UNINIT_VAR(prefix_len), suffix_len;
int key_len_skip, seg_len_pack, key_len_left; int key_len_skip, UNINIT_VAR(seg_len_pack), key_len_left;
uchar *end, *kseg, *vseg; uchar *end, *kseg, *vseg;
uchar *sort_order=keyinfo->seg->charset->sort_order; uchar *sort_order=keyinfo->seg->charset->sort_order;
uchar tt_buff[MI_MAX_KEY_BUFF+2], *t_buff=tt_buff+2; uchar tt_buff[MI_MAX_KEY_BUFF+2], *t_buff=tt_buff+2;
@ -308,10 +308,6 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
uint length_pack; uint length_pack;
DBUG_ENTER("_mi_prefix_search"); DBUG_ENTER("_mi_prefix_search");
LINT_INIT(length);
LINT_INIT(prefix_len);
LINT_INIT(seg_len_pack);
t_buff[0]=0; /* Avoid bugs */ t_buff[0]=0; /* Avoid bugs */
end= page+mi_getint(page); end= page+mi_getint(page);
nod_flag=mi_test_if_nod(page); nod_flag=mi_test_if_nod(page);

8
storage/myisam/rt_index.c
View File

@ -481,17 +481,13 @@ static uchar *rtree_pick_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key,
uint key_length, uchar *page_buf, uint nod_flag) uint key_length, uchar *page_buf, uint nod_flag)
{ {
double increase; double increase;
double best_incr; double UNINIT_VAR(best_incr);
double area; double area;
double best_area; double UNINIT_VAR(best_area);
uchar *best_key= NULL; uchar *best_key= NULL;
uchar *k = rt_PAGE_FIRST_KEY(page_buf, nod_flag); uchar *k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
uchar *last = rt_PAGE_END(page_buf); uchar *last = rt_PAGE_END(page_buf);
LINT_INIT(best_area);
LINT_INIT(best_key);
LINT_INIT(best_incr);
for (; k < last; k = rt_PAGE_NEXT_KEY(k, key_length, nod_flag)) for (; k < last; k = rt_PAGE_NEXT_KEY(k, key_length, nod_flag))
{ {
/* The following is safe as -1.0 is an exact number */ /* The following is safe as -1.0 is an exact number */

11
storage/myisam/rt_split.c
View File

@ -178,18 +178,13 @@ static int split_rtree_node(SplitStruct *node, int n_entries,
double **d_buffer, int n_dim) double **d_buffer, int n_dim)
{ {
SplitStruct *cur; SplitStruct *cur;
SplitStruct *a; SplitStruct *UNINIT_VAR(a), *UNINIT_VAR(b);
SplitStruct *b;
double *g1 = reserve_coords(d_buffer, n_dim); double *g1 = reserve_coords(d_buffer, n_dim);
double *g2 = reserve_coords(d_buffer, n_dim); double *g2 = reserve_coords(d_buffer, n_dim);
SplitStruct *next; SplitStruct *UNINIT_VAR(next);
int next_node; int UNINIT_VAR(next_node);
int i; int i;
SplitStruct *end = node + n_entries; SplitStruct *end = node + n_entries;
LINT_INIT(a);
LINT_INIT(b);
LINT_INIT(next);
LINT_INIT(next_node);
if (all_size < min_size * 2) if (all_size < min_size * 2)
{ {