Fix it up

git-svn-id: file:///svn/tokudb@1253 c7de825b-a66e-492c-adef-691d508d4ae1

buildheader/db.h_4_4

@@ -125,29 +125,29 @@ struct __toku_db_env {
   int  (*set_data_dir) (DB_ENV *, const char *); /* 32-bit offset=720 size=4, 64=bit offset=1312 size=8 */
   void* __toku_dummy11[1];
   void (*set_errcall) (DB_ENV *, void (*)(const char *, char *)); /* 32-bit offset=728 size=4, 64=bit offset=1328 size=8 */
-  void* __toku_dummy12[1];
+  FILE*set_errfile; /* 32-bit offset=732 size=4, 64=bit offset=1336 size=8 */
   void (*set_errpfx) (DB_ENV *, const char *); /* 32-bit offset=736 size=4, 64=bit offset=1344 size=8 */
-  void* __toku_dummy13[1];
+  void* __toku_dummy12[1];
   int  (*set_flags) (DB_ENV *, u_int32_t, int); /* 32-bit offset=744 size=4, 64=bit offset=1360 size=8 */
-  void* __toku_dummy14[2];
+  void* __toku_dummy13[2];
   int  (*set_lg_bsize) (DB_ENV *, u_int32_t); /* 32-bit offset=756 size=4, 64=bit offset=1384 size=8 */
   int  (*set_lg_dir) (DB_ENV *, const char *); /* 32-bit offset=760 size=4, 64=bit offset=1392 size=8 */
-  void* __toku_dummy15[1];
+  void* __toku_dummy14[1];
   int  (*set_lg_max) (DB_ENV *, u_int32_t); /* 32-bit offset=768 size=4, 64=bit offset=1408 size=8 */
-  void* __toku_dummy16[2];
+  void* __toku_dummy15[2];
   int  (*set_lk_detect) (DB_ENV *, u_int32_t); /* 32-bit offset=780 size=4, 64=bit offset=1432 size=8 */
   int  (*set_lk_max) (DB_ENV *, u_int32_t); /* 32-bit offset=784 size=4, 64=bit offset=1440 size=8 */
-  void* __toku_dummy17[18];
+  void* __toku_dummy16[18];
   int  (*set_tmp_dir) (DB_ENV *, const char *); /* 32-bit offset=860 size=4, 64=bit offset=1592 size=8 */
-  void* __toku_dummy18[2];
+  void* __toku_dummy17[2];
   int  (*set_verbose) (DB_ENV *, u_int32_t, int); /* 32-bit offset=872 size=4, 64=bit offset=1616 size=8 */
-  void* __toku_dummy19[1];
+  void* __toku_dummy18[1];
   int  (*txn_begin) (DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t); /* 32-bit offset=880 size=4, 64=bit offset=1632 size=8 */
   int  (*txn_checkpoint) (DB_ENV *, u_int32_t, u_int32_t, u_int32_t); /* 32-bit offset=884 size=4, 64=bit offset=1640 size=8 */
-  void* __toku_dummy20[1];
+  void* __toku_dummy19[1];
   int  (*txn_stat) (DB_ENV *, DB_TXN_STAT **, u_int32_t); /* 32-bit offset=892 size=4, 64=bit offset=1656 size=8 */
-  void* __toku_dummy21[2]; /* Padding at the end */ 
-  char __toku_dummy22[16];  /* Padding at the end */ 
+  void* __toku_dummy20[2]; /* Padding at the end */ 
+  char __toku_dummy21[16];  /* Padding at the end */ 
 };
 struct __toku_db_key_range {
   double less; /* 32-bit offset=0 size=8, 64=bit offset=0 size=8 */

buildheader/sample_offsets.c

@@ -81,7 +81,7 @@ void sample_db_env_offsets (void) {
     STRUCT_SETUP(DB_ENV, set_cachesize, "int  (*%s) (DB_ENV *, u_int32_t, u_int32_t, int)");
     STRUCT_SETUP(DB_ENV, set_data_dir, "int  (*%s) (DB_ENV *, const char *)");
     STRUCT_SETUP(DB_ENV, set_errcall, "void (*%s) (DB_ENV *, void (*)(const char *, char *))");
-    STRUCT_SETUP(DB_ENV, set_errfile, "FILE*%s");
+    STRUCT_SETUP(DB_ENV, set_errfile, "void (*%s) (DB_ENV *, FILE*)");
     STRUCT_SETUP(DB_ENV, set_errpfx, "void (*%s) (DB_ENV *, const char *)");
     STRUCT_SETUP(DB_ENV, set_flags, "int  (*%s) (DB_ENV *, u_int32_t, int)");
     STRUCT_SETUP(DB_ENV, set_lg_bsize, "int  (*%s) (DB_ENV *, u_int32_t)");

buildheader/sample_offsets_32_4_1.h

@@ -15,7 +15,7 @@ struct fieldinfo db_env_fields32[] = {
   {"int  (*open) (DB_ENV *, const char *, u_int32_t, int)", 264, 4},
   {"int  (*set_data_dir) (DB_ENV *, const char *)", 272, 4},
   {"void (*set_errcall) (DB_ENV *, void (*)(const char *, char *))", 288, 4},
-  {"FILE*set_errfile", 292, 4},
+  {"void (*set_errfile) (DB_ENV *, FILE*)", 292, 4},
   {"void (*set_errpfx) (DB_ENV *, const char *)", 296, 4},
   {"int  (*set_flags) (DB_ENV *, u_int32_t, int)", 304, 4},
   {"int  (*set_tmp_dir) (DB_ENV *, const char *)", 324, 4},

buildheader/sample_offsets_32_4_3.h

@@ -15,7 +15,7 @@ struct fieldinfo db_env_fields32[] = {
   {"int  (*open) (DB_ENV *, const char *, u_int32_t, int)", 296, 4},
   {"int  (*set_data_dir) (DB_ENV *, const char *)", 336, 4},
   {"void (*set_errcall) (DB_ENV *, void (*)(const char *, char *))", 348, 4},
-  {"FILE*set_errfile", 356, 4},
+  {"void (*set_errfile) (DB_ENV *, FILE*)", 356, 4},
   {"void (*set_errpfx) (DB_ENV *, const char *)", 364, 4},
   {"int (*get_flags) (DB_ENV *, u_int32_t *)", 372, 4},
   {"int  (*set_flags) (DB_ENV *, u_int32_t, int)", 376, 4},

buildheader/sample_offsets_32_4_4.h

@@ -20,7 +20,7 @@ struct fieldinfo db_env_fields32[] = {
   {"int  (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int)", 716, 4},
   {"int  (*set_data_dir) (DB_ENV *, const char *)", 720, 4},
   {"void (*set_errcall) (DB_ENV *, void (*)(const char *, char *))", 728, 4},
-  {"FILE*set_errfile", 732, 4},
+  {"void (*set_errfile) (DB_ENV *, FILE*)", 732, 4},
   {"void (*set_errpfx) (DB_ENV *, const char *)", 736, 4},
   {"int  (*set_flags) (DB_ENV *, u_int32_t, int)", 744, 4},
   {"int  (*set_lg_bsize) (DB_ENV *, u_int32_t)", 756, 4},

buildheader/sample_offsets_32_4_5.h

@@ -20,7 +20,7 @@ struct fieldinfo db_env_fields32[] = {
   {"int  (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int)", 776, 4},
   {"int  (*set_data_dir) (DB_ENV *, const char *)", 780, 4},
   {"void (*set_errcall) (DB_ENV *, void (*)(const char *, char *))", 788, 4},
-  {"FILE*set_errfile", 792, 4},
+  {"void (*set_errfile) (DB_ENV *, FILE*)", 792, 4},
   {"void (*set_errpfx) (DB_ENV *, const char *)", 796, 4},
   {"int  (*set_flags) (DB_ENV *, u_int32_t, int)", 808, 4},
   {"int  (*set_lg_bsize) (DB_ENV *, u_int32_t)", 820, 4},

buildheader/sample_offsets_32_4_6.h

@@ -20,7 +20,7 @@ struct fieldinfo db_env_fields32[] = {
   {"int  (*set_cachesize) (DB_ENV *, u_int32_t, u_int32_t, int)", 816, 4},
   {"int  (*set_data_dir) (DB_ENV *, const char *)", 824, 4},
   {"void (*set_errcall) (DB_ENV *, void (*)(const char *, char *))", 832, 4},
-  {"FILE*set_errfile", 836, 4},
+  {"void (*set_errfile) (DB_ENV *, FILE*)", 836, 4},
   {"void (*set_errpfx) (DB_ENV *, const char *)", 840, 4},
   {"int  (*set_flags) (DB_ENV *, u_int32_t, int)", 852, 4},
   {"int  (*set_lg_bsize) (DB_ENV *, u_int32_t)", 864, 4},