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

Replace a few mdb_pg_get_int's with mdb_get_int's

Browse Source
This commit is contained in:
whydoubt
2005-03-22 13:06:57 +00:00
parent a2c849ca8c
commit 30b165938b
5 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,6 +1,10 @@
Tue Mar 22 07:01:37 CST 2005 Jeff Smith <whydoubt@yahoo.com> Tue Mar 22 07:01:37 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* src/extras/mdb-dump.c: * src/extras/mdb-dump.c:
* src/libmdb/data.c: Clean up some warnings * src/libmdb/data.c: Clean up some warnings
* src/libmdb/file.c:
* src/libmdb/kkd.c:
* src/libmdb/table.c:
* src/libmdb/write.c: Replace a few mdb_pg_get_int's with mdb_get_int's
Sat Mar 19 06:34:00 CST 2005 Jeff Smith <whydoubt@yahoo.com> Sat Mar 19 06:34:00 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/Makefile.am: * src/libmdb/Makefile.am:

2
src/libmdb/file.c
View File

@@ -150,7 +150,7 @@ MdbHandle *mdb_open(const char *filename, MdbFileFlags flags)
mdb_close(mdb); mdb_close(mdb);
return NULL; return NULL;
} }
mdb->f->jet_version = mdb_pg_get_int32(mdb, 0x14); mdb->f->jet_version = mdb_get_int32(mdb->pg_buf, 0x14);
if (IS_JET4(mdb)) { if (IS_JET4(mdb)) {
mdb->fmt = &MdbJet4Constants; mdb->fmt = &MdbJet4Constants;
} else if (IS_JET3(mdb)) { } else if (IS_JET3(mdb)) {

10
src/libmdb/kkd.c
View File

@@ -29,7 +29,7 @@
** KKD structures. ** KKD structures.
*/ */
GArray *mdb_get_column_props(MdbCatalogEntry *entry, int start) static GArray *mdb_get_column_props(MdbCatalogEntry *entry, int start)
{ {
int pos, cnt=0; int pos, cnt=0;
int len, tmp, cplen; int len, tmp, cplen;
@@ -53,7 +53,7 @@ MdbHandle *mdb = entry->mdb;
return entry->props; return entry->props;
} }
GHashTable *mdb_get_column_def(MdbCatalogEntry *entry, int start) static GHashTable *mdb_get_column_def(MdbCatalogEntry *entry, int start)
{ {
GHashTable *hash = NULL; GHashTable *hash = NULL;
MdbHandle *mdb = entry->mdb; MdbHandle *mdb = entry->mdb;
@@ -110,13 +110,13 @@ int rowid = entry->kkd_rowid;
mdb_read_pg(mdb, entry->kkd_pg); mdb_read_pg(mdb, entry->kkd_pg);
rows = mdb_pg_get_int16(mdb,8); rows = mdb_get_int16(mdb->pg_buf, 8);
fprintf(stdout,"number of rows = %d\n",rows); fprintf(stdout,"number of rows = %d\n",rows);
kkd_start = mdb_pg_get_int16(mdb,10+rowid*2); kkd_start = mdb_get_int16(mdb->pg_buf, 10+rowid*2);
fprintf(stdout,"kkd start = %d %04x\n",kkd_start,kkd_start); fprintf(stdout,"kkd start = %d %04x\n",kkd_start,kkd_start);
kkd_end = mdb->fmt->pg_size; kkd_end = mdb->fmt->pg_size;
for (i=0;i<rows;i++) { for (i=0;i<rows;i++) {
tmp = mdb_pg_get_int16(mdb, 10+i*2); tmp = mdb_get_int16(mdb->pg_buf, 10+i*2);
if (tmp < mdb->fmt->pg_size && if (tmp < mdb->fmt->pg_size &&
tmp > kkd_start && tmp > kkd_start &&
tmp < kkd_end) { tmp < kkd_end) {

27
src/libmdb/table.c
View File

@@ -77,22 +77,23 @@ MdbTableDef *mdb_read_table(MdbCatalogEntry *entry)
MdbHandle *mdb = entry->mdb; MdbHandle *mdb = entry->mdb;
MdbFormatConstants *fmt = mdb->fmt; MdbFormatConstants *fmt = mdb->fmt;
int len, row_start, pg_row; int len, row_start, pg_row;
char *buf; char *buf, *pg_buf = mdb->pg_buf;
mdb_read_pg(mdb, entry->table_pg); mdb_read_pg(mdb, entry->table_pg);
if (mdb->pg_buf[0] != 0x02) /* not a valid table def page */ if (pg_buf[0] != 0x02) /* not a valid table def page */
return NULL; return NULL;
table = mdb_alloc_tabledef(entry); table = mdb_alloc_tabledef(entry);
len = mdb_pg_get_int16(mdb,8); len = mdb_get_int16(pg_buf, 8);
table->num_rows = mdb_get_int32(pg_buf, fmt->tab_num_rows_offset);
table->num_var_cols = mdb_get_int16(pg_buf, fmt->tab_num_cols_offset-2);
table->num_cols = mdb_get_int16(pg_buf, fmt->tab_num_cols_offset);
table->num_idxs = mdb_get_int32(pg_buf, fmt->tab_num_idxs_offset);
table->num_real_idxs = mdb_get_int32(pg_buf, fmt->tab_num_ridxs_offset);
table->num_rows = mdb_pg_get_int32(mdb, fmt->tab_num_rows_offset);
table->num_var_cols = mdb_pg_get_int16(mdb, fmt->tab_num_cols_offset-2);
table->num_cols = mdb_pg_get_int16(mdb, fmt->tab_num_cols_offset);
table->num_idxs = mdb_pg_get_int32(mdb, fmt->tab_num_idxs_offset);
table->num_real_idxs = mdb_pg_get_int32(mdb, fmt->tab_num_ridxs_offset);
/* grab a copy of the usage map */ /* grab a copy of the usage map */
pg_row = mdb_pg_get_int32(mdb, fmt->tab_usage_map_offset); pg_row = mdb_get_int32(pg_buf, fmt->tab_usage_map_offset);
mdb_find_pg_row(mdb, pg_row, &buf, &row_start, &(table->map_sz)); mdb_find_pg_row(mdb, pg_row, &buf, &row_start, &(table->map_sz));
table->usage_map = g_memdup(buf + row_start, table->map_sz); table->usage_map = g_memdup(buf + row_start, table->map_sz);
if (mdb_get_option(MDB_DEBUG_USAGE)) if (mdb_get_option(MDB_DEBUG_USAGE))
@@ -101,13 +102,13 @@ MdbTableDef *mdb_read_table(MdbCatalogEntry *entry)
pg_row >> 8, pg_row & 0xff, row_start, table->map_sz); pg_row >> 8, pg_row & 0xff, row_start, table->map_sz);
/* grab a copy of the free space page map */ /* grab a copy of the free space page map */
pg_row = mdb_pg_get_int32(mdb, fmt->tab_free_map_offset); pg_row = mdb_get_int32(pg_buf, fmt->tab_free_map_offset);
mdb_find_pg_row(mdb, pg_row, &buf, &row_start, &(table->freemap_sz)); mdb_find_pg_row(mdb, pg_row, &buf, &row_start, &(table->freemap_sz));
table->free_usage_map = g_memdup(buf + row_start, table->freemap_sz); table->free_usage_map = g_memdup(buf + row_start, table->freemap_sz);
mdb_debug(MDB_DEBUG_USAGE,"free map found on page %ld row %d start %d len %d\n", mdb_debug(MDB_DEBUG_USAGE,"free map found on page %ld row %d start %d len %d\n",
pg_row >> 8, pg_row & 0xff, row_start, table->freemap_sz); pg_row >> 8, pg_row & 0xff, row_start, table->freemap_sz);
table->first_data_pg = mdb_pg_get_int16(mdb, fmt->tab_first_dpg_offset); table->first_data_pg = mdb_get_int16(pg_buf, fmt->tab_first_dpg_offset);
return table; return table;
} }
@@ -135,7 +136,7 @@ int
read_pg_if(MdbHandle *mdb, int *cur_pos, int offset) read_pg_if(MdbHandle *mdb, int *cur_pos, int offset)
{ {
if (*cur_pos + offset >= mdb->fmt->pg_size) { if (*cur_pos + offset >= mdb->fmt->pg_size) {
mdb_read_pg(mdb, mdb_pg_get_int32(mdb,4)); mdb_read_pg(mdb, mdb_get_int32(mdb->pg_buf,4));
*cur_pos = 8 - (mdb->fmt->pg_size - (*cur_pos)); *cur_pos = 8 - (mdb->fmt->pg_size - (*cur_pos));
return 1; return 1;
} }
@@ -175,7 +176,7 @@ read_pg_if_n(MdbHandle *mdb, unsigned char *buf, int *cur_pos, int len)
} else { } else {
int half = mdb->fmt->pg_size - *cur_pos; int half = mdb->fmt->pg_size - *cur_pos;
memcpy(buf, &mdb->pg_buf[*cur_pos], half); memcpy(buf, &mdb->pg_buf[*cur_pos], half);
mdb_read_pg(mdb, mdb_pg_get_int32(mdb,4)); mdb_read_pg(mdb, mdb_get_int32(mdb->pg_buf,4));
memcpy(buf + half, &mdb->pg_buf[8], len - half); memcpy(buf + half, &mdb->pg_buf[8], len - half);
*cur_pos = 8 - half; *cur_pos = 8 - half;
return 1; return 1;

14
src/libmdb/write.c
View File

@@ -112,7 +112,7 @@ mdb_crack_row4(MdbHandle *mdb, int row_start, int row_end, unsigned int bitmask_
unsigned int i; unsigned int i;
for (i=0; i<row_var_cols+1; i++) { for (i=0; i<row_var_cols+1; i++) {
var_col_offsets[i] = mdb_pg_get_int16(mdb, var_col_offsets[i] = mdb_get_int16(mdb->pg_buf,
row_end - bitmask_sz - 3 - (i*2)); row_end - bitmask_sz - 3 - (i*2));
} }
} }
@@ -180,7 +180,7 @@ mdb_crack_row(MdbTableDef *table, int row_start, int row_end, MdbField *fields)
} }
if (IS_JET4(mdb)) { if (IS_JET4(mdb)) {
row_cols = mdb_pg_get_int16(mdb, row_start); row_cols = mdb_get_int16(mdb->pg_buf, row_start);
col_count_size = 2; col_count_size = 2;
} else { } else {
row_cols = pg_buf[row_start]; row_cols = pg_buf[row_start];
@@ -192,7 +192,7 @@ mdb_crack_row(MdbTableDef *table, int row_start, int row_end, MdbField *fields)
/* read table of variable column locations */ /* read table of variable column locations */
row_var_cols = IS_JET4(mdb) ? row_var_cols = IS_JET4(mdb) ?
mdb_pg_get_int16(mdb, row_end - bitmask_sz - 1) : mdb_get_int16(mdb->pg_buf, row_end - bitmask_sz - 1) :
pg_buf[row_end - bitmask_sz]; pg_buf[row_end - bitmask_sz];
var_col_offsets = (unsigned int *)g_malloc((row_var_cols+1)*sizeof(int)); var_col_offsets = (unsigned int *)g_malloc((row_var_cols+1)*sizeof(int));
if (table->num_var_cols > 0) { if (table->num_var_cols > 0) {
@@ -434,9 +434,9 @@ mdb_pg_get_freespace(MdbHandle *mdb)
int rows, free_start, free_end; int rows, free_start, free_end;
int row_count_offset = mdb->fmt->row_count_offset; int row_count_offset = mdb->fmt->row_count_offset;
rows = mdb_pg_get_int16(mdb, row_count_offset); rows = mdb_get_int16(mdb->pg_buf, row_count_offset);
free_start = row_count_offset + 2 + (rows * 2); free_start = row_count_offset + 2 + (rows * 2);
free_end = mdb_pg_get_int16(mdb, row_count_offset + (rows * 2)); free_end = mdb_get_int16(mdb->pg_buf, row_count_offset + (rows * 2));
mdb_debug(MDB_DEBUG_WRITE,"free space left on page = %d", free_end - free_start); mdb_debug(MDB_DEBUG_WRITE,"free space left on page = %d", free_end - free_start);
return (free_end - free_start); return (free_end - free_start);
} }
@@ -617,7 +617,7 @@ mdb_add_row_to_pg(MdbTableDef *table, unsigned char *row_buffer, int new_row_siz
} else { /* is not a temp table */ } else { /* is not a temp table */
new_pg = mdb_new_data_pg(entry); new_pg = mdb_new_data_pg(entry);
num_rows = mdb_pg_get_int16(mdb, fmt->row_count_offset); num_rows = mdb_get_int16(mdb->pg_buf, fmt->row_count_offset);
pos = fmt->pg_size; pos = fmt->pg_size;
/* copy existing rows */ /* copy existing rows */
@@ -729,7 +729,7 @@ int i, pos;
mdb_debug(MDB_DEBUG_WRITE,"updating row %d on page %lu", row, (unsigned long) table->cur_phys_pg); mdb_debug(MDB_DEBUG_WRITE,"updating row %d on page %lu", row, (unsigned long) table->cur_phys_pg);
new_pg = mdb_new_data_pg(entry); new_pg = mdb_new_data_pg(entry);
num_rows = mdb_pg_get_int16(mdb, rco); num_rows = mdb_get_int16(mdb->pg_buf, rco);
_mdb_put_int16(new_pg, rco, num_rows); _mdb_put_int16(new_pg, rco, num_rows);
pos = pg_size; pos = pg_size;