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

Merge branch 'dev' of github.com:mdbtools/mdbtools into dev

Browse Source
This commit is contained in:
Evan Miller
2020-10-18 17:16:11 -04:00
parent 0e3110b925 1efb1054d3
commit d2acba6010
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -181,9 +181,7 @@ fi
if test "x$HAVE_ODBC" = "xtrue"; then if test "x$HAVE_ODBC" = "xtrue"; then
if test "x$sql" != "xtrue" ; then if test "x$sql" != "xtrue" ; then
echo AC_MSG_ERROR([ODBC requires flex and bison for the SQL engine])
echo ODBC requires flex and bison for the SQL engine
exit 1
fi fi
AC_SUBST(ODBC_CFLAGS) AC_SUBST(ODBC_CFLAGS)

4
include/Makefile.am
View File

@@ -1,5 +1,5 @@
include_HEADERS = mdbtools.h mdbsql.h mdbver.h include_HEADERS = mdbtools.h mdbsql.h
if FAKE_GLIB if FAKE_GLIB
include_HEADERS += mdbfakeglib.h include_HEADERS += mdbfakeglib.h
endif endif
noinst_HEADERS = mdbprivate.h noinst_HEADERS = mdbprivate.h mdbver.h

13
src/libmdb/index.c
View File

@@ -21,8 +21,8 @@
#include <mswstr/mswstr.h> #include <mswstr/mswstr.h>
#endif #endif
MdbIndexPage *mdb_index_read_bottom_pg(MdbHandle *mdb, MdbIndex *idx, MdbIndexChain *chain); static MdbIndexPage *mdb_index_read_bottom_pg(MdbHandle *mdb, MdbIndex *idx, MdbIndexChain *chain);
MdbIndexPage *mdb_chain_add_page(MdbHandle *mdb, MdbIndexChain *chain, guint32 pg); static MdbIndexPage *mdb_chain_add_page(MdbHandle *mdb, MdbIndexChain *chain, guint32 pg);
char idx_to_text[] = { char idx_to_text[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0-7 0x00-0x07 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0-7 0x00-0x07 */
@@ -707,7 +707,8 @@ mdb_find_next_leaf(MdbHandle *mdb, MdbIndex *idx, MdbIndexChain *chain)
* add to the chain and call this function * add to the chain and call this function
* recursively. * recursively.
*/ */
newipg = mdb_chain_add_page(mdb, chain, pg); if (!mdb_chain_add_page(mdb, chain, pg))
break;
newipg = mdb_find_next_leaf(mdb, idx, chain); newipg = mdb_find_next_leaf(mdb, idx, chain);
//printf("returning pg %lu\n",newipg->pg); //printf("returning pg %lu\n",newipg->pg);
return newipg; return newipg;
@@ -716,7 +717,7 @@ mdb_find_next_leaf(MdbHandle *mdb, MdbIndex *idx, MdbIndexChain *chain)
return NULL; return NULL;
} }
MdbIndexPage * static MdbIndexPage *
mdb_chain_add_page(MdbHandle *mdb, MdbIndexChain *chain, guint32 pg) mdb_chain_add_page(MdbHandle *mdb, MdbIndexChain *chain, guint32 pg)
{ {
MdbIndexPage *ipg; MdbIndexPage *ipg;
@@ -724,7 +725,7 @@ mdb_chain_add_page(MdbHandle *mdb, MdbIndexChain *chain, guint32 pg)
chain->cur_depth++; chain->cur_depth++;
if (chain->cur_depth > MDB_MAX_INDEX_DEPTH) { if (chain->cur_depth > MDB_MAX_INDEX_DEPTH) {
fprintf(stderr,"Error! maximum index depth of %d exceeded. This is probably due to a programming bug, If you are confident that your indexes really are this deep, adjust MDB_MAX_INDEX_DEPTH in mdbtools.h and recompile.\n", MDB_MAX_INDEX_DEPTH); fprintf(stderr,"Error! maximum index depth of %d exceeded. This is probably due to a programming bug, If you are confident that your indexes really are this deep, adjust MDB_MAX_INDEX_DEPTH in mdbtools.h and recompile.\n", MDB_MAX_INDEX_DEPTH);
exit(1); return NULL;
} }
ipg = &(chain->pages[chain->cur_depth - 1]); ipg = &(chain->pages[chain->cur_depth - 1]);
mdb_index_page_init(mdb, ipg); mdb_index_page_init(mdb, ipg);
@@ -736,7 +737,7 @@ mdb_chain_add_page(MdbHandle *mdb, MdbIndexChain *chain, guint32 pg)
* returns the bottom page of the IndexChain, if IndexChain is empty it * returns the bottom page of the IndexChain, if IndexChain is empty it
* initializes it by reading idx->first_pg (the root page) * initializes it by reading idx->first_pg (the root page)
*/ */
MdbIndexPage * static MdbIndexPage *
mdb_index_read_bottom_pg(MdbHandle *mdb, MdbIndex *idx, MdbIndexChain *chain) mdb_index_read_bottom_pg(MdbHandle *mdb, MdbIndex *idx, MdbIndexChain *chain)
{ {
MdbIndexPage *ipg; MdbIndexPage *ipg;