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 'master' into backend-thread-safety

Browse Source
This commit is contained in:
Evan Miller
2020-08-20 15:22:52 -04:00
parent 452cd29343 0f017883f6
commit b36f2bff1d
24 changed files with 0 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libmdb/catalog.c
View File

@@ -18,10 +18,6 @@
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
char * char *
mdb_get_objtype_string(int obj_type) mdb_get_objtype_string(int obj_type)
{ {

4
src/libmdb/data.c
View File

@@ -21,10 +21,6 @@
#include <math.h> #include <math.h>
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
#define OFFSET_MASK 0x1fff #define OFFSET_MASK 0x1fff
char *mdb_money_to_string(MdbHandle *mdb, int start); char *mdb_money_to_string(MdbHandle *mdb, int start);

4
src/libmdb/dump.c
View File

@@ -21,10 +21,6 @@
#include <stdio.h> #include <stdio.h>
#include <inttypes.h> #include <inttypes.h>
#ifdef DMALLOC
#include "dmalloc.h"
#endif
void mdb_buffer_dump(const void* buf, off_t start, size_t len) void mdb_buffer_dump(const void* buf, off_t start, size_t len)
{ {
char asc[20]; char asc[20];

4
src/libmdb/file.c
View File

@@ -19,10 +19,6 @@
#include <inttypes.h> #include <inttypes.h>
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
/* /*
typedef struct { typedef struct {
int pg_size; int pg_size;

4
src/libmdb/iconv.c
View File

@@ -19,10 +19,6 @@
#include <errno.h> #include <errno.h>
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
#ifndef MIN #ifndef MIN
#define MIN(a,b) (a>b ? b : a) #define MIN(a,b) (a>b ? b : a)
#endif #endif

4
src/libmdb/index.c
View File

@@ -21,10 +21,6 @@
#include <mswstr/mswstr.h> #include <mswstr/mswstr.h>
#endif #endif
#ifdef DMALLOC
#include "dmalloc.h"
#endif
MdbIndexPage *mdb_index_read_bottom_pg(MdbHandle *mdb, MdbIndex *idx, MdbIndexChain *chain); MdbIndexPage *mdb_index_read_bottom_pg(MdbHandle *mdb, MdbIndex *idx, MdbIndexChain *chain);
MdbIndexPage *mdb_chain_add_page(MdbHandle *mdb, MdbIndexChain *chain, guint32 pg); MdbIndexPage *mdb_chain_add_page(MdbHandle *mdb, MdbIndexChain *chain, guint32 pg);

4
src/libmdb/like.c
View File

@@ -20,10 +20,6 @@
#include <string.h> #include <string.h>
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
/** /**
* mdb_like_cmp * mdb_like_cmp
* @s: String to search within. * @s: String to search within.

4
src/libmdb/map.c
View File

@@ -18,10 +18,6 @@
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
static gint32 static gint32
mdb_map_find_next0(MdbHandle *mdb, unsigned char *map, unsigned int map_sz, guint32 start_pg) mdb_map_find_next0(MdbHandle *mdb, unsigned char *map, unsigned int map_sz, guint32 start_pg)
{ {

4
src/libmdb/money.c
View File

@@ -19,10 +19,6 @@
#include <stdio.h> #include <stdio.h>
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
#define MAX_MONEY_PRECISION 20 #define MAX_MONEY_PRECISION 20
#define MAX_NUMERIC_PRECISION 40 #define MAX_NUMERIC_PRECISION 40
/* /*

4
src/libmdb/options.c
View File

@@ -22,10 +22,6 @@
#include <stdlib.h> #include <stdlib.h>
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
#define DEBUG 1 #define DEBUG 1
static unsigned long opts; static unsigned long opts;

3
src/libmdb/sargs.c
View File

@@ -29,9 +29,6 @@
#include <time.h> #include <time.h>
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
void void
mdb_sql_walk_tree(MdbSargNode *node, MdbSargTreeFunc func, gpointer data) mdb_sql_walk_tree(MdbSargNode *node, MdbSargTreeFunc func, gpointer data)

4
src/libmdb/stats.c
View File

@@ -18,10 +18,6 @@
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
/** /**
* mdb_stats_on: * mdb_stats_on:
* @mdb: Handle to the (open) MDB file to collect stats on. * @mdb: Handle to the (open) MDB file to collect stats on.

5
src/libmdb/table.c
View File

@@ -18,11 +18,6 @@
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#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)

4
src/libmdb/worktable.c
View File

@@ -18,10 +18,6 @@
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
/* /*
* Temp table routines. These are currently used to generate mock results for * Temp table routines. These are currently used to generate mock results for
* commands like "list tables" and "describe table" * commands like "list tables" and "describe table"

5
src/libmdb/write.c
View File

@@ -21,11 +21,6 @@
#include <inttypes.h> #include <inttypes.h>
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
//static int mdb_copy_index_pg(MdbTableDef *table, MdbIndex *idx, MdbIndexPage *ipg); //static int mdb_copy_index_pg(MdbTableDef *table, MdbIndex *idx, MdbIndexPage *ipg);
static int mdb_add_row_to_leaf_pg(MdbTableDef *table, MdbIndex *idx, MdbIndexPage *ipg, MdbField *idx_fields, guint32 pgnum, guint16 rownum); static int mdb_add_row_to_leaf_pg(MdbTableDef *table, MdbIndex *idx, MdbIndexPage *ipg, MdbField *idx_fields, guint32 pgnum, guint16 rownum);

4
src/sql/mdbsql.c
View File

@@ -20,10 +20,6 @@
#define _XOPEN_SOURCE #define _XOPEN_SOURCE
#include "mdbsql.h" #include "mdbsql.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
#ifdef HAVE_WORDEXP_H #ifdef HAVE_WORDEXP_H
#define HAVE_WORDEXP #define HAVE_WORDEXP
#include <wordexp.h> #include <wordexp.h>

4
src/util/mdb-array.c
View File

@@ -21,10 +21,6 @@
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {

4
src/util/mdb-export.c
View File

@@ -18,10 +18,6 @@
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
#undef MDB_BIND_SIZE #undef MDB_BIND_SIZE
#define MDB_BIND_SIZE 200000 #define MDB_BIND_SIZE 200000

4
src/util/mdb-header.c
View File

@@ -22,10 +22,6 @@
#include <string.h> #include <string.h>
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
void copy_header (FILE *f) void copy_header (FILE *f)
{ {
fprintf (f, "/******************************************************************/\n"); fprintf (f, "/******************************************************************/\n");

4
src/util/mdb-parsecsv.c
View File

@@ -24,10 +24,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef DMALLOC
#include "dmalloc.h"
#endif
#define FILENAMESIZE 128 #define FILENAMESIZE 128
#define BUFFERSIZE 4096 #define BUFFERSIZE 4096
#define LF 10 #define LF 10

4
src/util/mdb-schema.c
View File

@@ -19,10 +19,6 @@
/* this utility dumps the schema for an existing database */ /* this utility dumps the schema for an existing database */
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {

4
src/util/mdb-sql.c
View File

@@ -47,10 +47,6 @@ extern void clear_history ();
#include <string.h> #include <string.h>
#include "mdbsql.h" #include "mdbsql.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
void dump_results(FILE *out, MdbSQL *sql, char *delimiter); void dump_results(FILE *out, MdbSQL *sql, char *delimiter);
void dump_results_pp(FILE *out, MdbSQL *sql); void dump_results_pp(FILE *out, MdbSQL *sql);

4
src/util/mdb-tables.c
View File

@@ -20,10 +20,6 @@
#include "mdbtools.h" #include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
struct type_struct { struct type_struct {
char *name; char *name;
int value; int value;

4
src/util/mdb-ver.c
View File

@@ -21,10 +21,6 @@
#include "mdbver.h" #include "mdbver.h"
#include "mdbprivate.h" #include "mdbprivate.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {