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

Fixed some compiler warnings in prindex

Browse Source 
Warn and continue if the field referenced by an index can't be found

Removed obsolete args from check_row
This commit is contained in:
Jean-Michel Vourgère
2012-07-02 14:48:34 +02:00
parent 8becb3fa6d
commit 9c74aae165
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/prindex.c
View File

@@ -74,7 +74,7 @@ page_name(int page_type)
default: return "Unknown"; default: return "Unknown";
} }
} }
void check_row(MdbHandle *mdb, MdbIndex *idx, guint32 pg, int row, unsigned char *idxrow, int len) void check_row(MdbHandle *mdb, MdbIndex *idx, guint32 pg, int row)
{ {
MdbField fields[256]; MdbField fields[256];
unsigned int num_fields, i, j; unsigned int num_fields, i, j;
@@ -101,6 +101,10 @@ void check_row(MdbHandle *mdb, MdbIndex *idx, guint32 pg, int row, unsigned char
break; break;
} }
} }
if (j==num_fields) {
fprintf(stderr, "ERROR Lost field #%d\n", idx->key_col_num[i]);
continue;
}
//j = idx->key_col_num[i]; //j = idx->key_col_num[i];
strncpy(buf, fields[elem].value, fields[elem].siz); strncpy(buf, fields[elem].value, fields[elem].siz);
buf[fields[elem].siz]=0; buf[fields[elem].siz]=0;
@@ -113,7 +117,6 @@ void check_row(MdbHandle *mdb, MdbIndex *idx, guint32 pg, int row, unsigned char
void void
walk_index(MdbHandle *mdb, MdbIndex *idx) walk_index(MdbHandle *mdb, MdbIndex *idx)
{ {
int start, len;
guint32 pg; guint32 pg;
guint16 row; guint16 row;
MdbHandle *mdbidx; MdbHandle *mdbidx;
@@ -139,7 +142,7 @@ walk_index(MdbHandle *mdb, MdbIndex *idx)
//printf("page type %02x %s\n", mdbidx->pg_buf[0], page_name(mdbidx->pg_buf[0])); //printf("page type %02x %s\n", mdbidx->pg_buf[0], page_name(mdbidx->pg_buf[0]));
while (mdb_index_find_next(mdbidx, idx, &chain, &pg, &row)) { while (mdb_index_find_next(mdbidx, idx, &chain, &pg, &row)) {
printf("row = %d pg = %lu\n", row, (long unsigned) pg); printf("row = %d pg = %lu\n", row, (long unsigned) pg);
check_row(mdb, idx, pg, row, &mdbidx->pg_buf[start], len - 4); check_row(mdb, idx, pg, row);
} }
mdb_close(mdbidx); mdb_close(mdbidx);
} }