lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-09-19 18:47:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Warnings fixes

Browse Source
This commit is contained in:
whydoubt
2004-07-17 14:21:43 +00:00
parent 4a245f2af7
commit 4cc424f913
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
Sat Jul 17 09:21:13 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* include/mdbtools.h:
* src/libmdb/index.c:
* src/libmdb/write.c:
* src/util/prindex.c: Warnings fixes
Sat Jul 17 02:47:16 CDT 2004 Jeff Smith <whydoubt@yahoo.com> Sat Jul 17 02:47:16 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* include/mdbtools.h: * include/mdbtools.h:
* src/libmdb/data.c: * src/libmdb/data.c:

6
include/mdbtools.h
View File

@@ -260,7 +260,7 @@ typedef struct {
void *bind_ptr; void *bind_ptr;
int *len_ptr; int *len_ptr;
GHashTable *properties; GHashTable *properties;
int num_sargs; unsigned int num_sargs;
GPtrArray *sargs; GPtrArray *sargs;
GPtrArray *idx_sarg_cache; GPtrArray *idx_sarg_cache;
unsigned char is_fixed; unsigned char is_fixed;
@@ -353,7 +353,7 @@ struct mdbindex {
unsigned char index_type; unsigned char index_type;
guint32 first_pg; guint32 first_pg;
int num_rows; /* number rows in index */ int num_rows; /* number rows in index */
int num_keys; unsigned int num_keys;
short key_col_num[MDB_MAX_IDX_COLS]; short key_col_num[MDB_MAX_IDX_COLS];
unsigned char key_col_order[MDB_MAX_IDX_COLS]; unsigned char key_col_order[MDB_MAX_IDX_COLS];
unsigned char flags; unsigned char flags;
@@ -495,7 +495,7 @@ extern int mdb_like_cmp(char *s, char *r);
/* write.c */ /* write.c */
extern int mdb_crack_row(MdbTableDef *table, int row_start, int row_end, MdbField *fields); extern int mdb_crack_row(MdbTableDef *table, int row_start, int row_end, MdbField *fields);
extern guint16 mdb_add_row_to_pg(MdbTableDef *table, unsigned char *row_buffer, int new_row_size); extern guint16 mdb_add_row_to_pg(MdbTableDef *table, unsigned char *row_buffer, int new_row_size);
extern int mdb_update_index(MdbTableDef *table, MdbIndex *idx, int num_fields, MdbField *fields, guint32 pgnum, guint16 rownum); extern int mdb_update_index(MdbTableDef *table, MdbIndex *idx, unsigned int num_fields, MdbField *fields, guint32 pgnum, guint16 rownum);
extern int mdb_pack_row(MdbTableDef *table, unsigned char *row_buffer, unsigned int num_fields, MdbField *fields); extern int mdb_pack_row(MdbTableDef *table, unsigned char *row_buffer, unsigned int num_fields, MdbField *fields);
extern int mdb_replace_row(MdbTableDef *table, int row, unsigned char *new_row, int new_row_size); extern int mdb_replace_row(MdbTableDef *table, int row, unsigned char *new_row, int new_row_size);
extern int mdb_pg_get_freespace(MdbHandle *mdb); extern int mdb_pg_get_freespace(MdbHandle *mdb);

8
src/libmdb/index.c
View File

@@ -247,7 +247,7 @@ int lastchar;
int int
mdb_index_test_sargs(MdbHandle *mdb, MdbIndex *idx, unsigned char *buf, int len) mdb_index_test_sargs(MdbHandle *mdb, MdbIndex *idx, unsigned char *buf, int len)
{ {
int i, j; unsigned int i, j;
MdbColumn *col; MdbColumn *col;
MdbTableDef *table = idx->table; MdbTableDef *table = idx->table;
MdbSarg *idx_sarg; MdbSarg *idx_sarg;
@@ -686,7 +686,7 @@ MdbHandle *mdb = table->entry->mdb;
int cur_pos = 0; int cur_pos = 0;
unsigned char marker; unsigned char marker;
MdbColumn *col; MdbColumn *col;
int i; unsigned int i;
if (idx->num_keys!=1) return; if (idx->num_keys!=1) return;
@@ -702,7 +702,7 @@ int i;
void void
mdb_index_dump(MdbTableDef *table, MdbIndex *idx) mdb_index_dump(MdbTableDef *table, MdbIndex *idx)
{ {
int i; unsigned int i;
MdbColumn *col; MdbColumn *col;
fprintf(stdout,"index number %d\n", idx->index_num); fprintf(stdout,"index number %d\n", idx->index_num);
@@ -731,7 +731,7 @@ mdb_index_dump(MdbTableDef *table, MdbIndex *idx)
*/ */
int mdb_index_compute_cost(MdbTableDef *table, MdbIndex *idx) int mdb_index_compute_cost(MdbTableDef *table, MdbIndex *idx)
{ {
int i; unsigned int i;
MdbColumn *col; MdbColumn *col;
MdbSarg *sarg = NULL; MdbSarg *sarg = NULL;
int not_all_equal = 0; int not_all_equal = 0;

4
src/libmdb/write.c
View File

@@ -609,12 +609,12 @@ mdb_init_index_chain(MdbTableDef *table, MdbIndex *idx)
} }
int int
mdb_update_index(MdbTableDef *table, MdbIndex *idx, int num_fields, MdbField *fields, guint32 pgnum, guint16 rownum) mdb_update_index(MdbTableDef *table, MdbIndex *idx, unsigned int num_fields, MdbField *fields, guint32 pgnum, guint16 rownum)
{ {
MdbCatalogEntry *entry = table->entry; MdbCatalogEntry *entry = table->entry;
MdbHandle *mdb = entry->mdb; MdbHandle *mdb = entry->mdb;
int idx_xref[16]; int idx_xref[16];
int i, j; unsigned int i, j;
MdbIndexChain *chain; MdbIndexChain *chain;
MdbField idx_fields[10]; MdbField idx_fields[10];

2
src/util/prindex.c
View File

@@ -80,7 +80,7 @@ void check_row(MdbHandle *mdb, MdbIndex *idx, guint32 pg, int row, unsigned char
{ {
MdbField fields[256]; MdbField fields[256];
MdbFormatConstants *fmt; MdbFormatConstants *fmt;
int num_fields, i, j; unsigned int num_fields, i, j;
int row_start, row_end; int row_start, row_end;
MdbColumn *col; MdbColumn *col;
guchar buf[256], key[256]; guchar buf[256], key[256];