lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-04-05 20:31:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug in column name ordering

Browse Source
This commit is contained in:
whydoubt 2004-06-15 04:12:36 +00:00
parent 2dd710e5c4
commit 12ba2ed72f
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
Mon Jun 14 22:52:00 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/table.c: Fix bug in column name ordering
Mon Jun 14 07:12:37 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/table.c: Make better use of read_pg_if_n

22
src/libmdb/table.c
View File

@ -24,11 +24,11 @@
#endif
static gint mdb_col_comparer(MdbColumn *a, MdbColumn *b)
static gint mdb_col_comparer(MdbColumn **a, MdbColumn **b)
{
if (a->col_num > b->col_num)
if ((*a)->col_num > (*b)->col_num)
return 1;
else if (a->col_num < b->col_num)
else if ((*a)->col_num < (*b)->col_num)
return -1;
else
return 0;
@ -162,7 +162,6 @@ GPtrArray *mdb_read_columns(MdbTableDef *table)
MdbColumn *pcol;
unsigned char *col;
int i, cur_pos, name_sz;
GSList *slist = NULL;
table->columns = g_ptr_array_new();
@ -220,17 +219,16 @@ GPtrArray *mdb_read_columns(MdbTableDef *table)
pcol->col_size=0;
}
slist = g_slist_insert_sorted(slist,pcol,(GCompareFunc)mdb_col_comparer);
g_ptr_array_add(table->columns, pcol);
}
g_free (col);
/*
** column names
** column names - ordered the same as the column attributes table
*/
for (i=0;i<table->num_cols;i++) {
/* fetch the column */
pcol = g_slist_nth_data (slist, i);
pcol = g_ptr_array_index(table->columns, i);
if (IS_JET4(mdb)) {
char *tmp_buf;
@ -252,13 +250,9 @@ GPtrArray *mdb_read_columns(MdbTableDef *table)
fprintf(stderr,"Unknown MDB version\n");
}
}
/* turn this list into an array */
for (i=0;i<table->num_cols;i++) {
pcol = g_slist_nth_data (slist, i);
g_ptr_array_add(table->columns, pcol);
}
g_slist_free(slist);
/* Sort the columns by col_num */
g_ptr_array_sort(table->columns, (GCompareFunc)mdb_col_comparer);
table->index_start = cur_pos;
return table->columns;