lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2026-03-10 00:20:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix compiler warnings in libmdb/ util/ sql/

Browse Source
This commit is contained in:
brianb
2004-01-10 01:52:56 +00:00
parent 244e519c50
commit 278cf8ef42
10 changed files with 80 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libmdb/backend.c
View File

@@ -120,11 +120,11 @@ int did_first;
char *mdb_get_coltype_string(MdbBackend *backend, int col_type)
{
static char buf[100];
static char buf[16];
if (col_type > 0x10 ) {
// return NULL;
sprintf(buf,"type %04x", col_type);
snprintf(buf,sizeof(buf), "type %04x", col_type);
return buf;
} else {
return backend->types_table[col_type].name;

32
src/libmdb/data.c
View File

@@ -190,18 +190,18 @@ int mdb_read_row(MdbTableDef *table, int row)
MdbHandle *mdb = table->entry->mdb;
MdbFormatConstants *fmt = mdb->fmt;
MdbColumn *col;
int i, j, rc;
int num_cols, var_cols, fixed_cols;
int i, rc;
//int num_cols, var_cols, fixed_cols;
int row_start, row_end;
int fixed_cols_found, var_cols_found;
int col_start, len, next_col;
int num_of_jumps=0, jumps_used=0;
int eod; /* end of data */
//int fixed_cols_found, var_cols_found;
//int col_start, len, next_col;
//int num_of_jumps=0, jumps_used=0;
//int eod; /* end of data */
int delflag, lookupflag;
int bitmask_sz;
int col_ptr, deleted_columns=0;
unsigned char null_mask[33]; /* 256 columns max / 8 bits per byte */
unsigned char isnull;
//int bitmask_sz;
//int col_ptr, deleted_columns=0;
//unsigned char null_mask[33]; /* 256 columns max / 8 bits per byte */
//unsigned char isnull;
MdbField fields[256];
int num_fields;
@@ -227,8 +227,8 @@ int mdb_read_row(MdbTableDef *table, int row)
return 0;
}
num_fields = mdb_crack_row(table, row_start, row_end, &fields);
if (!mdb_test_sargs(table, &fields, num_fields)) return 0;
num_fields = mdb_crack_row(table, row_start, row_end, fields);
if (!mdb_test_sargs(table, fields, num_fields)) return 0;
#if MDB_DEBUG
fprintf(stdout,"sarg test passed row %d \n", row);
@@ -572,7 +572,7 @@ guint32 pg;
do {
if (table->strategy==MDB_INDEX_SCAN) {
if (!mdb_index_find_next(table->mdbidx, table->scan_idx, table->chain, &pg, &(table->cur_row))) {
if (!mdb_index_find_next(table->mdbidx, table->scan_idx, table->chain, &pg, (guint16 *) &(table->cur_row))) {
mdb_index_scan_free(table);
return 0;
}
@@ -1008,6 +1008,8 @@ static int trim_trailing_zeros(char * buff, int n)
if (*p == '.')
*p = '\0';
return 0;
}
char *mdb_col_to_string(MdbHandle *mdb, unsigned char *buf, int start, int datatype, int size)
@@ -1037,13 +1039,13 @@ double td;
return text;
break;
case MDB_FLOAT:
tf = mdb_get_single(mdb, start);
tf = mdb_get_single(mdb->pg_buf, start);
n = sprintf(text,"%.*f",FLT_DIG - (int)ceil(log10(tf)), tf);
trim_trailing_zeros(text, n);
return text;
break;
case MDB_DOUBLE:
td = mdb_get_double(mdb, start);
td = mdb_get_double(mdb->pg_buf, start);
n = sprintf(text,"%.*f",DBL_DIG - (int)ceil(log10(td)), td);
trim_trailing_zeros(text, n);
return text;

2
src/libmdb/index.c
View File

@@ -222,6 +222,7 @@ mdb_index_cache_sarg(MdbColumn *col, MdbSarg *sarg, MdbSarg *idx_sarg)
break;
}
}
#if 0
int
mdb_index_test_sarg(MdbHandle *mdb, MdbColumn *col, MdbSarg *sarg, int offset, int len)
{
@@ -249,6 +250,7 @@ int lastchar;
}
return 1;
}
#endif
int
mdb_index_test_sargs(MdbHandle *mdb, MdbIndex *idx, int offset, int len)
{

15
src/libmdb/write.c
View File

@@ -306,8 +306,10 @@ mdb_update_indexes(MdbTableDef *table, int num_fields, MdbField *fields)
mdb_update_index(table, idx, num_fields, fields);
}
}
return 1;
}
int
mdb_init_index_chain(MdbTableDef *table, MdbIndex *idx)
{
MdbCatalogEntry *entry = table->entry;
@@ -317,6 +319,8 @@ mdb_init_index_chain(MdbTableDef *table, MdbIndex *idx)
table->chain = g_malloc0(sizeof(MdbIndexChain));
table->mdbidx = mdb_clone_handle(mdb);
mdb_read_pg(table->mdbidx, table->scan_idx->first_pg);
return 1;
}
int
mdb_update_index(MdbTableDef *table, MdbIndex *idx, int num_fields, MdbField *fields)
@@ -342,18 +346,19 @@ mdb_update_index(MdbTableDef *table, MdbIndex *idx, int num_fields, MdbField *fi
fields[i].siz);
}
//mdb_find_leaf_pg();
return 1;
}
int
mdb_insert_row(MdbTableDef *table, int num_fields, MdbField *fields)
{
int new_row_size, num_rows, i, pos, row_start, row_end, row_size;
int new_row_size;
unsigned char row_buffer[4096];
MdbCatalogEntry *entry = table->entry;
MdbHandle *mdb = entry->mdb;
MdbFormatConstants *fmt = mdb->fmt;
guint32 pgnum;
unsigned char *new_pg;
if (!mdb->f->writable) {
fprintf(stderr, "File is not open for writing\n");
@@ -382,6 +387,8 @@ mdb_insert_row(MdbTableDef *table, int num_fields, MdbField *fields)
}
mdb_update_indexes(table, num_fields, fields);
return 1;
}
/*
* Assumes caller has verfied space is available on page and adds the new
@@ -463,7 +470,7 @@ int old_row_size, new_row_size, delta, num_fields;
return 0;
}
}
num_fields = mdb_crack_row(table, row_start, row_end, &fields);
num_fields = mdb_crack_row(table, row_start, row_end, fields);
#if MDB_DEBUG_WRITE
for (i=0;i<num_fields;i++) {
@@ -479,7 +486,7 @@ int old_row_size, new_row_size, delta, num_fields;
}
}
new_row_size = mdb_pack_row(table, row_buffer, num_fields, &fields);
new_row_size = mdb_pack_row(table, row_buffer, num_fields, fields);
#if MDB_DEBUG_WRITE
buffer_dump(row_buffer, 0, new_row_size-1);
#endif