[evolution-data-server] Exclude libdb and iconv-detect.c from previous cleanups.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Subject: [evolution-data-server] Exclude libdb and iconv-detect.c from previous cleanups.
- Date: Thu, 28 May 2009 15:30:15 -0400 (EDT)
commit b94fa0212added03de7c4540f16c474b00ddaa01
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu May 28 15:18:40 2009 -0400
Exclude libdb and iconv-detect.c from previous cleanups.
---
iconv-detect.c | 18 +-
libdb/btree/bt_compare.c | 16 +-
libdb/btree/bt_conv.c | 18 +-
libdb/btree/bt_curadj.c | 54 +-
libdb/btree/bt_cursor.c | 126 ++--
libdb/btree/bt_delete.c | 22 +-
libdb/btree/bt_method.c | 46 +-
libdb/btree/bt_open.c | 40 +-
libdb/btree/bt_put.c | 26 +-
libdb/btree/bt_rec.c | 92 ++--
libdb/btree/bt_reclaim.c | 14 +-
libdb/btree/bt_recno.c | 78 +-
libdb/btree/bt_rsearch.c | 22 +-
libdb/btree/bt_search.c | 26 +-
libdb/btree/bt_split.c | 40 +-
libdb/btree/bt_stat.c | 36 +-
libdb/btree/bt_upgrade.c | 32 +-
libdb/btree/bt_verify.c | 110 ++--
libdb/btree/btree_auto.c | 328 ++++----
libdb/build_vxworks/db.h | 478 ++++++------
libdb/build_vxworks/db_archive/db_archive.c | 42 +-
libdb/build_vxworks/db_checkpoint/db_checkpoint.c | 40 +-
libdb/build_vxworks/db_deadlock/db_deadlock.c | 42 +-
libdb/build_vxworks/db_dump/db_dump.c | 88 ++--
libdb/build_vxworks/db_int.h | 4 +-
libdb/build_vxworks/db_load/db_load.c | 142 ++--
libdb/build_vxworks/db_printlog/db_printlog.c | 56 +-
libdb/build_vxworks/db_recover/db_recover.c | 54 +-
libdb/build_vxworks/db_stat/db_stat.c | 134 ++--
libdb/build_vxworks/db_upgrade/db_upgrade.c | 42 +-
libdb/build_vxworks/db_verify/db_verify.c | 44 +-
libdb/build_vxworks/dbdemo/dbdemo.c | 34 +-
libdb/build_win32/db.h | 486 ++++++------
libdb/build_win32/db_config.h | 6 +-
libdb/build_win32/db_cxx.h | 392 +++++-----
libdb/build_win32/db_int.h | 4 +-
libdb/clib/getcwd.c | 16 +-
libdb/clib/getopt.c | 26 +-
libdb/clib/memcmp.c | 12 +-
libdb/clib/memmove.c | 20 +-
libdb/clib/raise.c | 8 +-
libdb/clib/snprintf.c | 18 +-
libdb/clib/strcasecmp.c | 28 +-
libdb/clib/strdup.c | 10 +-
libdb/clib/strerror.c | 18 +-
libdb/clib/vsnprintf.c | 10 +-
libdb/common/db_byteorder.c | 16 +-
libdb/common/db_err.c | 112 ++--
libdb/common/db_getlong.c | 26 +-
libdb/common/db_idspace.c | 12 +-
libdb/common/db_log2.c | 2 +-
libdb/common/util_arg.c | 30 +-
libdb/common/util_cache.c | 12 +-
libdb/common/util_log.c | 10 +-
libdb/common/util_sig.c | 8 +-
libdb/db/crdel_auto.c | 64 +-
libdb/db/crdel_rec.c | 12 +-
libdb/db/db.c | 110 ++--
libdb/db/db_am.c | 86 +-
libdb/db/db_auto.c | 330 ++++----
libdb/db/db_cam.c | 108 ++--
libdb/db/db_conv.c | 24 +-
libdb/db/db_dispatch.c | 174 +++---
libdb/db/db_dup.c | 22 +-
libdb/db/db_iface.c | 118 ++--
libdb/db/db_join.c | 34 +-
libdb/db/db_meta.c | 36 +-
libdb/db/db_method.c | 104 ++--
libdb/db/db_open.c | 70 +-
libdb/db/db_overflow.c | 64 +-
libdb/db/db_pr.c | 116 ++--
libdb/db/db_rec.c | 92 ++--
libdb/db/db_reclaim.c | 34 +-
libdb/db/db_remove.c | 44 +-
libdb/db/db_rename.c | 42 +-
libdb/db/db_ret.c | 24 +-
libdb/db/db_truncate.c | 8 +-
libdb/db/db_upg.c | 36 +-
libdb/db/db_upg_opd.c | 26 +-
libdb/db/db_vrfy.c | 188 +++---
libdb/db/db_vrfyutil.c | 130 ++--
libdb/db185/db185.c | 34 +-
libdb/db_archive/db_archive.c | 34 +-
libdb/db_checkpoint/db_checkpoint.c | 32 +-
libdb/db_deadlock/db_deadlock.c | 34 +-
libdb/db_dump/db_dump.c | 80 +-
libdb/db_dump185/db_dump185.c | 28 +-
libdb/db_load/db_load.c | 134 ++--
libdb/db_printlog/db_printlog.c | 48 +-
libdb/db_recover/db_recover.c | 46 +-
libdb/db_stat/db_stat.c | 126 ++--
libdb/db_upgrade/db_upgrade.c | 34 +-
libdb/db_verify/db_verify.c | 36 +-
libdb/dbinc/btree.h | 2 +-
libdb/dbinc/crypto.h | 6 +-
libdb/dbinc/cxx_except.h | 34 +-
libdb/dbinc/cxx_int.h | 12 +-
libdb/dbinc/db_am.h | 4 +-
libdb/dbinc/db_dispatch.h | 4 +-
libdb/dbinc/db_server_int.h | 12 +-
libdb/dbinc/debug.h | 4 +-
libdb/dbinc/globals.h | 26 +-
libdb/dbinc/hash.h | 2 +-
libdb/dbinc/lock.h | 2 +-
libdb/dbinc/mp.h | 4 +-
libdb/dbinc/mutex.h | 76 +-
libdb/dbinc/qam.h | 10 +-
libdb/dbinc/queue.h | 20 +-
libdb/dbinc/region.h | 2 +-
libdb/dbinc/rep.h | 4 +-
libdb/dbinc/shqueue.h | 16 +-
libdb/dbinc/tcl_db.h | 14 +-
libdb/dbinc/xa.h | 34 +-
libdb/dbinc_auto/btree_ext.h | 230 +++---
libdb/dbinc_auto/clib_ext.h | 24 +-
libdb/dbinc_auto/common_ext.h | 48 +-
libdb/dbinc_auto/crypto_ext.h | 40 +-
libdb/dbinc_auto/db_ext.h | 402 +++++-----
libdb/dbinc_auto/db_server.h | 194 +++---
libdb/dbinc_auto/dbreg_ext.h | 56 +-
libdb/dbinc_auto/env_ext.h | 52 +-
libdb/dbinc_auto/fileops_ext.h | 78 +-
libdb/dbinc_auto/hash_ext.h | 208 +++---
libdb/dbinc_auto/hmac_ext.h | 8 +-
libdb/dbinc_auto/lock_ext.h | 42 +-
libdb/dbinc_auto/log_ext.h | 30 +-
libdb/dbinc_auto/mp_ext.h | 48 +-
libdb/dbinc_auto/mutex_ext.h | 38 +-
libdb/dbinc_auto/os_ext.h | 106 ++--
libdb/dbinc_auto/qam_ext.h | 112 ++--
libdb/dbinc_auto/rep_ext.h | 34 +-
libdb/dbinc_auto/rpc_client_ext.h | 302 ++++----
libdb/dbinc_auto/rpc_server_ext.h | 50 +-
libdb/dbinc_auto/tcl_ext.h | 120 ++--
libdb/dbinc_auto/txn_ext.h | 104 ++--
libdb/dbinc_auto/xa_ext.h | 12 +-
libdb/dbm/dbm.c | 52 +-
libdb/dbreg/dbreg.c | 46 +-
libdb/dbreg/dbreg_auto.c | 66 +-
libdb/dbreg/dbreg_rec.c | 18 +-
libdb/dbreg/dbreg_util.c | 108 ++--
libdb/env/db_salloc.c | 36 +-
libdb/env/db_shash.c | 12 +-
libdb/env/env_file.c | 30 +-
libdb/env/env_method.c | 114 ++--
libdb/env/env_open.c | 98 ++--
libdb/env/env_recover.c | 38 +-
libdb/env/env_region.c | 74 +-
libdb/examples_c/bench_001.c | 40 +-
libdb/examples_c/ex_access.c | 26 +-
libdb/examples_c/ex_apprec/ex_apprec.c | 40 +-
libdb/examples_c/ex_apprec/ex_apprec.h | 14 +-
libdb/examples_c/ex_apprec/ex_apprec_auto.c | 40 +-
libdb/examples_c/ex_apprec/ex_apprec_rec.c | 12 +-
libdb/examples_c/ex_btrec.c | 18 +-
libdb/examples_c/ex_dbclient.c | 42 +-
libdb/examples_c/ex_env.c | 22 +-
libdb/examples_c/ex_lock.c | 34 +-
libdb/examples_c/ex_mpool.c | 64 +-
libdb/examples_c/ex_repquote/ex_repquote.h | 46 +-
libdb/examples_c/ex_repquote/ex_rq_client.c | 48 +-
libdb/examples_c/ex_repquote/ex_rq_main.c | 36 +-
libdb/examples_c/ex_repquote/ex_rq_master.c | 22 +-
libdb/examples_c/ex_repquote/ex_rq_net.c | 116 ++--
libdb/examples_c/ex_repquote/ex_rq_util.c | 74 +-
libdb/examples_c/ex_thread.c | 108 ++--
libdb/examples_c/ex_tpcb.c | 84 +-
libdb/fileops/fileops_auto.c | 210 +++---
libdb/fileops/fop_basic.c | 62 +-
libdb/fileops/fop_rec.c | 72 +-
libdb/fileops/fop_util.c | 90 ++--
libdb/hash/hash.c | 96 ++--
libdb/hash/hash_auto.c | 334 ++++----
libdb/hash/hash_conv.c | 22 +-
libdb/hash/hash_dup.c | 46 +-
libdb/hash/hash_func.c | 24 +-
libdb/hash/hash_meta.c | 18 +-
libdb/hash/hash_method.c | 22 +-
libdb/hash/hash_open.c | 38 +-
libdb/hash/hash_page.c | 110 ++--
libdb/hash/hash_rec.c | 96 ++--
libdb/hash/hash_reclaim.c | 14 +-
libdb/hash/hash_stat.c | 32 +-
libdb/hash/hash_upgrade.c | 40 +-
libdb/hash/hash_verify.c | 66 +-
libdb/hmac/hmac.c | 18 +-
libdb/hmac/sha1.c | 44 +-
libdb/hsearch/hsearch.c | 12 +-
libdb/libdb_java/java_Db.c | 62 +-
libdb/libdb_java/java_DbEnv.c | 100 ++--
libdb/libdb_java/java_DbLock.c | 2 +-
libdb/libdb_java/java_DbLogc.c | 6 +-
libdb/libdb_java/java_DbLsn.c | 2 +-
libdb/libdb_java/java_DbTxn.c | 6 +-
libdb/libdb_java/java_DbUtil.c | 2 +-
libdb/libdb_java/java_DbXAResource.c | 38 +-
libdb/libdb_java/java_Dbc.c | 14 +-
libdb/libdb_java/java_Dbt.c | 4 +-
libdb/libdb_java/java_info.c | 82 +-
libdb/libdb_java/java_info.h | 38 +-
libdb/libdb_java/java_locked.c | 8 +-
libdb/libdb_java/java_locked.h | 12 +-
libdb/libdb_java/java_stat_auto.c | 16 +-
libdb/libdb_java/java_stat_auto.h | 16 +-
libdb/libdb_java/java_util.c | 166 ++--
libdb/libdb_java/java_util.h | 148 ++--
libdb/lock/lock.c | 120 ++--
libdb/lock/lock_deadlock.c | 30 +-
libdb/lock/lock_method.c | 20 +-
libdb/lock/lock_region.c | 22 +-
libdb/lock/lock_stat.c | 22 +-
libdb/lock/lock_util.c | 14 +-
libdb/log/log.c | 78 +-
libdb/log/log_archive.c | 62 +-
libdb/log/log_compare.c | 6 +-
libdb/log/log_get.c | 62 +-
libdb/log/log_method.c | 12 +-
libdb/log/log_put.c | 90 ++--
libdb/mp/mp_alloc.c | 18 +-
libdb/mp/mp_bh.c | 38 +-
libdb/mp/mp_fget.c | 24 +-
libdb/mp/mp_fopen.c | 82 +-
libdb/mp/mp_fput.c | 10 +-
libdb/mp/mp_fset.c | 10 +-
libdb/mp/mp_method.c | 8 +-
libdb/mp/mp_region.c | 36 +-
libdb/mp/mp_register.c | 18 +-
libdb/mp/mp_stat.c | 30 +-
libdb/mp/mp_sync.c | 40 +-
libdb/mp/mp_trickle.c | 10 +-
libdb/mutex/mut_fcntl.c | 20 +-
libdb/mutex/mut_pthread.c | 30 +-
libdb/mutex/mut_tas.c | 20 +-
libdb/mutex/mut_win32.c | 24 +-
libdb/mutex/mutex.c | 24 +-
libdb/mutex/tm.c | 94 ++--
libdb/os/os_abs.c | 8 +-
libdb/os/os_alloc.c | 122 ++--
libdb/os/os_clock.c | 12 +-
libdb/os/os_config.c | 6 +-
libdb/os/os_dir.c | 24 +-
libdb/os/os_errno.c | 12 +-
libdb/os/os_fid.c | 14 +-
libdb/os/os_fsync.c | 20 +-
libdb/os/os_handle.c | 20 +-
libdb/os/os_id.c | 2 +-
libdb/os/os_map.c | 58 +-
libdb/os/os_method.c | 128 ++--
libdb/os/os_oflags.c | 12 +-
libdb/os/os_open.c | 36 +-
libdb/os/os_region.c | 14 +-
libdb/os/os_rename.c | 12 +-
libdb/os/os_root.c | 6 +-
libdb/os/os_rpath.c | 16 +-
libdb/os/os_rw.c | 36 +-
libdb/os/os_seek.c | 10 +-
libdb/os/os_sleep.c | 8 +-
libdb/os/os_spin.c | 10 +-
libdb/os/os_stat.c | 22 +-
libdb/os/os_tmpdir.c | 16 +-
libdb/os/os_unlink.c | 22 +-
libdb/os_vxworks/os_vx_abs.c | 10 +-
libdb/os_vxworks/os_vx_config.c | 6 +-
libdb/os_vxworks/os_vx_map.c | 76 +-
libdb/os_win32/os_abs.c | 6 +-
libdb/os_win32/os_clock.c | 4 +-
libdb/os_win32/os_config.c | 4 +-
libdb/os_win32/os_dir.c | 18 +-
libdb/os_win32/os_errno.c | 12 +-
libdb/os_win32/os_fid.c | 10 +-
libdb/os_win32/os_fsync.c | 8 +-
libdb/os_win32/os_handle.c | 18 +-
libdb/os_win32/os_map.c | 46 +-
libdb/os_win32/os_open.c | 14 +-
libdb/os_win32/os_rename.c | 8 +-
libdb/os_win32/os_rw.c | 36 +-
libdb/os_win32/os_seek.c | 8 +-
libdb/os_win32/os_sleep.c | 4 +-
libdb/os_win32/os_spin.c | 4 +-
libdb/os_win32/os_stat.c | 20 +-
libdb/os_win32/os_type.c | 8 +-
libdb/perl/BerkeleyDB/constants.h | 34 +-
libdb/perl/BerkeleyDB/ppport.h | 34 +-
libdb/perl/DB_File/fallback.h | 14 +-
libdb/perl/DB_File/ppport.h | 34 +-
libdb/perl/DB_File/version.c | 4 +-
libdb/qam/qam.c | 74 +-
libdb/qam/qam_auto.c | 196 +++---
libdb/qam/qam_conv.c | 12 +-
libdb/qam/qam_files.c | 56 +-
libdb/qam/qam_method.c | 48 +-
libdb/qam/qam_open.c | 34 +-
libdb/qam/qam_rec.c | 52 +-
libdb/qam/qam_stat.c | 10 +-
libdb/qam/qam_upgrade.c | 14 +-
libdb/qam/qam_verify.c | 18 +-
libdb/rep/rep_method.c | 70 +-
libdb/rep/rep_record.c | 38 +-
libdb/rep/rep_region.c | 26 +-
libdb/rep/rep_util.c | 94 ++--
libdb/rpc_client/client.c | 80 +-
libdb/rpc_client/db_server_clnt.c | 100 ++--
libdb/rpc_client/gen_client.c | 842 ++++++++++----------
libdb/rpc_client/gen_client_ret.c | 178 +++---
libdb/rpc_server/c/db_server_proc.c | 232 +++---
libdb/rpc_server/c/db_server_svc.c | 112 ++--
libdb/rpc_server/c/db_server_util.c | 82 +-
libdb/rpc_server/c/db_server_xdr.c | 64 +-
libdb/rpc_server/c/gen_db_server.c | 32 +-
libdb/tcl/tcl_compat.c | 68 +-
libdb/tcl/tcl_db.c | 132 ++--
libdb/tcl/tcl_db_pkg.c | 126 ++--
libdb/tcl/tcl_dbcursor.c | 46 +-
libdb/tcl/tcl_env.c | 78 +-
libdb/tcl/tcl_internal.c | 160 ++--
libdb/tcl/tcl_lock.c | 82 +-
libdb/tcl/tcl_log.c | 86 +-
libdb/tcl/tcl_mp.c | 116 ++--
libdb/tcl/tcl_rep.c | 68 +-
libdb/tcl/tcl_txn.c | 68 +-
libdb/tcl/tcl_util.c | 34 +-
libdb/test/scr017/t.c | 20 +-
libdb/test/scr018/t.c | 12 +-
libdb/txn/txn.c | 106 ++--
libdb/txn/txn_auto.c | 202 +++---
libdb/txn/txn_method.c | 6 +-
libdb/txn/txn_rec.c | 58 +-
libdb/txn/txn_recover.c | 18 +-
libdb/txn/txn_region.c | 28 +-
libdb/txn/txn_stat.c | 8 +-
libdb/txn/txn_util.c | 28 +-
libdb/xa/xa.c | 50 +-
libdb/xa/xa_db.c | 44 +-
libdb/xa/xa_map.c | 28 +-
334 files changed, 9538 insertions(+), 9538 deletions(-)
diff --git a/iconv-detect.c b/iconv-detect.c
index 8840962..7ca1339 100644
--- a/iconv-detect.c
+++ b/iconv-detect.c
@@ -52,9 +52,9 @@ enum {
typedef struct {
- gchar *charset;
- gchar *format;
- gint id;
+ char *charset;
+ char *format;
+ int id;
} CharInfo;
@@ -67,7 +67,7 @@ static CharInfo iso8859_tests[] = {
{ "8859-1", "%d-%d", NO_ISO_D_DASH_D },
};
-static gint num_iso8859_tests = sizeof (iso8859_tests) / sizeof (CharInfo);
+static int num_iso8859_tests = sizeof (iso8859_tests) / sizeof (CharInfo);
static CharInfo iso2022_tests[] = {
{ "iso-2022-jp", "iso-%d-%s", ISO_DASH_D_DASH_S_LOWER },
@@ -75,7 +75,7 @@ static CharInfo iso2022_tests[] = {
{ "ISO2022-JP", "ISO%d-%s", ISO_D_DASH_S },
};
-static gint num_iso2022_tests = sizeof (iso2022_tests) / sizeof (CharInfo);
+static int num_iso2022_tests = sizeof (iso2022_tests) / sizeof (CharInfo);
static CharInfo iso10646_tests[] = {
{ "iso-10646-1", "iso-%d-%d", ISO_DASH_D_DASH_D_LOWER },
@@ -87,16 +87,16 @@ static CharInfo iso10646_tests[] = {
{ "UCS-4BE", "UCS-4BE", UCS4 },
};
-static gint num_iso10646_tests = sizeof (iso10646_tests) / sizeof (CharInfo);
+static int num_iso10646_tests = sizeof (iso10646_tests) / sizeof (CharInfo);
-gint main (gint argc, gchar **argv)
+int main (int argc, char **argv)
{
- guint iso8859, iso2022, iso10646;
+ unsigned int iso8859, iso2022, iso10646;
CharInfo *info;
iconv_t cd;
FILE *fp;
- gint i;
+ int i;
fp = fopen ("iconv-detect.h", "w");
if (fp == NULL)
diff --git a/libdb/btree/bt_compare.c b/libdb/btree/bt_compare.c
index db911b5..4530a4e 100644
--- a/libdb/btree/bt_compare.c
+++ b/libdb/btree/bt_compare.c
@@ -43,7 +43,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -58,17 +58,17 @@ static const gchar revid[] = "$Id$";
* __bam_cmp --
* Compare a key to a given record.
*
- * PUBLIC: gint __bam_cmp __P((DB *, const DBT *, PAGE *,
- * PUBLIC: u_int32_t, gint (*)(DB *, const DBT *, const DBT *), gint *));
+ * PUBLIC: int __bam_cmp __P((DB *, const DBT *, PAGE *,
+ * PUBLIC: u_int32_t, int (*)(DB *, const DBT *, const DBT *), int *));
*/
-gint
+int
__bam_cmp(dbp, dbt, h, indx, func, cmpp)
DB *dbp;
const DBT *dbt;
PAGE *h;
u_int32_t indx;
- gint (*func)__P((DB *, const DBT *, const DBT *));
- gint *cmpp;
+ int (*func)__P((DB *, const DBT *, const DBT *));
+ int *cmpp;
{
BINTERNAL *bi;
BKEYDATA *bk;
@@ -150,9 +150,9 @@ __bam_cmp(dbp, dbt, h, indx, func, cmpp)
* __bam_defcmp --
* Default comparison routine.
*
- * PUBLIC: gint __bam_defcmp __P((DB *, const DBT *, const DBT *));
+ * PUBLIC: int __bam_defcmp __P((DB *, const DBT *, const DBT *));
*/
-gint
+int
__bam_defcmp(dbp, a, b)
DB *dbp;
const DBT *a, *b;
diff --git a/libdb/btree/bt_conv.c b/libdb/btree/bt_conv.c
index d3f638c..a928973 100644
--- a/libdb/btree/bt_conv.c
+++ b/libdb/btree/bt_conv.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,14 +25,14 @@ static const gchar revid[] = "$Id$";
* Convert host-specific page layout from the host-independent format
* stored on disk.
*
- * PUBLIC: gint __bam_pgin __P((DB_ENV *, DB *, db_pgno_t, gpointer , DBT *));
+ * PUBLIC: int __bam_pgin __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
*/
-gint
+int
__bam_pgin(dbenv, dummydbp, pg, pp, cookie)
DB_ENV *dbenv;
DB *dummydbp;
db_pgno_t pg;
- gpointer pp;
+ void *pp;
DBT *cookie;
{
DB_PGINFO *pginfo;
@@ -52,14 +52,14 @@ __bam_pgin(dbenv, dummydbp, pg, pp, cookie)
* Convert host-specific page layout to the host-independent format
* stored on disk.
*
- * PUBLIC: gint __bam_pgout __P((DB_ENV *, DB *, db_pgno_t, gpointer , DBT *));
+ * PUBLIC: int __bam_pgout __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
*/
-gint
+int
__bam_pgout(dbenv, dummydbp, pg, pp, cookie)
DB_ENV *dbenv;
DB *dummydbp;
db_pgno_t pg;
- gpointer pp;
+ void *pp;
DBT *cookie;
{
DB_PGINFO *pginfo;
@@ -78,9 +78,9 @@ __bam_pgout(dbenv, dummydbp, pg, pp, cookie)
* __bam_mswap --
* Swap the bytes on the btree metadata page.
*
- * PUBLIC: gint __bam_mswap __P((PAGE *));
+ * PUBLIC: int __bam_mswap __P((PAGE *));
*/
-gint
+int
__bam_mswap(pg)
PAGE *pg;
{
diff --git a/libdb/btree/bt_curadj.c b/libdb/btree/bt_curadj.c
index ba646c0..413b686 100644
--- a/libdb/btree/bt_curadj.c
+++ b/libdb/btree/bt_curadj.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -19,7 +19,7 @@ static const gchar revid[] = "$Id$";
#include "dbinc/db_page.h"
#include "dbinc/btree.h"
-static gint __bam_opd_cursor __P((DB *, DBC *, db_pgno_t, u_int32_t, u_int32_t));
+static int __bam_opd_cursor __P((DB *, DBC *, db_pgno_t, u_int32_t, u_int32_t));
#ifdef DEBUG
/*
@@ -61,20 +61,20 @@ __bam_cprint(dbc)
* Update the cursors when items are deleted and when already deleted
* items are overwritten. Return the number of relevant cursors found.
*
- * PUBLIC: gint __bam_ca_delete __P((DB *, db_pgno_t, u_int32_t, int));
+ * PUBLIC: int __bam_ca_delete __P((DB *, db_pgno_t, u_int32_t, int));
*/
-gint
+int
__bam_ca_delete(dbp, pgno, indx, delete)
DB *dbp;
db_pgno_t pgno;
u_int32_t indx;
- gint delete;
+ int delete;
{
BTREE_CURSOR *cp;
DB *ldbp;
DB_ENV *dbenv;
DBC *dbc;
- gint count; /* !!!: Has to contain max number of cursors. */
+ int count; /* !!!: Has to contain max number of cursors. */
dbenv = dbp->dbenv;
@@ -116,9 +116,9 @@ __bam_ca_delete(dbp, pgno, indx, delete)
* __ram_ca_delete --
* Return the number of relevant cursors.
*
- * PUBLIC: gint __ram_ca_delete __P((DB *, db_pgno_t));
+ * PUBLIC: int __ram_ca_delete __P((DB *, db_pgno_t));
*/
-gint
+int
__ram_ca_delete(dbp, root_pgno)
DB *dbp;
db_pgno_t root_pgno;
@@ -126,7 +126,7 @@ __ram_ca_delete(dbp, root_pgno)
DB *ldbp;
DBC *dbc;
DB_ENV *dbenv;
- gint found;
+ int found;
found = 0;
dbenv = dbp->dbenv;
@@ -153,14 +153,14 @@ __ram_ca_delete(dbp, root_pgno)
* __bam_ca_di --
* Adjust the cursors during a delete or insert.
*
- * PUBLIC: gint __bam_ca_di __P((DBC *, db_pgno_t, u_int32_t, int));
+ * PUBLIC: int __bam_ca_di __P((DBC *, db_pgno_t, u_int32_t, int));
*/
-gint
+int
__bam_ca_di(my_dbc, pgno, indx, adjust)
DBC *my_dbc;
db_pgno_t pgno;
u_int32_t indx;
- gint adjust;
+ int adjust;
{
DB *dbp, *ldbp;
DB_ENV *dbenv;
@@ -168,7 +168,7 @@ __bam_ca_di(my_dbc, pgno, indx, adjust)
DB_TXN *my_txn;
DBC *dbc;
DBC_INTERNAL *cp;
- gint found, ret;
+ int found, ret;
dbp = my_dbc->dbp;
dbenv = dbp->dbenv;
@@ -223,7 +223,7 @@ __bam_opd_cursor(dbp, dbc, first, tpgno, ti)
{
BTREE_CURSOR *cp, *orig_cp;
DBC *dbc_nopd;
- gint ret;
+ int ret;
orig_cp = (BTREE_CURSOR *)dbc->internal;
dbc_nopd = NULL;
@@ -274,10 +274,10 @@ __bam_opd_cursor(dbp, dbc, first, tpgno, ti)
* Adjust the cursors when moving items from a leaf page to a duplicates
* page.
*
- * PUBLIC: gint __bam_ca_dup __P((DBC *,
+ * PUBLIC: int __bam_ca_dup __P((DBC *,
* PUBLIC: u_int32_t, db_pgno_t, u_int32_t, db_pgno_t, u_int32_t));
*/
-gint
+int
__bam_ca_dup(my_dbc, first, fpgno, fi, tpgno, ti)
DBC *my_dbc;
db_pgno_t fpgno, tpgno;
@@ -289,7 +289,7 @@ __bam_ca_dup(my_dbc, first, fpgno, fi, tpgno, ti)
DB_ENV *dbenv;
DB_LSN lsn;
DB_TXN *my_txn;
- gint found, ret;
+ int found, ret;
dbp = my_dbc->dbp;
dbenv = dbp->dbenv;
@@ -345,10 +345,10 @@ loop: MUTEX_THREAD_LOCK(dbenv, dbp->mutexp);
* from a duplicate page.
* Called only during undo processing.
*
- * PUBLIC: gint __bam_ca_undodup __P((DB *,
+ * PUBLIC: int __bam_ca_undodup __P((DB *,
* PUBLIC: u_int32_t, db_pgno_t, u_int32_t, u_int32_t));
*/
-gint
+int
__bam_ca_undodup(dbp, first, fpgno, fi, ti)
DB *dbp;
db_pgno_t fpgno;
@@ -358,7 +358,7 @@ __bam_ca_undodup(dbp, first, fpgno, fi, ti)
DB *ldbp;
DBC *dbc;
DB_ENV *dbenv;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
@@ -409,9 +409,9 @@ loop: MUTEX_THREAD_LOCK(dbenv, dbp->mutexp);
* __bam_ca_rsplit --
* Adjust the cursors when doing reverse splits.
*
- * PUBLIC: gint __bam_ca_rsplit __P((DBC *, db_pgno_t, db_pgno_t));
+ * PUBLIC: int __bam_ca_rsplit __P((DBC *, db_pgno_t, db_pgno_t));
*/
-gint
+int
__bam_ca_rsplit(my_dbc, fpgno, tpgno)
DBC* my_dbc;
db_pgno_t fpgno, tpgno;
@@ -421,7 +421,7 @@ __bam_ca_rsplit(my_dbc, fpgno, tpgno)
DB_ENV *dbenv;
DB_LSN lsn;
DB_TXN *my_txn;
- gint found, ret;
+ int found, ret;
dbp = my_dbc->dbp;
dbenv = dbp->dbenv;
@@ -462,15 +462,15 @@ __bam_ca_rsplit(my_dbc, fpgno, tpgno)
* __bam_ca_split --
* Adjust the cursors when splitting a page.
*
- * PUBLIC: gint __bam_ca_split __P((DBC *,
+ * PUBLIC: int __bam_ca_split __P((DBC *,
* PUBLIC: db_pgno_t, db_pgno_t, db_pgno_t, u_int32_t, int));
*/
-gint
+int
__bam_ca_split(my_dbc, ppgno, lpgno, rpgno, split_indx, cleft)
DBC *my_dbc;
db_pgno_t ppgno, lpgno, rpgno;
u_int32_t split_indx;
- gint cleft;
+ int cleft;
{
DB *dbp, *ldbp;
DBC *dbc;
@@ -478,7 +478,7 @@ __bam_ca_split(my_dbc, ppgno, lpgno, rpgno, split_indx, cleft)
DB_ENV *dbenv;
DB_LSN lsn;
DB_TXN *my_txn;
- gint found, ret;
+ int found, ret;
dbp = my_dbc->dbp;
dbenv = dbp->dbenv;
diff --git a/libdb/btree/bt_cursor.c b/libdb/btree/bt_cursor.c
index 0891b77..911ebc7 100644
--- a/libdb/btree/bt_cursor.c
+++ b/libdb/btree/bt_cursor.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -23,25 +23,25 @@ static const gchar revid[] = "$Id$";
#include "dbinc/btree.h"
#include "dbinc/lock.h"
-static gint __bam_bulk __P((DBC *, DBT *, u_int32_t));
-static gint __bam_c_close __P((DBC *, db_pgno_t, gint *));
-static gint __bam_c_del __P((DBC *));
-static gint __bam_c_destroy __P((DBC *));
-static gint __bam_c_first __P((DBC *));
-static gint __bam_c_get __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
-static gint __bam_c_getstack __P((DBC *));
-static gint __bam_c_last __P((DBC *));
-static gint __bam_c_next __P((DBC *, int, int));
-static gint __bam_c_physdel __P((DBC *));
-static gint __bam_c_prev __P((DBC *));
-static gint __bam_c_put __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
-static gint __bam_c_search __P((DBC *,
- db_pgno_t, const DBT *, u_int32_t, gint *));
-static gint __bam_c_writelock __P((DBC *));
-static gint __bam_getboth_finddatum __P((DBC *, DBT *, u_int32_t));
-static gint __bam_getbothc __P((DBC *, DBT *));
-static gint __bam_get_prev __P((DBC *));
-static gint __bam_isopd __P((DBC *, db_pgno_t *));
+static int __bam_bulk __P((DBC *, DBT *, u_int32_t));
+static int __bam_c_close __P((DBC *, db_pgno_t, int *));
+static int __bam_c_del __P((DBC *));
+static int __bam_c_destroy __P((DBC *));
+static int __bam_c_first __P((DBC *));
+static int __bam_c_get __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
+static int __bam_c_getstack __P((DBC *));
+static int __bam_c_last __P((DBC *));
+static int __bam_c_next __P((DBC *, int, int));
+static int __bam_c_physdel __P((DBC *));
+static int __bam_c_prev __P((DBC *));
+static int __bam_c_put __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
+static int __bam_c_search __P((DBC *,
+ db_pgno_t, const DBT *, u_int32_t, int *));
+static int __bam_c_writelock __P((DBC *));
+static int __bam_getboth_finddatum __P((DBC *, DBT *, u_int32_t));
+static int __bam_getbothc __P((DBC *, DBT *));
+static int __bam_get_prev __P((DBC *));
+static int __bam_isopd __P((DBC *, db_pgno_t *));
/*
* Acquire a new page/lock. If we hold a page/lock, discard the page, and
@@ -132,7 +132,7 @@ static gint __bam_isopd __P((DBC *, db_pgno_t *));
#undef DISCARD
#define DISCARD(dbc, ldiscard, lock, pagep, ret) { \
DB_MPOOLFILE *__mpf = (dbc)->dbp->mpf; \
- gint __t_ret; \
+ int __t_ret; \
if ((pagep) != NULL) { \
ret = __mpf->put(__mpf, pagep, 0); \
pagep = NULL; \
@@ -186,15 +186,15 @@ static gint __bam_isopd __P((DBC *, db_pgno_t *));
* __bam_c_init --
* Initialize the access private portion of a cursor
*
- * PUBLIC: gint __bam_c_init __P((DBC *, DBTYPE));
+ * PUBLIC: int __bam_c_init __P((DBC *, DBTYPE));
*/
-gint
+int
__bam_c_init(dbc, dbtype)
DBC *dbc;
DBTYPE dbtype;
{
DB_ENV *dbenv;
- gint ret;
+ int ret;
dbenv = dbc->dbp->dbenv;
@@ -236,9 +236,9 @@ __bam_c_init(dbc, dbtype)
* __bam_c_refresh
* Set things up properly for cursor re-use.
*
- * PUBLIC: gint __bam_c_refresh __P((DBC *));
+ * PUBLIC: int __bam_c_refresh __P((DBC *));
*/
-gint
+int
__bam_c_refresh(dbc)
DBC *dbc;
{
@@ -305,14 +305,14 @@ static int
__bam_c_close(dbc, root_pgno, rmroot)
DBC *dbc;
db_pgno_t root_pgno;
- gint *rmroot;
+ int *rmroot;
{
BTREE_CURSOR *cp, *cp_opd, *cp_c;
DB *dbp;
DBC *dbc_opd, *dbc_c;
DB_MPOOLFILE *mpf;
PAGE *h;
- gint cdb_lock, ret, t_ret;
+ int cdb_lock, ret, t_ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -604,9 +604,9 @@ __bam_c_destroy(dbc)
* __bam_c_count --
* Return a count of on and off-page duplicates.
*
- * PUBLIC: gint __bam_c_count __P((DBC *, db_recno_t *));
+ * PUBLIC: int __bam_c_count __P((DBC *, db_recno_t *));
*/
-gint
+int
__bam_c_count(dbc, recnop)
DBC *dbc;
db_recno_t *recnop;
@@ -616,7 +616,7 @@ __bam_c_count(dbc, recnop)
DB_MPOOLFILE *mpf;
db_indx_t indx, top;
db_recno_t recno;
- gint ret;
+ int ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -671,7 +671,7 @@ __bam_c_del(dbc)
BTREE_CURSOR *cp;
DB *dbp;
DB_MPOOLFILE *mpf;
- gint ret, t_ret;
+ int ret, t_ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -750,14 +750,14 @@ err: /*
* Duplicate a btree cursor, such that the new one holds appropriate
* locks for the position of the original.
*
- * PUBLIC: gint __bam_c_dup __P((DBC *, DBC *));
+ * PUBLIC: int __bam_c_dup __P((DBC *, DBC *));
*/
-gint
+int
__bam_c_dup(orig_dbc, new_dbc)
DBC *orig_dbc, *new_dbc;
{
BTREE_CURSOR *orig, *new;
- gint ret;
+ int ret;
orig = (BTREE_CURSOR *)orig_dbc->internal;
new = (BTREE_CURSOR *)new_dbc->internal;
@@ -796,7 +796,7 @@ __bam_c_get(dbc, key, data, flags, pgnop)
DB_MPOOLFILE *mpf;
db_pgno_t orig_pgno;
db_indx_t orig_indx;
- gint exact, newopd, ret;
+ int exact, newopd, ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -1004,7 +1004,7 @@ __bam_get_prev(dbc)
BTREE_CURSOR *cp;
DBT key, data;
db_pgno_t pgno;
- gint ret;
+ int ret;
if ((ret = __bam_c_prev(dbc)) != 0)
return (ret);
@@ -1038,8 +1038,8 @@ __bam_bulk(dbc, data, flags)
int32_t *endp, key_off, *offp, *saveoffp;
u_int8_t *dbuf, *dp, *np;
u_int32_t key_size, size, space;
- gint adj, is_key, need_pg, next_key, no_dup;
- gint pagesize, rec_key, ret;
+ int adj, is_key, need_pg, next_key, no_dup;
+ int pagesize, rec_key, ret;
ret = 0;
key_off = 0;
@@ -1373,10 +1373,10 @@ get_space:
* __bam_bulk_overflow --
* Dump overflow record into the buffer.
* The space requirements have already been checked.
- * PUBLIC: gint __bam_bulk_overflow
+ * PUBLIC: int __bam_bulk_overflow
* PUBLIC: __P((DBC *, u_int32_t, db_pgno_t, u_int8_t *));
*/
-gint
+int
__bam_bulk_overflow(dbc, len, pgno, dp)
DBC *dbc;
u_int32_t len;
@@ -1388,7 +1388,7 @@ __bam_bulk_overflow(dbc, len, pgno, dp)
memset(&dbt, 0, sizeof(dbt));
F_SET(&dbt, DB_DBT_USERMEM);
dbt.ulen = len;
- dbt.data = (gpointer)dp;
+ dbt.data = (void *)dp;
return (__db_goff(dbc->dbp, &dbt, len, pgno, NULL, NULL));
}
@@ -1397,11 +1397,11 @@ __bam_bulk_overflow(dbc, len, pgno, dp)
* Put as many off page duplicates as will fit into the buffer.
* This routine will adjust the cursor to reflect the position in
* the overflow tree.
- * PUBLIC: gint __bam_bulk_duplicates __P((DBC *,
+ * PUBLIC: int __bam_bulk_duplicates __P((DBC *,
* PUBLIC: db_pgno_t, u_int8_t *, int32_t *,
* PUBLIC: int32_t **, u_int8_t **, u_int32_t *, int));
*/
-gint
+int
__bam_bulk_duplicates(dbc, pgno, dbuf, keyoff, offpp, dpp, spacep, no_dup)
DBC *dbc;
db_pgno_t pgno;
@@ -1409,7 +1409,7 @@ __bam_bulk_duplicates(dbc, pgno, dbuf, keyoff, offpp, dpp, spacep, no_dup)
int32_t *keyoff, **offpp;
u_int8_t **dpp;
u_int32_t *spacep;
- gint no_dup;
+ int no_dup;
{
DB *dbp;
BKEYDATA *bk;
@@ -1422,7 +1422,7 @@ __bam_bulk_duplicates(dbc, pgno, dbuf, keyoff, offpp, dpp, spacep, no_dup)
int32_t *offp;
u_int32_t size, space;
u_int8_t *dp, *np;
- gint first, need_pg, pagesize, ret, t_ret;
+ int first, need_pg, pagesize, ret, t_ret;
ret = 0;
@@ -1592,7 +1592,7 @@ __bam_getbothc(dbc, data)
BTREE_CURSOR *cp;
DB *dbp;
DB_MPOOLFILE *mpf;
- gint cmp, exact, ret;
+ int cmp, exact, ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -1664,7 +1664,7 @@ __bam_getboth_finddatum(dbc, data, flags)
BTREE_CURSOR *cp;
DB *dbp;
db_indx_t base, lim, top;
- gint cmp, ret;
+ int cmp, ret;
dbp = dbc->dbp;
cp = (BTREE_CURSOR *)dbc->internal;
@@ -1768,8 +1768,8 @@ __bam_c_put(dbc, key, data, flags, pgnop)
DB_MPOOLFILE *mpf;
db_pgno_t root_pgno;
u_int32_t iiop;
- gint cmp, exact, ret, stack;
- gpointer arg;
+ int cmp, exact, ret, stack;
+ void *arg;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -2009,9 +2009,9 @@ done: /*
* __bam_c_rget --
* Return the record number for a cursor.
*
- * PUBLIC: gint __bam_c_rget __P((DBC *, DBT *));
+ * PUBLIC: int __bam_c_rget __P((DBC *, DBT *));
*/
-gint
+int
__bam_c_rget(dbc, data)
DBC *dbc;
DBT *data;
@@ -2021,7 +2021,7 @@ __bam_c_rget(dbc, data)
DBT dbt;
DB_MPOOLFILE *mpf;
db_recno_t recno;
- gint exact, ret;
+ int exact, ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -2066,7 +2066,7 @@ __bam_c_writelock(dbc)
DBC *dbc;
{
BTREE_CURSOR *cp;
- gint ret;
+ int ret;
cp = (BTREE_CURSOR *)dbc->internal;
@@ -2093,7 +2093,7 @@ __bam_c_first(dbc)
{
BTREE_CURSOR *cp;
db_pgno_t pgno;
- gint ret;
+ int ret;
cp = (BTREE_CURSOR *)dbc->internal;
ret = 0;
@@ -2138,7 +2138,7 @@ __bam_c_last(dbc)
{
BTREE_CURSOR *cp;
db_pgno_t pgno;
- gint ret;
+ int ret;
cp = (BTREE_CURSOR *)dbc->internal;
ret = 0;
@@ -2183,13 +2183,13 @@ __bam_c_last(dbc)
static int
__bam_c_next(dbc, initial_move, deleted_okay)
DBC *dbc;
- gint initial_move, deleted_okay;
+ int initial_move, deleted_okay;
{
BTREE_CURSOR *cp;
db_indx_t adjust;
db_lockmode_t lock_mode;
db_pgno_t pgno;
- gint ret;
+ int ret;
cp = (BTREE_CURSOR *)dbc->internal;
ret = 0;
@@ -2258,7 +2258,7 @@ __bam_c_prev(dbc)
db_indx_t adjust;
db_lockmode_t lock_mode;
db_pgno_t pgno;
- gint ret;
+ int ret;
cp = (BTREE_CURSOR *)dbc->internal;
ret = 0;
@@ -2319,7 +2319,7 @@ __bam_c_search(dbc, root_pgno, key, flags, exactp)
db_pgno_t root_pgno;
const DBT *key;
u_int32_t flags;
- gint *exactp;
+ int *exactp;
{
BTREE *t;
BTREE_CURSOR *cp;
@@ -2329,7 +2329,7 @@ __bam_c_search(dbc, root_pgno, key, flags, exactp)
db_pgno_t bt_lpgno;
db_recno_t recno;
u_int32_t sflags;
- gint cmp, ret;
+ int cmp, ret;
dbp = dbc->dbp;
cp = (BTREE_CURSOR *)dbc->internal;
@@ -2547,7 +2547,7 @@ __bam_c_physdel(dbc)
DB_MPOOLFILE *mpf;
PAGE *h;
db_pgno_t pgno;
- gint delete_page, empty_page, exact, level, ret;
+ int delete_page, empty_page, exact, level, ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -2737,7 +2737,7 @@ __bam_c_getstack(dbc)
DBT dbt;
DB_MPOOLFILE *mpf;
PAGE *h;
- gint exact, ret, t_ret;
+ int exact, ret, t_ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
diff --git a/libdb/btree/bt_delete.c b/libdb/btree/bt_delete.c
index 05ca9fb..ec989ed 100644
--- a/libdb/btree/bt_delete.c
+++ b/libdb/btree/bt_delete.c
@@ -43,7 +43,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -62,9 +62,9 @@ static const gchar revid[] = "$Id$";
* __bam_ditem --
* Delete one or more entries from a page.
*
- * PUBLIC: gint __bam_ditem __P((DBC *, PAGE *, u_int32_t));
+ * PUBLIC: int __bam_ditem __P((DBC *, PAGE *, u_int32_t));
*/
-gint
+int
__bam_ditem(dbc, h, indx)
DBC *dbc;
PAGE *h;
@@ -75,7 +75,7 @@ __bam_ditem(dbc, h, indx)
DB *dbp;
DB_MPOOLFILE *mpf;
u_int32_t nbytes;
- gint ret;
+ int ret;
db_indx_t *inp;
dbp = dbc->dbp;
@@ -171,19 +171,19 @@ __bam_ditem(dbc, h, indx)
* __bam_adjindx --
* Adjust an index on the page.
*
- * PUBLIC: gint __bam_adjindx __P((DBC *, PAGE *, u_int32_t, u_int32_t, int));
+ * PUBLIC: int __bam_adjindx __P((DBC *, PAGE *, u_int32_t, u_int32_t, int));
*/
-gint
+int
__bam_adjindx(dbc, h, indx, indx_copy, is_insert)
DBC *dbc;
PAGE *h;
u_int32_t indx, indx_copy;
- gint is_insert;
+ int is_insert;
{
DB *dbp;
DB_MPOOLFILE *mpf;
db_indx_t copy, *inp;
- gint ret;
+ int ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -221,9 +221,9 @@ __bam_adjindx(dbc, h, indx, indx_copy, is_insert)
* __bam_dpages --
* Delete a set of locked pages.
*
- * PUBLIC: gint __bam_dpages __P((DBC *, EPG *));
+ * PUBLIC: int __bam_dpages __P((DBC *, EPG *));
*/
-gint
+int
__bam_dpages(dbc, stack_epg)
DBC *dbc;
EPG *stack_epg;
@@ -239,7 +239,7 @@ __bam_dpages(dbc, stack_epg)
db_indx_t nitems;
db_pgno_t pgno, root_pgno;
db_recno_t rcnt;
- gint done, ret, t_ret;
+ int done, ret, t_ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
diff --git a/libdb/btree/bt_method.c b/libdb/btree/bt_method.c
index 8b1116e..e19c2bd 100644
--- a/libdb/btree/bt_method.c
+++ b/libdb/btree/bt_method.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -20,29 +20,29 @@ static const gchar revid[] = "$Id$";
#include "dbinc/btree.h"
#include "dbinc/qam.h"
-static gint __bam_set_bt_compare
- __P((DB *, gint (*)(DB *, const DBT *, const DBT *)));
-static gint __bam_set_bt_maxkey __P((DB *, u_int32_t));
-static gint __bam_set_bt_minkey __P((DB *, u_int32_t));
-static gint __bam_set_bt_prefix
+static int __bam_set_bt_compare
+ __P((DB *, int (*)(DB *, const DBT *, const DBT *)));
+static int __bam_set_bt_maxkey __P((DB *, u_int32_t));
+static int __bam_set_bt_minkey __P((DB *, u_int32_t));
+static int __bam_set_bt_prefix
__P((DB *, size_t(*)(DB *, const DBT *, const DBT *)));
-static gint __ram_set_re_delim __P((DB *, int));
-static gint __ram_set_re_len __P((DB *, u_int32_t));
-static gint __ram_set_re_pad __P((DB *, int));
-static gint __ram_set_re_source __P((DB *, const gchar *));
+static int __ram_set_re_delim __P((DB *, int));
+static int __ram_set_re_len __P((DB *, u_int32_t));
+static int __ram_set_re_pad __P((DB *, int));
+static int __ram_set_re_source __P((DB *, const char *));
/*
* __bam_db_create --
* Btree specific initialization of the DB structure.
*
- * PUBLIC: gint __bam_db_create __P((DB *));
+ * PUBLIC: int __bam_db_create __P((DB *));
*/
-gint
+int
__bam_db_create(dbp)
DB *dbp;
{
BTREE *t;
- gint ret;
+ int ret;
/* Allocate and initialize the private btree structure. */
if ((ret = __os_calloc(dbp->dbenv, 1, sizeof(BTREE), &t)) != 0)
@@ -74,9 +74,9 @@ __bam_db_create(dbp)
* __bam_db_close --
* Btree specific discard of the DB structure.
*
- * PUBLIC: gint __bam_db_close __P((DB *));
+ * PUBLIC: int __bam_db_close __P((DB *));
*/
-gint
+int
__bam_db_close(dbp)
DB *dbp;
{
@@ -103,9 +103,9 @@ __bam_db_close(dbp)
* __bam_set_flags --
* Set Btree specific flags.
*
- * PUBLIC: gint __bam_set_flags __P((DB *, u_int32_t *flagsp));
+ * PUBLIC: int __bam_set_flags __P((DB *, u_int32_t *flagsp));
*/
-gint
+int
__bam_set_flags(dbp, flagsp)
DB *dbp;
u_int32_t *flagsp;
@@ -170,7 +170,7 @@ incompat:
static int
__bam_set_bt_compare(dbp, func)
DB *dbp;
- gint (*func) __P((DB *, const DBT *, const DBT *));
+ int (*func) __P((DB *, const DBT *, const DBT *));
{
BTREE *t;
@@ -264,9 +264,9 @@ __bam_set_bt_prefix(dbp, func)
* __ram_set_flags --
* Set Recno specific flags.
*
- * PUBLIC: gint __ram_set_flags __P((DB *, u_int32_t *flagsp));
+ * PUBLIC: int __ram_set_flags __P((DB *, u_int32_t *flagsp));
*/
-gint
+int
__ram_set_flags(dbp, flagsp)
DB *dbp;
u_int32_t *flagsp;
@@ -301,7 +301,7 @@ __ram_set_flags(dbp, flagsp)
static int
__ram_set_re_delim(dbp, re_delim)
DB *dbp;
- gint re_delim;
+ int re_delim;
{
BTREE *t;
@@ -349,7 +349,7 @@ __ram_set_re_len(dbp, re_len)
static int
__ram_set_re_pad(dbp, re_pad)
DB *dbp;
- gint re_pad;
+ int re_pad;
{
BTREE *t;
QUEUE *q;
@@ -375,7 +375,7 @@ __ram_set_re_pad(dbp, re_pad)
static int
__ram_set_re_source(dbp, re_source)
DB *dbp;
- const gchar *re_source;
+ const char *re_source;
{
BTREE *t;
diff --git a/libdb/btree/bt_open.c b/libdb/btree/bt_open.c
index d5f39a9..95f779a 100644
--- a/libdb/btree/bt_open.c
+++ b/libdb/btree/bt_open.c
@@ -43,7 +43,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -69,14 +69,14 @@ static void __bam_init_meta __P((DB *, BTMETA *, db_pgno_t, DB_LSN *));
* __bam_open --
* Open a btree.
*
- * PUBLIC: gint __bam_open __P((DB *,
- * PUBLIC: DB_TXN *, const gchar *, db_pgno_t, u_int32_t));
+ * PUBLIC: int __bam_open __P((DB *,
+ * PUBLIC: DB_TXN *, const char *, db_pgno_t, u_int32_t));
*/
-gint
+int
__bam_open(dbp, txn, name, base_pgno, flags)
DB *dbp;
DB_TXN *txn;
- const gchar *name;
+ const char *name;
db_pgno_t base_pgno;
u_int32_t flags;
{
@@ -119,17 +119,17 @@ __bam_open(dbp, txn, name, base_pgno, flags)
/*
* __bam_metachk --
*
- * PUBLIC: gint __bam_metachk __P((DB *, const gchar *, BTMETA *));
+ * PUBLIC: int __bam_metachk __P((DB *, const char *, BTMETA *));
*/
-gint
+int
__bam_metachk(dbp, name, btm)
DB *dbp;
- const gchar *name;
+ const char *name;
BTMETA *btm;
{
DB_ENV *dbenv;
u_int32_t vers;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
@@ -274,9 +274,9 @@ wrong_type:
* __bam_read_root --
* Read the root page and check a tree.
*
- * PUBLIC: gint __bam_read_root __P((DB *, DB_TXN *, db_pgno_t, u_int32_t));
+ * PUBLIC: int __bam_read_root __P((DB *, DB_TXN *, db_pgno_t, u_int32_t));
*/
-gint
+int
__bam_read_root(dbp, txn, base_pgno, flags)
DB *dbp;
DB_TXN *txn;
@@ -288,7 +288,7 @@ __bam_read_root(dbp, txn, base_pgno, flags)
DBC *dbc;
DB_LOCK metalock;
DB_MPOOLFILE *mpf;
- gint ret, t_ret;
+ int ret, t_ret;
meta = NULL;
t = dbp->bt_internal;
@@ -421,14 +421,14 @@ __bam_init_meta(dbp, meta, pgno, lsnp)
* memory or calls mpf->get), 2) the initialization, and 3) the "put page"
* chunk which either does a fop write or an mpf->put.
*
- * PUBLIC: gint __bam_new_file __P((DB *, DB_TXN *, DB_FH *, const gchar *));
+ * PUBLIC: int __bam_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
*/
-gint
+int
__bam_new_file(dbp, txn, fhp, name)
DB *dbp;
DB_TXN *txn;
DB_FH *fhp;
- const gchar *name;
+ const char *name;
{
BTMETA *meta;
DB_ENV *dbenv;
@@ -438,8 +438,8 @@ __bam_new_file(dbp, txn, fhp, name)
DBT pdbt;
PAGE *root;
db_pgno_t pgno;
- gint ret;
- gpointer buf;
+ int ret;
+ void *buf;
dbenv = dbp->dbenv;
mpf = dbp->mpf;
@@ -525,9 +525,9 @@ err: if (name != NULL)
* __bam_new_subdb --
* Create a metadata page and a root page for a new btree.
*
- * PUBLIC: gint __bam_new_subdb __P((DB *, DB *, DB_TXN *));
+ * PUBLIC: int __bam_new_subdb __P((DB *, DB *, DB_TXN *));
*/
-gint
+int
__bam_new_subdb(mdbp, dbp, txn)
DB *mdbp, *dbp;
DB_TXN *txn;
@@ -539,7 +539,7 @@ __bam_new_subdb(mdbp, dbp, txn)
DB_LSN lsn;
DB_MPOOLFILE *mpf;
PAGE *root;
- gint ret, t_ret;
+ int ret, t_ret;
dbenv = mdbp->dbenv;
mpf = mdbp->mpf;
diff --git a/libdb/btree/bt_put.c b/libdb/btree/bt_put.c
index 82f7ab7..0d5097c 100644
--- a/libdb/btree/bt_put.c
+++ b/libdb/btree/bt_put.c
@@ -43,7 +43,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -56,10 +56,10 @@ static const gchar revid[] = "$Id$";
#include "dbinc/db_page.h"
#include "dbinc/btree.h"
-static gint __bam_build
+static int __bam_build
__P((DBC *, u_int32_t, DBT *, PAGE *, u_int32_t, u_int32_t));
-static gint __bam_dup_convert __P((DBC *, PAGE *, u_int32_t));
-static gint __bam_ovput
+static int __bam_dup_convert __P((DBC *, PAGE *, u_int32_t));
+static int __bam_ovput
__P((DBC *, u_int32_t, db_pgno_t, PAGE *, u_int32_t, DBT *));
static u_int32_t
__bam_partsize __P((DB *, u_int32_t, DBT *, PAGE *, u_int32_t));
@@ -68,9 +68,9 @@ static u_int32_t
* __bam_iitem --
* Insert an item into the tree.
*
- * PUBLIC: gint __bam_iitem __P((DBC *, DBT *, DBT *, u_int32_t, u_int32_t));
+ * PUBLIC: int __bam_iitem __P((DBC *, DBT *, DBT *, u_int32_t, u_int32_t));
*/
-gint
+int
__bam_iitem(dbc, key, data, op, flags)
DBC *dbc;
DBT *key, *data;
@@ -85,7 +85,7 @@ __bam_iitem(dbc, key, data, op, flags)
PAGE *h;
db_indx_t indx;
u_int32_t data_size, have_bytes, need_bytes, needed;
- gint cmp, bigkey, bigdata, dupadjust, padrec, replace, ret, was_deleted;
+ int cmp, bigkey, bigdata, dupadjust, padrec, replace, ret, was_deleted;
COMPQUIET(bk, NULL);
@@ -450,7 +450,7 @@ __bam_build(dbc, op, dbt, h, indx, nbytes)
DBT copy, *rdata;
u_int32_t len, tlen;
u_int8_t *p;
- gint ret;
+ int ret;
COMPQUIET(bo, NULL);
@@ -568,9 +568,9 @@ user_copy:
* __bam_ritem --
* Replace an item on a page.
*
- * PUBLIC: gint __bam_ritem __P((DBC *, PAGE *, u_int32_t, DBT *));
+ * PUBLIC: int __bam_ritem __P((DBC *, PAGE *, u_int32_t, DBT *));
*/
-gint
+int
__bam_ritem(dbc, h, indx, data)
DBC *dbc;
PAGE *h;
@@ -582,7 +582,7 @@ __bam_ritem(dbc, h, indx, data)
DBT orig, repl;
db_indx_t cnt, lo, ln, min, off, prefix, suffix;
int32_t nbytes;
- gint ret;
+ int ret;
db_indx_t *inp;
u_int8_t *p, *t;
@@ -688,7 +688,7 @@ __bam_dup_convert(dbc, h, indx)
DB_MPOOLFILE *mpf;
PAGE *dp;
db_indx_t cnt, cpindx, dindx, first, *inp, sz;
- gint ret;
+ int ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -826,7 +826,7 @@ __bam_ovput(dbc, type, pgno, h, indx, item)
{
BOVERFLOW bo;
DBT hdr;
- gint ret;
+ int ret;
UMRW_SET(bo.unused1);
B_TSET(bo.type, type, 0);
diff --git a/libdb/btree/bt_rec.c b/libdb/btree/bt_rec.c
index 2070a6d..aeb4aef 100644
--- a/libdb/btree/bt_rec.c
+++ b/libdb/btree/bt_rec.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -32,16 +32,16 @@ static const gchar revid[] = "$Id$";
* __bam_split_recover --
* Recovery function for split.
*
- * PUBLIC: gint __bam_split_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __bam_split_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__bam_split_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__bam_split_args *argp;
DB *file_dbp;
@@ -50,7 +50,7 @@ __bam_split_recover(dbenv, dbtp, lsnp, op, info)
PAGE *_lp, *lp, *np, *pp, *_rp, *rp, *sp;
db_pgno_t pgno, root_pgno;
u_int32_t ptype;
- gint cmp, l_update, p_update, r_update, rc, ret, ret_l, rootsplit, t_ret;
+ int cmp, l_update, p_update, r_update, rc, ret, ret_l, rootsplit, t_ret;
COMPQUIET(info, NULL);
REC_PRINT(__bam_split_print);
@@ -335,16 +335,16 @@ out: /* Free any pages that weren't dirtied. */
* __bam_rsplit_recover --
* Recovery function for a reverse split.
*
- * PUBLIC: gint __bam_rsplit_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __bam_rsplit_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__bam_rsplit_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__bam_rsplit_args *argp;
DB *file_dbp;
@@ -353,7 +353,7 @@ __bam_rsplit_recover(dbenv, dbtp, lsnp, op, info)
DB_MPOOLFILE *mpf;
PAGE *pagep;
db_pgno_t pgno, root_pgno;
- gint cmp_n, cmp_p, modified, ret;
+ int cmp_n, cmp_p, modified, ret;
pagep = NULL;
COMPQUIET(info, NULL);
@@ -440,23 +440,23 @@ out: if (pagep != NULL)
* __bam_adj_recover --
* Recovery function for adj.
*
- * PUBLIC: gint __bam_adj_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __bam_adj_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__bam_adj_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__bam_adj_args *argp;
DB *file_dbp;
DBC *dbc;
DB_MPOOLFILE *mpf;
PAGE *pagep;
- gint cmp_n, cmp_p, modified, ret;
+ int cmp_n, cmp_p, modified, ret;
pagep = NULL;
COMPQUIET(info, NULL);
@@ -509,23 +509,23 @@ out: if (pagep != NULL)
* Recovery function for the adjust of a count change in an internal
* page.
*
- * PUBLIC: gint __bam_cadjust_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __bam_cadjust_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__bam_cadjust_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__bam_cadjust_args *argp;
DB *file_dbp;
DBC *dbc;
DB_MPOOLFILE *mpf;
PAGE *pagep;
- gint cmp_n, cmp_p, modified, ret;
+ int cmp_n, cmp_p, modified, ret;
pagep = NULL;
COMPQUIET(info, NULL);
@@ -592,16 +592,16 @@ out: if (pagep != NULL)
* __bam_cdel_recover --
* Recovery function for the intent-to-delete of a cursor record.
*
- * PUBLIC: gint __bam_cdel_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __bam_cdel_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__bam_cdel_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__bam_cdel_args *argp;
DB *file_dbp;
@@ -609,7 +609,7 @@ __bam_cdel_recover(dbenv, dbtp, lsnp, op, info)
DB_MPOOLFILE *mpf;
PAGE *pagep;
u_int32_t indx;
- gint cmp_n, cmp_p, modified, ret;
+ int cmp_n, cmp_p, modified, ret;
pagep = NULL;
COMPQUIET(info, NULL);
@@ -661,16 +661,16 @@ out: if (pagep != NULL)
* __bam_repl_recover --
* Recovery function for page item replacement.
*
- * PUBLIC: gint __bam_repl_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __bam_repl_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__bam_repl_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__bam_repl_args *argp;
BKEYDATA *bk;
@@ -679,7 +679,7 @@ __bam_repl_recover(dbenv, dbtp, lsnp, op, info)
DBT dbt;
DB_MPOOLFILE *mpf;
PAGE *pagep;
- gint cmp_n, cmp_p, modified, ret;
+ int cmp_n, cmp_p, modified, ret;
u_int8_t *p;
pagep = NULL;
@@ -769,23 +769,23 @@ out: if (pagep != NULL)
* __bam_root_recover --
* Recovery function for setting the root page on the meta-data page.
*
- * PUBLIC: gint __bam_root_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __bam_root_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__bam_root_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__bam_root_args *argp;
BTMETA *meta;
DB *file_dbp;
DBC *dbc;
DB_MPOOLFILE *mpf;
- gint cmp_n, cmp_p, modified, ret;
+ int cmp_n, cmp_p, modified, ret;
meta = NULL;
COMPQUIET(info, NULL);
@@ -833,22 +833,22 @@ out: if (meta != NULL)
* Transaction abort function to undo cursor adjustments.
* This should only be triggered by subtransaction aborts.
*
- * PUBLIC: gint __bam_curadj_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __bam_curadj_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__bam_curadj_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__bam_curadj_args *argp;
DB *file_dbp;
DBC *dbc;
DB_MPOOLFILE *mpf;
- gint ret;
+ int ret;
COMPQUIET(info, NULL);
@@ -892,23 +892,23 @@ out: REC_CLOSE;
* Transaction abort function to undo cursor adjustments in rrecno.
* This should only be triggered by subtransaction aborts.
*
- * PUBLIC: gint __bam_rcuradj_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __bam_rcuradj_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__bam_rcuradj_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__bam_rcuradj_args *argp;
BTREE_CURSOR *cp;
DB *file_dbp;
DBC *dbc, *rdbc;
DB_MPOOLFILE *mpf;
- gint ret, t_ret;
+ int ret, t_ret;
COMPQUIET(info, NULL);
rdbc = NULL;
diff --git a/libdb/btree/bt_reclaim.c b/libdb/btree/bt_reclaim.c
index fcbd0e4..a55d16f 100644
--- a/libdb/btree/bt_reclaim.c
+++ b/libdb/btree/bt_reclaim.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,15 +25,15 @@ static const gchar revid[] = "$Id$";
* __bam_reclaim --
* Free a database.
*
- * PUBLIC: gint __bam_reclaim __P((DB *, DB_TXN *));
+ * PUBLIC: int __bam_reclaim __P((DB *, DB_TXN *));
*/
-gint
+int
__bam_reclaim(dbp, txn)
DB *dbp;
DB_TXN *txn;
{
DBC *dbc;
- gint ret, t_ret;
+ int ret, t_ret;
/* Acquire a cursor. */
if ((ret = dbp->cursor(dbp, txn, &dbc, 0)) != 0)
@@ -54,9 +54,9 @@ __bam_reclaim(dbp, txn)
* __bam_truncate --
* Truncate a database.
*
- * PUBLIC: gint __bam_truncate __P((DB *, DB_TXN *, u_int32_t *));
+ * PUBLIC: int __bam_truncate __P((DB *, DB_TXN *, u_int32_t *));
*/
-gint
+int
__bam_truncate(dbp, txn, countp)
DB *dbp;
DB_TXN *txn;
@@ -64,7 +64,7 @@ __bam_truncate(dbp, txn, countp)
{
DBC *dbc;
db_trunc_param trunc;
- gint ret, t_ret;
+ int ret, t_ret;
/* Acquire a cursor. */
if ((ret = dbp->cursor(dbp, txn, &dbc, 0)) != 0)
diff --git a/libdb/btree/bt_recno.c b/libdb/btree/bt_recno.c
index 142c377..b51d00a 100644
--- a/libdb/btree/bt_recno.c
+++ b/libdb/btree/bt_recno.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,10 +25,10 @@ static const gchar revid[] = "$Id$";
#include "dbinc/db_shash.h"
#include "dbinc/lock.h"
-static gint __ram_add __P((DBC *, db_recno_t *, DBT *, u_int32_t, u_int32_t));
-static gint __ram_source __P((DB *));
-static gint __ram_sread __P((DBC *, db_recno_t));
-static gint __ram_update __P((DBC *, db_recno_t, int));
+static int __ram_add __P((DBC *, db_recno_t *, DBT *, u_int32_t, u_int32_t));
+static int __ram_source __P((DB *));
+static int __ram_sread __P((DBC *, db_recno_t));
+static int __ram_update __P((DBC *, db_recno_t, int));
/*
* In recno, there are two meanings to the on-page "deleted" flag. If we're
@@ -104,20 +104,20 @@ static gint __ram_update __P((DBC *, db_recno_t, int));
* __ram_open --
* Recno open function.
*
- * PUBLIC: gint __ram_open __P((DB *,
- * PUBLIC: DB_TXN *, const gchar *, db_pgno_t, u_int32_t));
+ * PUBLIC: int __ram_open __P((DB *,
+ * PUBLIC: DB_TXN *, const char *, db_pgno_t, u_int32_t));
*/
-gint
+int
__ram_open(dbp, txn, name, base_pgno, flags)
DB *dbp;
DB_TXN *txn;
- const gchar *name;
+ const char *name;
db_pgno_t base_pgno;
u_int32_t flags;
{
BTREE *t;
DBC *dbc;
- gint ret, t_ret;
+ int ret, t_ret;
COMPQUIET(name, NULL);
t = dbp->bt_internal;
@@ -163,15 +163,15 @@ __ram_open(dbp, txn, name, base_pgno, flags)
* __ram_append --
* Recno append function.
*
- * PUBLIC: gint __ram_append __P((DBC *, DBT *, DBT *));
+ * PUBLIC: int __ram_append __P((DBC *, DBT *, DBT *));
*/
-gint
+int
__ram_append(dbc, key, data)
DBC *dbc;
DBT *key, *data;
{
BTREE_CURSOR *cp;
- gint ret;
+ int ret;
cp = (BTREE_CURSOR *)dbc->internal;
@@ -196,9 +196,9 @@ __ram_append(dbc, key, data)
* __ram_c_del --
* Recno cursor->c_del function.
*
- * PUBLIC: gint __ram_c_del __P((DBC *));
+ * PUBLIC: int __ram_c_del __P((DBC *));
*/
-gint
+int
__ram_c_del(dbc)
DBC *dbc;
{
@@ -209,7 +209,7 @@ __ram_c_del(dbc)
DB_LSN lsn;
DBT hdr, data;
EPG *epg;
- gint exact, ret, stack;
+ int exact, ret, stack;
dbp = dbc->dbp;
cp = (BTREE_CURSOR *)dbc->internal;
@@ -316,7 +316,7 @@ __ram_c_del(dbc)
hdr.data = &bk;
hdr.size = SSZA(BKEYDATA, data);
memset(&data, 0, sizeof(data));
- data.data = (gpointer)"";
+ data.data = (void *)"";
data.size = 0;
if ((ret = __db_pitem(dbc,
cp->page, cp->indx, BKEYDATA_SIZE(0), &hdr, &data)) != 0)
@@ -335,10 +335,10 @@ err: if (stack)
* __ram_c_get --
* Recno cursor->c_get function.
*
- * PUBLIC: gint __ram_c_get
+ * PUBLIC: int __ram_c_get
* PUBLIC: __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
*/
-gint
+int
__ram_c_get(dbc, key, data, flags, pgnop)
DBC *dbc;
DBT *key, *data;
@@ -347,7 +347,7 @@ __ram_c_get(dbc, key, data, flags, pgnop)
{
BTREE_CURSOR *cp;
DB *dbp;
- gint cmp, exact, ret;
+ int cmp, exact, ret;
COMPQUIET(pgnop, NULL);
@@ -567,9 +567,9 @@ err: CD_CLR(cp);
* __ram_c_put --
* Recno cursor->c_put function.
*
- * PUBLIC: gint __ram_c_put __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
+ * PUBLIC: int __ram_c_put __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
*/
-gint
+int
__ram_c_put(dbc, key, data, flags, pgnop)
DBC *dbc;
DBT *key, *data;
@@ -579,9 +579,9 @@ __ram_c_put(dbc, key, data, flags, pgnop)
BTREE_CURSOR *cp;
DB *dbp;
DB_LSN lsn;
- gint exact, nc, ret, t_ret;
+ int exact, nc, ret, t_ret;
u_int32_t iiflags;
- gpointer arg;
+ void *arg;
COMPQUIET(pgnop, NULL);
@@ -725,9 +725,9 @@ err: CD_CLR(cp);
* __ram_ca --
* Adjust cursors. Returns the number of relevant cursors.
*
- * PUBLIC: gint __ram_ca __P((DBC *, ca_recno_arg));
+ * PUBLIC: int __ram_ca __P((DBC *, ca_recno_arg));
*/
-gint
+int
__ram_ca(dbc_arg, op)
DBC *dbc_arg;
ca_recno_arg op;
@@ -737,7 +737,7 @@ __ram_ca(dbc_arg, op)
DB_ENV *dbenv;
DBC *dbc;
db_recno_t recno;
- gint adjusted, found;
+ int adjusted, found;
u_int32_t order;
dbp = dbc_arg->dbp;
@@ -868,14 +868,14 @@ iafter: if (!adjusted && C_LESSTHAN(cp_arg, cp)) {
* __ram_getno --
* Check the user's record number, and make sure we've seen it.
*
- * PUBLIC: gint __ram_getno __P((DBC *, const DBT *, db_recno_t *, int));
+ * PUBLIC: int __ram_getno __P((DBC *, const DBT *, db_recno_t *, int));
*/
-gint
+int
__ram_getno(dbc, key, rep, can_create)
DBC *dbc;
const DBT *key;
db_recno_t *rep;
- gint can_create;
+ int can_create;
{
DB *dbp;
db_recno_t recno;
@@ -906,13 +906,13 @@ static int
__ram_update(dbc, recno, can_create)
DBC *dbc;
db_recno_t recno;
- gint can_create;
+ int can_create;
{
BTREE *t;
DB *dbp;
DBT *rdata;
db_recno_t nrecs;
- gint ret;
+ int ret;
dbp = dbc->dbp;
t = dbp->bt_internal;
@@ -964,8 +964,8 @@ __ram_source(dbp)
DB *dbp;
{
BTREE *t;
- gchar *source;
- gint ret;
+ char *source;
+ int ret;
t = dbp->bt_internal;
@@ -996,9 +996,9 @@ __ram_source(dbp)
* __ram_writeback --
* Rewrite the backing file.
*
- * PUBLIC: gint __ram_writeback __P((DB *));
+ * PUBLIC: int __ram_writeback __P((DB *));
*/
-gint
+int
__ram_writeback(dbp)
DB *dbp;
{
@@ -1008,7 +1008,7 @@ __ram_writeback(dbp)
DBT key, data;
FILE *fp;
db_recno_t keyno;
- gint ret, t_ret;
+ int ret, t_ret;
u_int8_t delim, *pad;
t = dbp->bt_internal;
@@ -1160,7 +1160,7 @@ __ram_sread(dbc, top)
DBT data, *rdata;
db_recno_t recno;
size_t len;
- gint ch, ret, was_modified;
+ int ch, ret, was_modified;
t = dbc->dbp->bt_internal;
dbp = dbc->dbp;
@@ -1259,7 +1259,7 @@ __ram_add(dbc, recnop, data, flags, bi_flags)
u_int32_t flags, bi_flags;
{
BTREE_CURSOR *cp;
- gint exact, ret, stack;
+ int exact, ret, stack;
cp = (BTREE_CURSOR *)dbc->internal;
diff --git a/libdb/btree/bt_rsearch.c b/libdb/btree/bt_rsearch.c
index 9f9023b..486584d 100644
--- a/libdb/btree/bt_rsearch.c
+++ b/libdb/btree/bt_rsearch.c
@@ -40,7 +40,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -57,14 +57,14 @@ static const gchar revid[] = "$Id$";
* __bam_rsearch --
* Search a btree for a record number.
*
- * PUBLIC: gint __bam_rsearch __P((DBC *, db_recno_t *, u_int32_t, int, gint *));
+ * PUBLIC: int __bam_rsearch __P((DBC *, db_recno_t *, u_int32_t, int, int *));
*/
-gint
+int
__bam_rsearch(dbc, recnop, flags, stop, exactp)
DBC *dbc;
db_recno_t *recnop;
u_int32_t flags;
- gint stop, *exactp;
+ int stop, *exactp;
{
BINTERNAL *bi;
BTREE_CURSOR *cp;
@@ -77,7 +77,7 @@ __bam_rsearch(dbc, recnop, flags, stop, exactp)
db_lockmode_t lock_mode;
db_pgno_t pg;
db_recno_t recno, t_recno, total;
- gint ret, stack;
+ int ret, stack;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -308,9 +308,9 @@ err: BT_STK_POP(cp);
* __bam_adjust --
* Adjust the tree after adding or deleting a record.
*
- * PUBLIC: gint __bam_adjust __P((DBC *, int32_t));
+ * PUBLIC: int __bam_adjust __P((DBC *, int32_t));
*/
-gint
+int
__bam_adjust(dbc, adjust)
DBC *dbc;
int32_t adjust;
@@ -321,7 +321,7 @@ __bam_adjust(dbc, adjust)
EPG *epg;
PAGE *h;
db_pgno_t root_pgno;
- gint ret;
+ int ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -363,9 +363,9 @@ __bam_adjust(dbc, adjust)
* __bam_nrecs --
* Return the number of records in the tree.
*
- * PUBLIC: gint __bam_nrecs __P((DBC *, db_recno_t *));
+ * PUBLIC: int __bam_nrecs __P((DBC *, db_recno_t *));
*/
-gint
+int
__bam_nrecs(dbc, rep)
DBC *dbc;
db_recno_t *rep;
@@ -375,7 +375,7 @@ __bam_nrecs(dbc, rep)
DB_MPOOLFILE *mpf;
PAGE *h;
db_pgno_t pgno;
- gint ret;
+ int ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
diff --git a/libdb/btree/bt_search.c b/libdb/btree/bt_search.c
index f03c670..70f7568 100644
--- a/libdb/btree/bt_search.c
+++ b/libdb/btree/bt_search.c
@@ -43,7 +43,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -62,16 +62,16 @@ static const gchar revid[] = "$Id$";
* __bam_search --
* Search a btree for a key.
*
- * PUBLIC: gint __bam_search __P((DBC *, db_pgno_t,
- * PUBLIC: const DBT *, u_int32_t, int, db_recno_t *, gint *));
+ * PUBLIC: int __bam_search __P((DBC *, db_pgno_t,
+ * PUBLIC: const DBT *, u_int32_t, int, db_recno_t *, int *));
*/
-gint
+int
__bam_search(dbc, root_pgno, key, flags, stop, recnop, exactp)
DBC *dbc;
db_pgno_t root_pgno;
const DBT *key;
u_int32_t flags;
- gint stop, *exactp;
+ int stop, *exactp;
db_recno_t *recnop;
{
BTREE *t;
@@ -84,8 +84,8 @@ __bam_search(dbc, root_pgno, key, flags, stop, recnop, exactp)
db_lockmode_t lock_mode;
db_pgno_t pg;
db_recno_t recno;
- gint adjust, cmp, deloffset, ret, stack;
- gint (*func) __P((DB *, const DBT *, const DBT *));
+ int adjust, cmp, deloffset, ret, stack;
+ int (*func) __P((DB *, const DBT *, const DBT *));
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -393,9 +393,9 @@ err: BT_STK_POP(cp);
* __bam_stkrel --
* Release all pages currently held in the stack.
*
- * PUBLIC: gint __bam_stkrel __P((DBC *, u_int32_t));
+ * PUBLIC: int __bam_stkrel __P((DBC *, u_int32_t));
*/
-gint
+int
__bam_stkrel(dbc, flags)
DBC *dbc;
u_int32_t flags;
@@ -404,7 +404,7 @@ __bam_stkrel(dbc, flags)
DB *dbp;
DB_MPOOLFILE *mpf;
EPG *epg;
- gint ret, t_ret;
+ int ret, t_ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -450,16 +450,16 @@ __bam_stkrel(dbc, flags)
* __bam_stkgrow --
* Grow the stack.
*
- * PUBLIC: gint __bam_stkgrow __P((DB_ENV *, BTREE_CURSOR *));
+ * PUBLIC: int __bam_stkgrow __P((DB_ENV *, BTREE_CURSOR *));
*/
-gint
+int
__bam_stkgrow(dbenv, cp)
DB_ENV *dbenv;
BTREE_CURSOR *cp;
{
EPG *p;
size_t entries;
- gint ret;
+ int ret;
entries = cp->esp - cp->sp;
diff --git a/libdb/btree/bt_split.c b/libdb/btree/bt_split.c
index 8ecb861..8112ae3 100644
--- a/libdb/btree/bt_split.c
+++ b/libdb/btree/bt_split.c
@@ -40,7 +40,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -56,29 +56,29 @@ static const gchar revid[] = "$Id$";
#include "dbinc/lock.h"
#include "dbinc/btree.h"
-static gint __bam_broot __P((DBC *, PAGE *, PAGE *, PAGE *));
-static gint __bam_page __P((DBC *, EPG *, EPG *));
-static gint __bam_pinsert __P((DBC *, EPG *, PAGE *, PAGE *, int));
-static gint __bam_psplit __P((DBC *, EPG *, PAGE *, PAGE *, db_indx_t *));
-static gint __bam_root __P((DBC *, EPG *));
-static gint __ram_root __P((DBC *, PAGE *, PAGE *, PAGE *));
+static int __bam_broot __P((DBC *, PAGE *, PAGE *, PAGE *));
+static int __bam_page __P((DBC *, EPG *, EPG *));
+static int __bam_pinsert __P((DBC *, EPG *, PAGE *, PAGE *, int));
+static int __bam_psplit __P((DBC *, EPG *, PAGE *, PAGE *, db_indx_t *));
+static int __bam_root __P((DBC *, EPG *));
+static int __ram_root __P((DBC *, PAGE *, PAGE *, PAGE *));
/*
* __bam_split --
* Split a page.
*
- * PUBLIC: gint __bam_split __P((DBC *, gpointer , db_pgno_t *));
+ * PUBLIC: int __bam_split __P((DBC *, void *, db_pgno_t *));
*/
-gint
+int
__bam_split(dbc, arg, root_pgnop)
DBC *dbc;
- gpointer arg;
+ void *arg;
db_pgno_t *root_pgnop;
{
BTREE_CURSOR *cp;
enum { UP, DOWN } dir;
db_pgno_t root_pgno;
- gint exact, level, ret;
+ int exact, level, ret;
cp = (BTREE_CURSOR *)dbc->internal;
root_pgno = cp->root;
@@ -183,7 +183,7 @@ __bam_root(dbc, cp)
PAGE *lp, *rp;
db_indx_t split;
u_int32_t opflags;
- gint ret;
+ int ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -277,7 +277,7 @@ __bam_page(dbc, pp, cp)
PAGE *lp, *rp, *alloc_rp, *tp;
db_indx_t split;
u_int32_t opflags;
- gint ret, t_ret;
+ int ret, t_ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -516,7 +516,7 @@ __bam_broot(dbc, rootp, lp, rp)
DB *dbp;
DBT hdr, data;
db_pgno_t root_pgno;
- gint ret;
+ int ret;
dbp = dbc->dbp;
cp = (BTREE_CURSOR *)dbc->internal;
@@ -645,7 +645,7 @@ __ram_root(dbc, rootp, lp, rp)
DBT hdr;
RINTERNAL ri;
db_pgno_t root_pgno;
- gint ret;
+ int ret;
dbp = dbc->dbp;
root_pgno = dbc->internal->root;
@@ -682,7 +682,7 @@ __bam_pinsert(dbc, parent, lchild, rchild, space_check)
DBC *dbc;
EPG *parent;
PAGE *lchild, *rchild;
- gint space_check;
+ int space_check;
{
BINTERNAL bi, *child_bi;
BKEYDATA *child_bk, *tmp_bk;
@@ -696,7 +696,7 @@ __bam_pinsert(dbc, parent, lchild, rchild, space_check)
db_recno_t nrecs;
size_t (*func) __P((DB *, const DBT *, const DBT *));
u_int32_t n, nbytes, nksize;
- gint ret;
+ int ret;
dbp = dbc->dbp;
cp = (BTREE_CURSOR *)dbc->internal;
@@ -929,7 +929,7 @@ __bam_psplit(dbc, cp, lp, rp, splitret)
DB *dbp;
PAGE *pp;
db_indx_t half, *inp, nbytes, off, splitp, top;
- gint adjust, cnt, iflag, isbigkey, ret;
+ int adjust, cnt, iflag, isbigkey, ret;
dbp = dbc->dbp;
pp = cp->page;
@@ -1119,9 +1119,9 @@ sort: splitp = off;
* __bam_copy --
* Copy a set of records from one page to another.
*
- * PUBLIC: gint __bam_copy __P((DB *, PAGE *, PAGE *, u_int32_t, u_int32_t));
+ * PUBLIC: int __bam_copy __P((DB *, PAGE *, PAGE *, u_int32_t, u_int32_t));
*/
-gint
+int
__bam_copy(dbp, pp, cp, nxt, stop)
DB *dbp;
PAGE *pp, *cp;
diff --git a/libdb/btree/bt_stat.c b/libdb/btree/bt_stat.c
index f343a9d..e48616f 100644
--- a/libdb/btree/bt_stat.c
+++ b/libdb/btree/bt_stat.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -28,12 +28,12 @@ static const gchar revid[] = "$Id$";
* __bam_stat --
* Gather/print the btree statistics
*
- * PUBLIC: gint __bam_stat __P((DB *, gpointer , u_int32_t));
+ * PUBLIC: int __bam_stat __P((DB *, void *, u_int32_t));
*/
-gint
+int
__bam_stat(dbp, spp, flags)
DB *dbp;
- gpointer spp;
+ void *spp;
u_int32_t flags;
{
BTMETA *meta;
@@ -45,7 +45,7 @@ __bam_stat(dbp, spp, flags)
DB_MPOOLFILE *mpf;
PAGE *h;
db_pgno_t pgno;
- gint ret, t_ret, write_meta;
+ int ret, t_ret, write_meta;
PANIC_CHECK(dbp->dbenv);
DB_ILLEGAL_BEFORE_OPEN(dbp, "DB->stat");
@@ -200,16 +200,16 @@ err: /* Discard the second page. */
* __bam_traverse --
* Walk a Btree database.
*
- * PUBLIC: gint __bam_traverse __P((DBC *, db_lockmode_t,
- * PUBLIC: db_pgno_t, gint (*)(DB *, PAGE *, gpointer , gint *), gpointer ));
+ * PUBLIC: int __bam_traverse __P((DBC *, db_lockmode_t,
+ * PUBLIC: db_pgno_t, int (*)(DB *, PAGE *, void *, int *), void *));
*/
-gint
+int
__bam_traverse(dbc, mode, root_pgno, callback, cookie)
DBC *dbc;
db_lockmode_t mode;
db_pgno_t root_pgno;
- gint (*callback)__P((DB *, PAGE *, gpointer , gint *));
- gpointer cookie;
+ int (*callback)__P((DB *, PAGE *, void *, int *));
+ void *cookie;
{
BINTERNAL *bi;
BKEYDATA *bk;
@@ -219,7 +219,7 @@ __bam_traverse(dbc, mode, root_pgno, callback, cookie)
PAGE *h;
RINTERNAL *ri;
db_indx_t indx;
- gint already_put, ret, t_ret;
+ int already_put, ret, t_ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -301,14 +301,14 @@ err: if (!already_put && (t_ret = mpf->put(mpf, h, 0)) != 0 && ret != 0)
* __bam_stat_callback --
* Statistics callback.
*
- * PUBLIC: gint __bam_stat_callback __P((DB *, PAGE *, gpointer , gint *));
+ * PUBLIC: int __bam_stat_callback __P((DB *, PAGE *, void *, int *));
*/
-gint
+int
__bam_stat_callback(dbp, h, cookie, putp)
DB *dbp;
PAGE *h;
- gpointer cookie;
- gint *putp;
+ void *cookie;
+ int *putp;
{
DB_BTREE_STAT *sp;
db_indx_t indx, *inp, top;
@@ -394,10 +394,10 @@ __bam_stat_callback(dbp, h, cookie, putp)
* Return proportion of keys relative to given key. The numbers are
* slightly skewed due to on page duplicates.
*
- * PUBLIC: gint __bam_key_range __P((DB *,
+ * PUBLIC: int __bam_key_range __P((DB *,
* PUBLIC: DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t));
*/
-gint
+int
__bam_key_range(dbp, txn, dbt, kp, flags)
DB *dbp;
DB_TXN *txn;
@@ -409,7 +409,7 @@ __bam_key_range(dbp, txn, dbt, kp, flags)
DBC *dbc;
EPG *sp;
double factor;
- gint exact, ret, t_ret;
+ int exact, ret, t_ret;
PANIC_CHECK(dbp->dbenv);
DB_ILLEGAL_BEFORE_OPEN(dbp, "DB->key_range");
diff --git a/libdb/btree/bt_upgrade.c b/libdb/btree/bt_upgrade.c
index b39c301..1fc2fa5 100644
--- a/libdb/btree/bt_upgrade.c
+++ b/libdb/btree/bt_upgrade.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -26,18 +26,18 @@ static const gchar revid[] = "$Id$";
* __bam_30_btreemeta --
* Upgrade the metadata pages from version 6 to version 7.
*
- * PUBLIC: gint __bam_30_btreemeta __P((DB *, gchar *, u_int8_t *));
+ * PUBLIC: int __bam_30_btreemeta __P((DB *, char *, u_int8_t *));
*/
-gint
+int
__bam_30_btreemeta(dbp, real_name, buf)
DB *dbp;
- gchar *real_name;
+ char *real_name;
u_int8_t *buf;
{
BTMETA30 *newmeta;
BTMETA2X *oldmeta;
DB_ENV *dbenv;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
@@ -72,17 +72,17 @@ __bam_30_btreemeta(dbp, real_name, buf)
* __bam_31_btreemeta --
* Upgrade the database from version 7 to version 8.
*
- * PUBLIC: gint __bam_31_btreemeta
- * PUBLIC: __P((DB *, gchar *, u_int32_t, DB_FH *, PAGE *, gint *));
+ * PUBLIC: int __bam_31_btreemeta
+ * PUBLIC: __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
*/
-gint
+int
__bam_31_btreemeta(dbp, real_name, flags, fhp, h, dirtyp)
DB *dbp;
- gchar *real_name;
+ char *real_name;
u_int32_t flags;
DB_FH *fhp;
PAGE *h;
- gint *dirtyp;
+ int *dirtyp;
{
BTMETA31 *newmeta;
BTMETA30 *oldmeta;
@@ -126,22 +126,22 @@ __bam_31_btreemeta(dbp, real_name, flags, fhp, h, dirtyp)
* __bam_31_lbtree --
* Upgrade the database btree leaf pages.
*
- * PUBLIC: gint __bam_31_lbtree
- * PUBLIC: __P((DB *, gchar *, u_int32_t, DB_FH *, PAGE *, gint *));
+ * PUBLIC: int __bam_31_lbtree
+ * PUBLIC: __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
*/
-gint
+int
__bam_31_lbtree(dbp, real_name, flags, fhp, h, dirtyp)
DB *dbp;
- gchar *real_name;
+ char *real_name;
u_int32_t flags;
DB_FH *fhp;
PAGE *h;
- gint *dirtyp;
+ int *dirtyp;
{
BKEYDATA *bk;
db_pgno_t pgno;
db_indx_t indx;
- gint ret;
+ int ret;
ret = 0;
for (indx = O_INDX; indx < NUM_ENT(h); indx += P_INDX) {
diff --git a/libdb/btree/bt_verify.c b/libdb/btree/bt_verify.c
index 6147ed0..6977e7e 100644
--- a/libdb/btree/bt_verify.c
+++ b/libdb/btree/bt_verify.c
@@ -10,7 +10,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,12 +24,12 @@ static const gchar revid[] = "$Id$";
#include "dbinc/db_verify.h"
#include "dbinc/btree.h"
-static gint __bam_safe_getdata __P((DB *, PAGE *, u_int32_t, int, DBT *, gint *));
-static gint __bam_vrfy_inp __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t,
+static int __bam_safe_getdata __P((DB *, PAGE *, u_int32_t, int, DBT *, int *));
+static int __bam_vrfy_inp __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t,
db_indx_t *, u_int32_t));
-static gint __bam_vrfy_treeorder __P((DB *, db_pgno_t, PAGE *, BINTERNAL *,
- BINTERNAL *, gint (*)(DB *, const DBT *, const DBT *), u_int32_t));
-static gint __ram_vrfy_inp __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t,
+static int __bam_vrfy_treeorder __P((DB *, db_pgno_t, PAGE *, BINTERNAL *,
+ BINTERNAL *, int (*)(DB *, const DBT *, const DBT *), u_int32_t));
+static int __ram_vrfy_inp __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t,
db_indx_t *, u_int32_t));
#define OKFLAGS (DB_AGGRESSIVE | DB_NOORDERCHK | DB_SALVAGE)
@@ -38,10 +38,10 @@ static gint __ram_vrfy_inp __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t,
* __bam_vrfy_meta --
* Verify the btree-specific part of a metadata page.
*
- * PUBLIC: gint __bam_vrfy_meta __P((DB *, VRFY_DBINFO *, BTMETA *,
+ * PUBLIC: int __bam_vrfy_meta __P((DB *, VRFY_DBINFO *, BTMETA *,
* PUBLIC: db_pgno_t, u_int32_t));
*/
-gint
+int
__bam_vrfy_meta(dbp, vdp, meta, pgno, flags)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -50,7 +50,7 @@ __bam_vrfy_meta(dbp, vdp, meta, pgno, flags)
u_int32_t flags;
{
VRFY_PAGEINFO *pip;
- gint isbad, t_ret, ret;
+ int isbad, t_ret, ret;
db_indx_t ovflsize;
if ((ret = __db_vrfy_getpageinfo(vdp, pgno, &pip)) != 0)
@@ -189,10 +189,10 @@ err: if ((t_ret =
* __ram_vrfy_leaf --
* Verify a recno leaf page.
*
- * PUBLIC: gint __ram_vrfy_leaf __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t,
+ * PUBLIC: int __ram_vrfy_leaf __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t,
* PUBLIC: u_int32_t));
*/
-gint
+int
__ram_vrfy_leaf(dbp, vdp, h, pgno, flags)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -203,7 +203,7 @@ __ram_vrfy_leaf(dbp, vdp, h, pgno, flags)
BKEYDATA *bk;
VRFY_PAGEINFO *pip;
db_indx_t i;
- gint ret, t_ret, isbad;
+ int ret, t_ret, isbad;
u_int32_t re_len_guess, len;
isbad = 0;
@@ -299,10 +299,10 @@ err: if ((t_ret =
* __bam_vrfy --
* Verify a btree leaf or internal page.
*
- * PUBLIC: gint __bam_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t,
+ * PUBLIC: int __bam_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t,
* PUBLIC: u_int32_t));
*/
-gint
+int
__bam_vrfy(dbp, vdp, h, pgno, flags)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -311,7 +311,7 @@ __bam_vrfy(dbp, vdp, h, pgno, flags)
u_int32_t flags;
{
VRFY_PAGEINFO *pip;
- gint ret, t_ret, isbad;
+ int ret, t_ret, isbad;
isbad = 0;
if ((ret = __db_vrfy_getpageinfo(vdp, pgno, &pip)) != 0)
@@ -404,7 +404,7 @@ __ram_vrfy_inp(dbp, vdp, h, pgno, nentriesp, flags)
RINTERNAL *ri;
VRFY_CHILDINFO child;
VRFY_PAGEINFO *pip;
- gint ret, t_ret, isbad;
+ int ret, t_ret, isbad;
u_int32_t himark, i, offset, nentries;
db_indx_t *inp;
u_int8_t *pagelayout, *p;
@@ -522,7 +522,7 @@ __bam_vrfy_inp(dbp, vdp, h, pgno, nentriesp, flags)
BOVERFLOW *bo;
VRFY_CHILDINFO child;
VRFY_PAGEINFO *pip;
- gint isbad, initem, isdupitem, ret, t_ret;
+ int isbad, initem, isdupitem, ret, t_ret;
u_int32_t himark, offset; /* These would be db_indx_ts but for algnmt.*/
u_int32_t i, endoff, nentries;
u_int8_t *pagelayout;
@@ -863,17 +863,17 @@ err: if (nentriesp != NULL)
* and we run into an overflow page, carp and return DB_VERIFY_BAD;
* we shouldn't be called if any exist.
*
- * PUBLIC: gint __bam_vrfy_itemorder __P((DB *, VRFY_DBINFO *, PAGE *,
+ * PUBLIC: int __bam_vrfy_itemorder __P((DB *, VRFY_DBINFO *, PAGE *,
* PUBLIC: db_pgno_t, u_int32_t, int, int, u_int32_t));
*/
-gint
+int
__bam_vrfy_itemorder(dbp, vdp, h, pgno, nentries, ovflok, hasdups, flags)
DB *dbp;
VRFY_DBINFO *vdp;
PAGE *h;
db_pgno_t pgno;
u_int32_t nentries;
- gint ovflok, hasdups;
+ int ovflok, hasdups;
u_int32_t flags;
{
DBT dbta, dbtb, dup_1, dup_2, *p1, *p2, *tmp;
@@ -883,10 +883,10 @@ __bam_vrfy_itemorder(dbp, vdp, h, pgno, nentries, ovflok, hasdups, flags)
BOVERFLOW *bo;
VRFY_PAGEINFO *pip;
db_indx_t i;
- gint cmp, freedup_1, freedup_2, isbad, ret, t_ret;
- gint (*dupfunc) __P((DB *, const DBT *, const DBT *));
- gint (*func) __P((DB *, const DBT *, const DBT *));
- gpointer buf1, *buf2, *tmpbuf;
+ int cmp, freedup_1, freedup_2, isbad, ret, t_ret;
+ int (*dupfunc) __P((DB *, const DBT *, const DBT *));
+ int (*func) __P((DB *, const DBT *, const DBT *));
+ void *buf1, *buf2, *tmpbuf;
/*
* We need to work in the ORDERCHKONLY environment where we might
@@ -1160,10 +1160,10 @@ err: if (pip != NULL && ((t_ret =
* Verify the tree structure of a btree database (including the master
* database containing subdbs).
*
- * PUBLIC: gint __bam_vrfy_structure __P((DB *, VRFY_DBINFO *, db_pgno_t,
+ * PUBLIC: int __bam_vrfy_structure __P((DB *, VRFY_DBINFO *, db_pgno_t,
* PUBLIC: u_int32_t));
*/
-gint
+int
__bam_vrfy_structure(dbp, vdp, meta_pgno, flags)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -1173,7 +1173,7 @@ __bam_vrfy_structure(dbp, vdp, meta_pgno, flags)
DB *pgset;
VRFY_PAGEINFO *mip, *rip;
db_pgno_t root, p;
- gint t_ret, ret;
+ int t_ret, ret;
u_int32_t nrecs, level, relen, stflags;
mip = rip = 0;
@@ -1182,7 +1182,7 @@ __bam_vrfy_structure(dbp, vdp, meta_pgno, flags)
if ((ret = __db_vrfy_getpageinfo(vdp, meta_pgno, &mip)) != 0)
return (ret);
- if ((ret = __db_vrfy_pgset_get(pgset, meta_pgno, (gint *)&p)) != 0)
+ if ((ret = __db_vrfy_pgset_get(pgset, meta_pgno, (int *)&p)) != 0)
goto err;
if (p != 0) {
EPRINT((dbp->dbenv,
@@ -1273,16 +1273,16 @@ err: if (mip != NULL && ((t_ret =
* Note that this is public because it must be called to verify
* offpage dup trees, including from hash.
*
- * PUBLIC: gint __bam_vrfy_subtree __P((DB *, VRFY_DBINFO *, db_pgno_t, gpointer ,
- * PUBLIC: gpointer , u_int32_t, u_int32_t *, u_int32_t *, u_int32_t *));
+ * PUBLIC: int __bam_vrfy_subtree __P((DB *, VRFY_DBINFO *, db_pgno_t, void *,
+ * PUBLIC: void *, u_int32_t, u_int32_t *, u_int32_t *, u_int32_t *));
*/
-gint
+int
__bam_vrfy_subtree(dbp,
vdp, pgno, l, r, flags, levelp, nrecsp, relenp)
DB *dbp;
VRFY_DBINFO *vdp;
db_pgno_t pgno;
- gpointer l, *r;
+ void *l, *r;
u_int32_t flags, *levelp, *nrecsp, *relenp;
{
BINTERNAL *li, *ri, *lp, *rp;
@@ -1297,8 +1297,8 @@ __bam_vrfy_subtree(dbp,
db_recno_t child_nrecs, nrecs;
u_int32_t child_level, child_relen, level, relen, stflags;
u_int8_t leaf_type;
- gint (*func) __P((DB *, const DBT *, const DBT *));
- gint isbad, p, ret, t_ret, toplevel;
+ int (*func) __P((DB *, const DBT *, const DBT *));
+ int isbad, p, ret, t_ret, toplevel;
mpf = dbp->mpf;
ret = isbad = 0;
@@ -1844,13 +1844,13 @@ __bam_vrfy_treeorder(dbp, pgno, h, lp, rp, func, flags)
db_pgno_t pgno;
PAGE *h;
BINTERNAL *lp, *rp;
- gint (*func) __P((DB *, const DBT *, const DBT *));
+ int (*func) __P((DB *, const DBT *, const DBT *));
u_int32_t flags;
{
BOVERFLOW *bo;
DBT dbt;
db_indx_t last;
- gint ret, cmp;
+ int ret, cmp;
memset(&dbt, 0, sizeof(DBT));
F_SET(&dbt, DB_DBT_MALLOC);
@@ -1970,19 +1970,19 @@ __bam_vrfy_treeorder(dbp, pgno, h, lp, rp, func, flags)
* Safely dump out anything that looks like a key on an alleged
* btree leaf page.
*
- * PUBLIC: gint __bam_salvage __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t,
- * PUBLIC: PAGE *, gpointer , gint (*)(gpointer , gconstpointer ), DBT *,
+ * PUBLIC: int __bam_salvage __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t,
+ * PUBLIC: PAGE *, void *, int (*)(void *, const void *), DBT *,
* PUBLIC: u_int32_t));
*/
-gint
+int
__bam_salvage(dbp, vdp, pgno, pgtype, h, handle, callback, key, flags)
DB *dbp;
VRFY_DBINFO *vdp;
db_pgno_t pgno;
u_int32_t pgtype;
PAGE *h;
- gpointer handle;
- gint (*callback) __P((gpointer , gconstpointer ));
+ void *handle;
+ int (*callback) __P((void *, const void *));
DBT *key;
u_int32_t flags;
{
@@ -1992,8 +1992,8 @@ __bam_salvage(dbp, vdp, pgno, pgtype, h, handle, callback, key, flags)
db_indx_t i, beg, end, *inp;
u_int32_t himark;
u_int8_t *pgmap;
- gpointer ovflbuf;
- gint t_ret, ret, err_ret;
+ void *ovflbuf;
+ int t_ret, ret, err_ret;
/* Shut up lint. */
COMPQUIET(end, 0);
@@ -2187,22 +2187,22 @@ err: if (pgmap != NULL)
* Walk a known-good btree or recno internal page which is part of
* a dup tree, calling __db_salvage_duptree on each child page.
*
- * PUBLIC: gint __bam_salvage_walkdupint __P((DB *, VRFY_DBINFO *, PAGE *,
- * PUBLIC: DBT *, gpointer , gint (*)(gpointer , gconstpointer ), u_int32_t));
+ * PUBLIC: int __bam_salvage_walkdupint __P((DB *, VRFY_DBINFO *, PAGE *,
+ * PUBLIC: DBT *, void *, int (*)(void *, const void *), u_int32_t));
*/
-gint
+int
__bam_salvage_walkdupint(dbp, vdp, h, key, handle, callback, flags)
DB *dbp;
VRFY_DBINFO *vdp;
PAGE *h;
DBT *key;
- gpointer handle;
- gint (*callback) __P((gpointer , gconstpointer ));
+ void *handle;
+ int (*callback) __P((void *, const void *));
u_int32_t flags;
{
RINTERNAL *ri;
BINTERNAL *bi;
- gint ret, t_ret;
+ int ret, t_ret;
db_indx_t i;
ret = 0;
@@ -2247,10 +2247,10 @@ __bam_salvage_walkdupint(dbp, vdp, h, key, handle, callback, flags)
* trouble of walking internal pages--they just don't matter, except
* for the left branch.
*
- * PUBLIC: gint __bam_meta2pgset __P((DB *, VRFY_DBINFO *, BTMETA *,
+ * PUBLIC: int __bam_meta2pgset __P((DB *, VRFY_DBINFO *, BTMETA *,
* PUBLIC: u_int32_t, DB *));
*/
-gint
+int
__bam_meta2pgset(dbp, vdp, btmeta, flags, pgset)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -2263,7 +2263,7 @@ __bam_meta2pgset(dbp, vdp, btmeta, flags, pgset)
PAGE *h;
RINTERNAL *ri;
db_pgno_t current, p;
- gint err_ret, ret;
+ int err_ret, ret;
mpf = dbp->mpf;
h = NULL;
@@ -2319,7 +2319,7 @@ traverse:
break;
}
- if ((ret = __db_vrfy_pgset_get(pgset, current, (gint *)&p)) != 0)
+ if ((ret = __db_vrfy_pgset_get(pgset, current, (int *)&p)) != 0)
goto err;
if (p != 0) {
@@ -2358,9 +2358,9 @@ __bam_safe_getdata(dbp, h, i, ovflok, dbt, freedbtp)
DB *dbp;
PAGE *h;
u_int32_t i;
- gint ovflok;
+ int ovflok;
DBT *dbt;
- gint *freedbtp;
+ int *freedbtp;
{
BKEYDATA *bk;
BOVERFLOW *bo;
diff --git a/libdb/btree/btree_auto.c b/libdb/btree/btree_auto.c
index 82d3698..e94aca2 100644
--- a/libdb/btree/btree_auto.c
+++ b/libdb/btree/btree_auto.c
@@ -19,11 +19,11 @@
#include "dbinc/txn.h"
/*
- * PUBLIC: gint __bam_split_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __bam_split_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, u_int32_t,
* PUBLIC: db_pgno_t, DB_LSN *, db_pgno_t, const DBT *, u_int32_t));
*/
-gint
+int
__bam_split_log(dbp, txnid, ret_lsnp, flags, left, llsn, right, rlsn, indx,
npgno, nlsn, root_pgno, pg, opflags)
DB *dbp;
@@ -47,7 +47,7 @@ __bam_split_log(dbp, txnid, ret_lsnp, flags, left, llsn, right, rlsn, indx,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -180,16 +180,16 @@ __bam_split_log(dbp, txnid, ret_lsnp, flags, left, llsn, right, rlsn, indx,
}
/*
- * PUBLIC: gint __bam_split_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_split_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_split_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -244,21 +244,21 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __bam_split_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_split_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_split_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__bam_split_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -298,18 +298,18 @@ __bam_split_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __bam_split_read __P((DB_ENV *, gpointer , __bam_split_args **));
+ * PUBLIC: int __bam_split_read __P((DB_ENV *, void *, __bam_split_args **));
*/
-gint
+int
__bam_split_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__bam_split_args **argpp;
{
__bam_split_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__bam_split_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -375,11 +375,11 @@ __bam_split_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __bam_rsplit_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __bam_rsplit_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_pgno_t, const DBT *, db_pgno_t, db_pgno_t,
* PUBLIC: const DBT *, DB_LSN *));
*/
-gint
+int
__bam_rsplit_log(dbp, txnid, ret_lsnp, flags, pgno, pgdbt, root_pgno, nrec, rootent,
rootlsn)
DB *dbp;
@@ -399,7 +399,7 @@ __bam_rsplit_log(dbp, txnid, ret_lsnp, flags, pgno, pgdbt, root_pgno, nrec, root
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -515,16 +515,16 @@ __bam_rsplit_log(dbp, txnid, ret_lsnp, flags, pgno, pgdbt, root_pgno, nrec, root
}
/*
- * PUBLIC: gint __bam_rsplit_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_rsplit_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_rsplit_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -569,21 +569,21 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __bam_rsplit_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_rsplit_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_rsplit_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__bam_rsplit_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -622,18 +622,18 @@ __bam_rsplit_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __bam_rsplit_read __P((DB_ENV *, gpointer , __bam_rsplit_args **));
+ * PUBLIC: int __bam_rsplit_read __P((DB_ENV *, void *, __bam_rsplit_args **));
*/
-gint
+int
__bam_rsplit_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__bam_rsplit_args **argpp;
{
__bam_rsplit_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__bam_rsplit_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -687,11 +687,11 @@ __bam_rsplit_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __bam_adj_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __bam_adj_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_pgno_t, DB_LSN *, u_int32_t, u_int32_t,
* PUBLIC: u_int32_t));
*/
-gint
+int
__bam_adj_log(dbp, txnid, ret_lsnp, flags, pgno, lsn, indx, indx_copy, is_insert)
DB *dbp;
DB_TXN *txnid;
@@ -708,7 +708,7 @@ __bam_adj_log(dbp, txnid, ret_lsnp, flags, pgno, lsn, indx, indx_copy, is_insert
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -805,16 +805,16 @@ __bam_adj_log(dbp, txnid, ret_lsnp, flags, pgno, lsn, indx, indx_copy, is_insert
}
/*
- * PUBLIC: gint __bam_adj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_adj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_adj_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -851,19 +851,19 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __bam_adj_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_adj_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_adj_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__bam_adj_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -891,18 +891,18 @@ __bam_adj_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __bam_adj_read __P((DB_ENV *, gpointer , __bam_adj_args **));
+ * PUBLIC: int __bam_adj_read __P((DB_ENV *, void *, __bam_adj_args **));
*/
-gint
+int
__bam_adj_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__bam_adj_args **argpp;
{
__bam_adj_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__bam_adj_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -948,10 +948,10 @@ __bam_adj_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __bam_cadjust_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __bam_cadjust_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_pgno_t, DB_LSN *, u_int32_t, int32_t, u_int32_t));
*/
-gint
+int
__bam_cadjust_log(dbp, txnid, ret_lsnp, flags, pgno, lsn, indx, adjust, opflags)
DB *dbp;
DB_TXN *txnid;
@@ -968,7 +968,7 @@ __bam_cadjust_log(dbp, txnid, ret_lsnp, flags, pgno, lsn, indx, adjust, opflags)
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -1065,16 +1065,16 @@ __bam_cadjust_log(dbp, txnid, ret_lsnp, flags, pgno, lsn, indx, adjust, opflags)
}
/*
- * PUBLIC: gint __bam_cadjust_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_cadjust_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_cadjust_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -1111,19 +1111,19 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __bam_cadjust_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_cadjust_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_cadjust_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__bam_cadjust_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -1151,19 +1151,19 @@ __bam_cadjust_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __bam_cadjust_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int __bam_cadjust_read __P((DB_ENV *, void *,
* PUBLIC: __bam_cadjust_args **));
*/
-gint
+int
__bam_cadjust_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__bam_cadjust_args **argpp;
{
__bam_cadjust_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__bam_cadjust_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -1209,10 +1209,10 @@ __bam_cadjust_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __bam_cdel_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __bam_cdel_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_pgno_t, DB_LSN *, u_int32_t));
*/
-gint
+int
__bam_cdel_log(dbp, txnid, ret_lsnp, flags, pgno, lsn, indx)
DB *dbp;
DB_TXN *txnid;
@@ -1227,7 +1227,7 @@ __bam_cdel_log(dbp, txnid, ret_lsnp, flags, pgno, lsn, indx)
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -1314,16 +1314,16 @@ __bam_cdel_log(dbp, txnid, ret_lsnp, flags, pgno, lsn, indx)
}
/*
- * PUBLIC: gint __bam_cdel_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_cdel_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_cdel_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -1360,19 +1360,19 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __bam_cdel_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_cdel_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_cdel_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__bam_cdel_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -1398,18 +1398,18 @@ __bam_cdel_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __bam_cdel_read __P((DB_ENV *, gpointer , __bam_cdel_args **));
+ * PUBLIC: int __bam_cdel_read __P((DB_ENV *, void *, __bam_cdel_args **));
*/
-gint
+int
__bam_cdel_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__bam_cdel_args **argpp;
{
__bam_cdel_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__bam_cdel_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -1447,11 +1447,11 @@ __bam_cdel_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __bam_repl_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __bam_repl_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_pgno_t, DB_LSN *, u_int32_t, u_int32_t,
* PUBLIC: const DBT *, const DBT *, u_int32_t, u_int32_t));
*/
-gint
+int
__bam_repl_log(dbp, txnid, ret_lsnp, flags, pgno, lsn, indx, isdeleted, orig,
repl, prefix, suffix)
DB *dbp;
@@ -1473,7 +1473,7 @@ __bam_repl_log(dbp, txnid, ret_lsnp, flags, pgno, lsn, indx, isdeleted, orig,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -1599,16 +1599,16 @@ __bam_repl_log(dbp, txnid, ret_lsnp, flags, pgno, lsn, indx, isdeleted, orig,
}
/*
- * PUBLIC: gint __bam_repl_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_repl_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_repl_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -1645,21 +1645,21 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __bam_repl_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_repl_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_repl_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__bam_repl_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -1700,18 +1700,18 @@ __bam_repl_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __bam_repl_read __P((DB_ENV *, gpointer , __bam_repl_args **));
+ * PUBLIC: int __bam_repl_read __P((DB_ENV *, void *, __bam_repl_args **));
*/
-gint
+int
__bam_repl_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__bam_repl_args **argpp;
{
__bam_repl_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__bam_repl_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -1773,10 +1773,10 @@ __bam_repl_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __bam_root_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __bam_root_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_pgno_t, db_pgno_t, DB_LSN *));
*/
-gint
+int
__bam_root_log(dbp, txnid, ret_lsnp, flags, meta_pgno, root_pgno, meta_lsn)
DB *dbp;
DB_TXN *txnid;
@@ -1791,7 +1791,7 @@ __bam_root_log(dbp, txnid, ret_lsnp, flags, meta_pgno, root_pgno, meta_lsn)
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -1878,16 +1878,16 @@ __bam_root_log(dbp, txnid, ret_lsnp, flags, meta_pgno, root_pgno, meta_lsn)
}
/*
- * PUBLIC: gint __bam_root_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_root_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_root_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -1932,19 +1932,19 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __bam_root_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_root_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_root_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__bam_root_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -1970,18 +1970,18 @@ __bam_root_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __bam_root_read __P((DB_ENV *, gpointer , __bam_root_args **));
+ * PUBLIC: int __bam_root_read __P((DB_ENV *, void *, __bam_root_args **));
*/
-gint
+int
__bam_root_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__bam_root_args **argpp;
{
__bam_root_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__bam_root_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -2019,11 +2019,11 @@ __bam_root_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __bam_curadj_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __bam_curadj_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_ca_mode, db_pgno_t, db_pgno_t, db_pgno_t,
* PUBLIC: u_int32_t, u_int32_t, u_int32_t));
*/
-gint
+int
__bam_curadj_log(dbp, txnid, ret_lsnp, flags, mode, from_pgno, to_pgno, left_pgno, first_indx,
from_indx, to_indx)
DB *dbp;
@@ -2043,7 +2043,7 @@ __bam_curadj_log(dbp, txnid, ret_lsnp, flags, mode, from_pgno, to_pgno, left_pgn
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -2148,19 +2148,19 @@ __bam_curadj_log(dbp, txnid, ret_lsnp, flags, mode, from_pgno, to_pgno, left_pgn
}
/*
- * PUBLIC: gint __bam_curadj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_curadj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_curadj_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -2181,19 +2181,19 @@ __bam_curadj_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __bam_curadj_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_curadj_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_curadj_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__bam_curadj_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -2222,18 +2222,18 @@ __bam_curadj_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __bam_curadj_read __P((DB_ENV *, gpointer , __bam_curadj_args **));
+ * PUBLIC: int __bam_curadj_read __P((DB_ENV *, void *, __bam_curadj_args **));
*/
-gint
+int
__bam_curadj_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__bam_curadj_args **argpp;
{
__bam_curadj_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__bam_curadj_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -2288,10 +2288,10 @@ __bam_curadj_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __bam_rcuradj_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __bam_rcuradj_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, ca_recno_arg, db_pgno_t, db_recno_t, u_int32_t));
*/
-gint
+int
__bam_rcuradj_log(dbp, txnid, ret_lsnp, flags, mode, root, recno, order)
DB *dbp;
DB_TXN *txnid;
@@ -2307,7 +2307,7 @@ __bam_rcuradj_log(dbp, txnid, ret_lsnp, flags, mode, root, recno, order)
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -2397,19 +2397,19 @@ __bam_rcuradj_log(dbp, txnid, ret_lsnp, flags, mode, root, recno, order)
}
/*
- * PUBLIC: gint __bam_rcuradj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_rcuradj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_rcuradj_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -2430,19 +2430,19 @@ __bam_rcuradj_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __bam_rcuradj_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __bam_rcuradj_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__bam_rcuradj_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__bam_rcuradj_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -2468,19 +2468,19 @@ __bam_rcuradj_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __bam_rcuradj_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int __bam_rcuradj_read __P((DB_ENV *, void *,
* PUBLIC: __bam_rcuradj_args **));
*/
-gint
+int
__bam_rcuradj_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__bam_rcuradj_args **argpp;
{
__bam_rcuradj_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__bam_rcuradj_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -2523,16 +2523,16 @@ __bam_rcuradj_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __bam_init_print __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __bam_init_print __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__bam_init_print(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__bam_split_print, DB___bam_split)) != 0)
@@ -2565,16 +2565,16 @@ __bam_init_print(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __bam_init_getpgnos __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __bam_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__bam_init_getpgnos(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__bam_split_getpgnos, DB___bam_split)) != 0)
@@ -2607,16 +2607,16 @@ __bam_init_getpgnos(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __bam_init_recover __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __bam_init_recover __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__bam_init_recover(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__bam_split_recover, DB___bam_split)) != 0)
diff --git a/libdb/build_vxworks/db.h b/libdb/build_vxworks/db.h
index aa421d5..fabbd1d 100644
--- a/libdb/build_vxworks/db.h
+++ b/libdb/build_vxworks/db.h
@@ -79,9 +79,9 @@ extern "C" {
*/
#ifndef __BIT_TYPES_DEFINED__
#define __BIT_TYPES_DEFINED__
-typedef guchar u_int8_t;
+typedef unsigned char u_int8_t;
typedef unsigned short u_int16_t;
-typedef guint u_int32_t;
+typedef unsigned int u_int32_t;
#endif
@@ -505,8 +505,8 @@ struct __db_log_cursor {
u_int32_t bp_maxrec; /* Max record length in the log file. */
/* Methods. */
- gint (*close) __P((DB_LOGC *, u_int32_t));
- gint (*get) __P((DB_LOGC *, DB_LSN *, DBT *, u_int32_t));
+ int (*close) __P((DB_LOGC *, u_int32_t));
+ int (*get) __P((DB_LOGC *, DB_LSN *, DBT *, u_int32_t));
#define DB_LOG_DISK 0x01 /* Log record came from disk. */
#define DB_LOG_LOCKED 0x02 /* Log region already locked */
@@ -518,7 +518,7 @@ struct __db_log_cursor {
struct __db_log_stat {
u_int32_t st_magic; /* Log file magic number. */
u_int32_t st_version; /* Log file version number. */
- gint st_mode; /* Log file mode. */
+ int st_mode; /* Log file mode. */
u_int32_t st_lg_bsize; /* Log buffer size. */
u_int32_t st_lg_size; /* Log file size. */
u_int32_t st_w_bytes; /* Bytes to log. */
@@ -607,22 +607,22 @@ struct __db_mpoolfile {
size_t len; /* Length of mmap'd region. */
/* Methods. */
- gint (*close) __P((DB_MPOOLFILE *, u_int32_t));
- gint (*get) __P((DB_MPOOLFILE *, db_pgno_t *, u_int32_t, gpointer ));
+ int (*close) __P((DB_MPOOLFILE *, u_int32_t));
+ int (*get) __P((DB_MPOOLFILE *, db_pgno_t *, u_int32_t, void *));
void (*get_fileid) __P((DB_MPOOLFILE *, u_int8_t *));
void (*last_pgno) __P((DB_MPOOLFILE *, db_pgno_t *));
- gint (*open)__P((DB_MPOOLFILE *, const gchar *, u_int32_t, int, size_t));
- gint (*put) __P((DB_MPOOLFILE *, gpointer , u_int32_t));
+ int (*open)__P((DB_MPOOLFILE *, const char *, u_int32_t, int, size_t));
+ int (*put) __P((DB_MPOOLFILE *, void *, u_int32_t));
void (*refcnt) __P((DB_MPOOLFILE *, db_pgno_t *));
- gint (*set) __P((DB_MPOOLFILE *, gpointer , u_int32_t));
- gint (*set_clear_len) __P((DB_MPOOLFILE *, u_int32_t));
- gint (*set_fileid) __P((DB_MPOOLFILE *, u_int8_t *));
- gint (*set_ftype) __P((DB_MPOOLFILE *, int));
- gint (*set_lsn_offset) __P((DB_MPOOLFILE *, int32_t));
- gint (*set_pgcookie) __P((DB_MPOOLFILE *, DBT *));
- gint (*set_priority) __P((DB_MPOOLFILE *, DB_CACHE_PRIORITY));
+ int (*set) __P((DB_MPOOLFILE *, void *, u_int32_t));
+ int (*set_clear_len) __P((DB_MPOOLFILE *, u_int32_t));
+ int (*set_fileid) __P((DB_MPOOLFILE *, u_int8_t *));
+ int (*set_ftype) __P((DB_MPOOLFILE *, int));
+ int (*set_lsn_offset) __P((DB_MPOOLFILE *, int32_t));
+ int (*set_pgcookie) __P((DB_MPOOLFILE *, DBT *));
+ int (*set_priority) __P((DB_MPOOLFILE *, DB_CACHE_PRIORITY));
void (*set_unlink) __P((DB_MPOOLFILE *, int));
- gint (*sync) __P((DB_MPOOLFILE *));
+ int (*sync) __P((DB_MPOOLFILE *));
/*
* MP_OPEN_CALLED and MP_READONLY do not need to be thread protected
@@ -678,7 +678,7 @@ struct __db_mpool_stat {
/* Mpool file statistics structure. */
struct __db_mpool_fstat {
- gchar *file_name; /* File name. */
+ char *file_name; /* File name. */
size_t st_pagesize; /* Page size. */
u_int32_t st_map; /* Pages from mapped files. */
u_int32_t st_cache_hit; /* Pages found in the cache. */
@@ -855,8 +855,8 @@ struct __db_rep_stat {
u_int32_t st_dupmasters; /* # of times a duplicate master
condition was detected.+ */
- gint st_env_id; /* Current environment ID. */
- gint st_env_priority; /* Current environment priority. */
+ int st_env_id; /* Current environment ID. */
+ int st_env_priority; /* Current environment priority. */
u_int32_t st_gen; /* Current generation number. */
u_int32_t st_log_duplicated; /* Log records received multiply.+ */
u_int32_t st_log_queued; /* Log records currently queued.+ */
@@ -864,7 +864,7 @@ struct __db_rep_stat {
u_int32_t st_log_queued_total; /* Total # of log recs. ever queued.+ */
u_int32_t st_log_records; /* Log records received and put.+ */
u_int32_t st_log_requested; /* Log recs. missed and requested.+ */
- gint st_master; /* Env. ID of the current master. */
+ int st_master; /* Env. ID of the current master. */
u_int32_t st_master_changes; /* # of times we've switched masters. */
u_int32_t st_msgs_badgen; /* Messages with a bad generation #.+ */
u_int32_t st_msgs_processed; /* Messages received and processed.+ */
@@ -873,7 +873,7 @@ struct __db_rep_stat {
u_int32_t st_msgs_send_failures;/* # of failed message sends.+ */
u_int32_t st_msgs_sent; /* # of successful message sends.+ */
u_int32_t st_newsites; /* # of NEWSITE msgs. received.+ */
- gint st_nsites; /* Current number of sites we will
+ int st_nsites; /* Current number of sites we will
assume during elections. */
u_int32_t st_nthrottles; /* # of times we were throttled. */
u_int32_t st_outdated; /* # of times we detected and returned
@@ -885,14 +885,14 @@ struct __db_rep_stat {
u_int32_t st_elections_won; /* # of elections won by this site.+ */
/* Statistics about an in-progress election. */
- gint st_election_cur_winner; /* Current front-runner. */
+ int st_election_cur_winner; /* Current front-runner. */
u_int32_t st_election_gen; /* Election generation number. */
DB_LSN st_election_lsn; /* Max. LSN of current winner. */
- gint st_election_nsites; /* # of "registered voters". */
- gint st_election_priority; /* Current election priority. */
- gint st_election_status; /* Current election status. */
- gint st_election_tiebreaker; /* Election tiebreaker value. */
- gint st_election_votes; /* Votes received in this round. */
+ int st_election_nsites; /* # of "registered voters". */
+ int st_election_priority; /* Current election priority. */
+ int st_election_status; /* Current election status. */
+ int st_election_tiebreaker; /* Election tiebreaker value. */
+ int st_election_votes; /* Votes received in this round. */
};
/*******************************************************
@@ -1031,9 +1031,9 @@ struct __db {
u_int32_t pgsize; /* Database logical page size. */
/* Callbacks. */
- gint (*db_append_recno) __P((DB *, DBT *, db_recno_t));
+ int (*db_append_recno) __P((DB *, DBT *, db_recno_t));
void (*db_feedback) __P((DB *, int, int));
- gint (*dup_compare) __P((DB *, const DBT *, const DBT *));
+ int (*dup_compare) __P((DB *, const DBT *, const DBT *));
void *app_private; /* Application-private handle. */
@@ -1168,79 +1168,79 @@ struct __db {
void *xa_internal; /* XA. */
/* Methods. */
- gint (*associate) __P((DB *, DB_TXN *, DB *, gint (*)(DB *, const DBT *,
+ int (*associate) __P((DB *, DB_TXN *, DB *, int (*)(DB *, const DBT *,
const DBT *, DBT *), u_int32_t));
- gint (*close) __P((DB *, u_int32_t));
- gint (*cursor) __P((DB *, DB_TXN *, DBC **, u_int32_t));
- gint (*del) __P((DB *, DB_TXN *, DBT *, u_int32_t));
- void (*err) __P((DB *, int, const gchar *, ...));
- void (*errx) __P((DB *, const gchar *, ...));
- gint (*fd) __P((DB *, gint *));
- gint (*get) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
- gint (*pget) __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
- gint (*get_byteswapped) __P((DB *, gint *));
- gint (*get_type) __P((DB *, DBTYPE *));
- gint (*join) __P((DB *, DBC **, DBC **, u_int32_t));
- gint (*key_range) __P((DB *,
+ int (*close) __P((DB *, u_int32_t));
+ int (*cursor) __P((DB *, DB_TXN *, DBC **, u_int32_t));
+ int (*del) __P((DB *, DB_TXN *, DBT *, u_int32_t));
+ void (*err) __P((DB *, int, const char *, ...));
+ void (*errx) __P((DB *, const char *, ...));
+ int (*fd) __P((DB *, int *));
+ int (*get) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+ int (*pget) __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
+ int (*get_byteswapped) __P((DB *, int *));
+ int (*get_type) __P((DB *, DBTYPE *));
+ int (*join) __P((DB *, DBC **, DBC **, u_int32_t));
+ int (*key_range) __P((DB *,
DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t));
- gint (*open) __P((DB *, DB_TXN *,
- const gchar *, const gchar *, DBTYPE, u_int32_t, int));
- gint (*put) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
- gint (*remove) __P((DB *, const gchar *, const gchar *, u_int32_t));
- gint (*rename) __P((DB *,
- const gchar *, const gchar *, const gchar *, u_int32_t));
- gint (*truncate) __P((DB *, DB_TXN *, u_int32_t *, u_int32_t));
- gint (*set_append_recno) __P((DB *, gint (*)(DB *, DBT *, db_recno_t)));
- gint (*set_alloc) __P((DB *, gpointer (*)(size_t),
- gpointer (*)(gpointer , size_t), void (*)(gpointer)));
- gint (*set_cachesize) __P((DB *, u_int32_t, u_int32_t, int));
- gint (*set_cache_priority) __P((DB *, DB_CACHE_PRIORITY));
- gint (*set_dup_compare) __P((DB *,
- gint (*)(DB *, const DBT *, const DBT *)));
- gint (*set_encrypt) __P((DB *, const gchar *, u_int32_t));
- void (*set_errcall) __P((DB *, void (*)(const gchar *, gchar *)));
+ int (*open) __P((DB *, DB_TXN *,
+ const char *, const char *, DBTYPE, u_int32_t, int));
+ int (*put) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+ int (*remove) __P((DB *, const char *, const char *, u_int32_t));
+ int (*rename) __P((DB *,
+ const char *, const char *, const char *, u_int32_t));
+ int (*truncate) __P((DB *, DB_TXN *, u_int32_t *, u_int32_t));
+ int (*set_append_recno) __P((DB *, int (*)(DB *, DBT *, db_recno_t)));
+ int (*set_alloc) __P((DB *, void *(*)(size_t),
+ void *(*)(void *, size_t), void (*)(void *)));
+ int (*set_cachesize) __P((DB *, u_int32_t, u_int32_t, int));
+ int (*set_cache_priority) __P((DB *, DB_CACHE_PRIORITY));
+ int (*set_dup_compare) __P((DB *,
+ int (*)(DB *, const DBT *, const DBT *)));
+ int (*set_encrypt) __P((DB *, const char *, u_int32_t));
+ void (*set_errcall) __P((DB *, void (*)(const char *, char *)));
void (*set_errfile) __P((DB *, FILE *));
- void (*set_errpfx) __P((DB *, const gchar *));
- gint (*set_feedback) __P((DB *, void (*)(DB *, int, int)));
- gint (*set_flags) __P((DB *, u_int32_t));
- gint (*set_lorder) __P((DB *, int));
- gint (*set_pagesize) __P((DB *, u_int32_t));
- gint (*set_paniccall) __P((DB *, void (*)(DB_ENV *, int)));
- gint (*stat) __P((DB *, gpointer , u_int32_t));
- gint (*sync) __P((DB *, u_int32_t));
- gint (*upgrade) __P((DB *, const gchar *, u_int32_t));
- gint (*verify) __P((DB *,
- const gchar *, const gchar *, FILE *, u_int32_t));
-
- gint (*set_bt_compare) __P((DB *,
- gint (*)(DB *, const DBT *, const DBT *)));
- gint (*set_bt_maxkey) __P((DB *, u_int32_t));
- gint (*set_bt_minkey) __P((DB *, u_int32_t));
- gint (*set_bt_prefix) __P((DB *,
+ void (*set_errpfx) __P((DB *, const char *));
+ int (*set_feedback) __P((DB *, void (*)(DB *, int, int)));
+ int (*set_flags) __P((DB *, u_int32_t));
+ int (*set_lorder) __P((DB *, int));
+ int (*set_pagesize) __P((DB *, u_int32_t));
+ int (*set_paniccall) __P((DB *, void (*)(DB_ENV *, int)));
+ int (*stat) __P((DB *, void *, u_int32_t));
+ int (*sync) __P((DB *, u_int32_t));
+ int (*upgrade) __P((DB *, const char *, u_int32_t));
+ int (*verify) __P((DB *,
+ const char *, const char *, FILE *, u_int32_t));
+
+ int (*set_bt_compare) __P((DB *,
+ int (*)(DB *, const DBT *, const DBT *)));
+ int (*set_bt_maxkey) __P((DB *, u_int32_t));
+ int (*set_bt_minkey) __P((DB *, u_int32_t));
+ int (*set_bt_prefix) __P((DB *,
size_t (*)(DB *, const DBT *, const DBT *)));
- gint (*set_h_ffactor) __P((DB *, u_int32_t));
- gint (*set_h_hash) __P((DB *,
- u_int32_t (*)(DB *, gconstpointer , u_int32_t)));
- gint (*set_h_nelem) __P((DB *, u_int32_t));
+ int (*set_h_ffactor) __P((DB *, u_int32_t));
+ int (*set_h_hash) __P((DB *,
+ u_int32_t (*)(DB *, const void *, u_int32_t)));
+ int (*set_h_nelem) __P((DB *, u_int32_t));
- gint (*set_re_delim) __P((DB *, int));
- gint (*set_re_len) __P((DB *, u_int32_t));
- gint (*set_re_pad) __P((DB *, int));
- gint (*set_re_source) __P((DB *, const gchar *));
- gint (*set_q_extentsize) __P((DB *, u_int32_t));
+ int (*set_re_delim) __P((DB *, int));
+ int (*set_re_len) __P((DB *, u_int32_t));
+ int (*set_re_pad) __P((DB *, int));
+ int (*set_re_source) __P((DB *, const char *));
+ int (*set_q_extentsize) __P((DB *, u_int32_t));
- gint (*db_am_remove) __P((DB *,
- DB_TXN *, const gchar *, const gchar *, DB_LSN *));
- gint (*db_am_rename) __P((DB *, DB_TXN *,
- const gchar *, const gchar *, const gchar *));
+ int (*db_am_remove) __P((DB *,
+ DB_TXN *, const char *, const char *, DB_LSN *));
+ int (*db_am_rename) __P((DB *, DB_TXN *,
+ const char *, const char *, const char *));
/*
* Never called; these are a place to save function pointers
* so that we can undo an associate.
*/
- gint (*stored_get) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
- gint (*stored_close) __P((DB *, u_int32_t));
+ int (*stored_get) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+ int (*stored_close) __P((DB *, u_int32_t));
#define DB_OK_BTREE 0x01
#define DB_OK_HASH 0x02
@@ -1391,25 +1391,25 @@ struct __dbc {
DBC_INTERNAL *internal; /* Access method private. */
- gint (*c_close) __P((DBC *)); /* Methods: public. */
- gint (*c_count) __P((DBC *, db_recno_t *, u_int32_t));
- gint (*c_del) __P((DBC *, u_int32_t));
- gint (*c_dup) __P((DBC *, DBC **, u_int32_t));
- gint (*c_get) __P((DBC *, DBT *, DBT *, u_int32_t));
- gint (*c_pget) __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
- gint (*c_put) __P((DBC *, DBT *, DBT *, u_int32_t));
+ int (*c_close) __P((DBC *)); /* Methods: public. */
+ int (*c_count) __P((DBC *, db_recno_t *, u_int32_t));
+ int (*c_del) __P((DBC *, u_int32_t));
+ int (*c_dup) __P((DBC *, DBC **, u_int32_t));
+ int (*c_get) __P((DBC *, DBT *, DBT *, u_int32_t));
+ int (*c_pget) __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
+ int (*c_put) __P((DBC *, DBT *, DBT *, u_int32_t));
/* Methods: private. */
- gint (*c_am_bulk) __P((DBC *, DBT *, u_int32_t));
- gint (*c_am_close) __P((DBC *, db_pgno_t, gint *));
- gint (*c_am_del) __P((DBC *));
- gint (*c_am_destroy) __P((DBC *));
- gint (*c_am_get) __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
- gint (*c_am_put) __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
- gint (*c_am_writelock) __P((DBC *));
+ int (*c_am_bulk) __P((DBC *, DBT *, u_int32_t));
+ int (*c_am_close) __P((DBC *, db_pgno_t, int *));
+ int (*c_am_del) __P((DBC *));
+ int (*c_am_destroy) __P((DBC *));
+ int (*c_am_get) __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
+ int (*c_am_put) __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
+ int (*c_am_writelock) __P((DBC *));
/* Private: for secondary indices. */
- gint (*c_real_get) __P((DBC *, DBT *, DBT *, u_int32_t));
+ int (*c_real_get) __P((DBC *, DBT *, DBT *, u_int32_t));
#define DBC_ACTIVE 0x0001 /* Cursor in use. */
#define DBC_COMPENSATE 0x0002 /* Cursor compensating, don't lock. */
@@ -1508,14 +1508,14 @@ struct __db_env {
FILE *db_errfile; /* Error message file stream. */
const char *db_errpfx; /* Error message prefix. */
/* Callbacks. */
- void (*db_errcall) __P((const gchar *, gchar *));
+ void (*db_errcall) __P((const char *, char *));
void (*db_feedback) __P((DB_ENV *, int, int));
void (*db_paniccall) __P((DB_ENV *, int));
/* App-specified alloc functions. */
- gpointer (*db_malloc) __P((size_t));
- gpointer (*db_realloc) __P((gpointer , size_t));
- void (*db_free) __P((gpointer));
+ void *(*db_malloc) __P((size_t));
+ void *(*db_realloc) __P((void *, size_t));
+ void (*db_free) __P((void *));
/*
* Currently, the verbose list is a bit field with room for 32
@@ -1531,7 +1531,7 @@ struct __db_env {
void *app_private; /* Application-private handle. */
- gint (*app_dispatch) /* User-specified recovery dispatch. */
+ int (*app_dispatch) /* User-specified recovery dispatch. */
__P((DB_ENV *, DBT *, DB_LSN *, db_recops));
/* Locking. */
@@ -1582,7 +1582,7 @@ struct __db_env {
DB_FH *lockfhp; /* fcntl(2) locking file handle. */
int (**recover_dtab) /* Dispatch table for recover funcs. */
- __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t recover_dtab_size;
/* Slots in the dispatch table. */
@@ -1638,106 +1638,106 @@ struct __db_env {
u_long *mt; /* Mersenne Twister state vector. */
/* DB_ENV Methods. */
- gint (*close) __P((DB_ENV *, u_int32_t));
- gint (*dbremove) __P((DB_ENV *,
- DB_TXN *, const gchar *, const gchar *, u_int32_t));
- gint (*dbrename) __P((DB_ENV *, DB_TXN *,
- const gchar *, const gchar *, const gchar *, u_int32_t));
- void (*err) __P((const DB_ENV *, int, const gchar *, ...));
- void (*errx) __P((const DB_ENV *, const gchar *, ...));
- gint (*open) __P((DB_ENV *, const gchar *, u_int32_t, int));
- gint (*remove) __P((DB_ENV *, const gchar *, u_int32_t));
- gint (*set_data_dir) __P((DB_ENV *, const gchar *));
- gint (*set_alloc) __P((DB_ENV *, gpointer (*)(size_t),
- gpointer (*)(gpointer , size_t), void (*)(gpointer)));
- gint (*set_app_dispatch) __P((DB_ENV *,
- gint (*)(DB_ENV *, DBT *, DB_LSN *, db_recops)));
- gint (*set_encrypt) __P((DB_ENV *, const gchar *, u_int32_t));
- void (*set_errcall) __P((DB_ENV *, void (*)(const gchar *, gchar *)));
+ int (*close) __P((DB_ENV *, u_int32_t));
+ int (*dbremove) __P((DB_ENV *,
+ DB_TXN *, const char *, const char *, u_int32_t));
+ int (*dbrename) __P((DB_ENV *, DB_TXN *,
+ const char *, const char *, const char *, u_int32_t));
+ void (*err) __P((const DB_ENV *, int, const char *, ...));
+ void (*errx) __P((const DB_ENV *, const char *, ...));
+ int (*open) __P((DB_ENV *, const char *, u_int32_t, int));
+ int (*remove) __P((DB_ENV *, const char *, u_int32_t));
+ int (*set_data_dir) __P((DB_ENV *, const char *));
+ int (*set_alloc) __P((DB_ENV *, void *(*)(size_t),
+ void *(*)(void *, size_t), void (*)(void *)));
+ int (*set_app_dispatch) __P((DB_ENV *,
+ int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops)));
+ int (*set_encrypt) __P((DB_ENV *, const char *, u_int32_t));
+ void (*set_errcall) __P((DB_ENV *, void (*)(const char *, char *)));
void (*set_errfile) __P((DB_ENV *, FILE *));
- void (*set_errpfx) __P((DB_ENV *, const gchar *));
- gint (*set_feedback) __P((DB_ENV *, void (*)(DB_ENV *, int, int)));
- gint (*set_flags) __P((DB_ENV *, u_int32_t, int));
- gint (*set_paniccall) __P((DB_ENV *, void (*)(DB_ENV *, int)));
- gint (*set_rpc_server) __P((DB_ENV *,
- gpointer , const gchar *, long, long, u_int32_t));
- gint (*set_shm_key) __P((DB_ENV *, long));
- gint (*set_tas_spins) __P((DB_ENV *, u_int32_t));
- gint (*set_tmp_dir) __P((DB_ENV *, const gchar *));
- gint (*set_verbose) __P((DB_ENV *, u_int32_t, int));
-
- gpointer lg_handle; /* Log handle and methods. */
- gint (*set_lg_bsize) __P((DB_ENV *, u_int32_t));
- gint (*set_lg_dir) __P((DB_ENV *, const gchar *));
- gint (*set_lg_max) __P((DB_ENV *, u_int32_t));
- gint (*set_lg_regionmax) __P((DB_ENV *, u_int32_t));
- gint (*log_archive) __P((DB_ENV *, gchar **[], u_int32_t));
- gint (*log_cursor) __P((DB_ENV *, DB_LOGC **, u_int32_t));
- gint (*log_file) __P((DB_ENV *, const DB_LSN *, gchar *, size_t));
- gint (*log_flush) __P((DB_ENV *, const DB_LSN *));
- gint (*log_put) __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
- gint (*log_stat) __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
-
- gpointer lk_handle; /* Lock handle and methods. */
- gint (*set_lk_conflicts) __P((DB_ENV *, u_int8_t *, int));
- gint (*set_lk_detect) __P((DB_ENV *, u_int32_t));
- gint (*set_lk_max) __P((DB_ENV *, u_int32_t));
- gint (*set_lk_max_locks) __P((DB_ENV *, u_int32_t));
- gint (*set_lk_max_lockers) __P((DB_ENV *, u_int32_t));
- gint (*set_lk_max_objects) __P((DB_ENV *, u_int32_t));
- gint (*lock_detect) __P((DB_ENV *, u_int32_t, u_int32_t, gint *));
- gint (*lock_dump_region) __P((DB_ENV *, gchar *, FILE *));
- gint (*lock_get) __P((DB_ENV *,
+ void (*set_errpfx) __P((DB_ENV *, const char *));
+ int (*set_feedback) __P((DB_ENV *, void (*)(DB_ENV *, int, int)));
+ int (*set_flags) __P((DB_ENV *, u_int32_t, int));
+ int (*set_paniccall) __P((DB_ENV *, void (*)(DB_ENV *, int)));
+ int (*set_rpc_server) __P((DB_ENV *,
+ void *, const char *, long, long, u_int32_t));
+ int (*set_shm_key) __P((DB_ENV *, long));
+ int (*set_tas_spins) __P((DB_ENV *, u_int32_t));
+ int (*set_tmp_dir) __P((DB_ENV *, const char *));
+ int (*set_verbose) __P((DB_ENV *, u_int32_t, int));
+
+ void *lg_handle; /* Log handle and methods. */
+ int (*set_lg_bsize) __P((DB_ENV *, u_int32_t));
+ int (*set_lg_dir) __P((DB_ENV *, const char *));
+ int (*set_lg_max) __P((DB_ENV *, u_int32_t));
+ int (*set_lg_regionmax) __P((DB_ENV *, u_int32_t));
+ int (*log_archive) __P((DB_ENV *, char **[], u_int32_t));
+ int (*log_cursor) __P((DB_ENV *, DB_LOGC **, u_int32_t));
+ int (*log_file) __P((DB_ENV *, const DB_LSN *, char *, size_t));
+ int (*log_flush) __P((DB_ENV *, const DB_LSN *));
+ int (*log_put) __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
+ int (*log_stat) __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
+
+ void *lk_handle; /* Lock handle and methods. */
+ int (*set_lk_conflicts) __P((DB_ENV *, u_int8_t *, int));
+ int (*set_lk_detect) __P((DB_ENV *, u_int32_t));
+ int (*set_lk_max) __P((DB_ENV *, u_int32_t));
+ int (*set_lk_max_locks) __P((DB_ENV *, u_int32_t));
+ int (*set_lk_max_lockers) __P((DB_ENV *, u_int32_t));
+ int (*set_lk_max_objects) __P((DB_ENV *, u_int32_t));
+ int (*lock_detect) __P((DB_ENV *, u_int32_t, u_int32_t, int *));
+ int (*lock_dump_region) __P((DB_ENV *, char *, FILE *));
+ int (*lock_get) __P((DB_ENV *,
u_int32_t, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *));
- gint (*lock_put) __P((DB_ENV *, DB_LOCK *));
- gint (*lock_id) __P((DB_ENV *, u_int32_t *));
- gint (*lock_id_free) __P((DB_ENV *, u_int32_t));
- gint (*lock_id_set) __P((DB_ENV *, u_int32_t, u_int32_t));
- gint (*lock_stat) __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
- gint (*lock_vec) __P((DB_ENV *,
+ int (*lock_put) __P((DB_ENV *, DB_LOCK *));
+ int (*lock_id) __P((DB_ENV *, u_int32_t *));
+ int (*lock_id_free) __P((DB_ENV *, u_int32_t));
+ int (*lock_id_set) __P((DB_ENV *, u_int32_t, u_int32_t));
+ int (*lock_stat) __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
+ int (*lock_vec) __P((DB_ENV *,
u_int32_t, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **));
- gint (*lock_downgrade) __P((DB_ENV *,
+ int (*lock_downgrade) __P((DB_ENV *,
DB_LOCK *, db_lockmode_t, u_int32_t));
- gpointer mp_handle; /* Mpool handle and methods. */
- gint (*set_mp_mmapsize) __P((DB_ENV *, size_t));
- gint (*set_cachesize) __P((DB_ENV *, u_int32_t, u_int32_t, int));
- gint (*memp_dump_region) __P((DB_ENV *, gchar *, FILE *));
- gint (*memp_fcreate) __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
- gint (*memp_nameop) __P((DB_ENV *,
- u_int8_t *, const gchar *, const gchar *, const gchar *));
- gint (*memp_register) __P((DB_ENV *, int,
- gint (*)(DB_ENV *, db_pgno_t, gpointer , DBT *),
- gint (*)(DB_ENV *, db_pgno_t, gpointer , DBT *)));
- gint (*memp_stat) __P((DB_ENV *,
+ void *mp_handle; /* Mpool handle and methods. */
+ int (*set_mp_mmapsize) __P((DB_ENV *, size_t));
+ int (*set_cachesize) __P((DB_ENV *, u_int32_t, u_int32_t, int));
+ int (*memp_dump_region) __P((DB_ENV *, char *, FILE *));
+ int (*memp_fcreate) __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
+ int (*memp_nameop) __P((DB_ENV *,
+ u_int8_t *, const char *, const char *, const char *));
+ int (*memp_register) __P((DB_ENV *, int,
+ int (*)(DB_ENV *, db_pgno_t, void *, DBT *),
+ int (*)(DB_ENV *, db_pgno_t, void *, DBT *)));
+ int (*memp_stat) __P((DB_ENV *,
DB_MPOOL_STAT **, DB_MPOOL_FSTAT ***, u_int32_t));
- gint (*memp_sync) __P((DB_ENV *, DB_LSN *));
- gint (*memp_trickle) __P((DB_ENV *, int, gint *));
-
- gpointer rep_handle; /* Replication handle and methods. */
- gint (*rep_elect) __P((DB_ENV *, int, int, u_int32_t, gint *));
- gint (*rep_flush) __P((DB_ENV *));
- gint (*rep_process_message) __P((DB_ENV *, DBT *, DBT *, gint *));
- gint (*rep_start) __P((DB_ENV *, DBT *, u_int32_t));
- gint (*rep_stat) __P((DB_ENV *, DB_REP_STAT **, u_int32_t));
- gint (*set_rep_election) __P((DB_ENV *,
+ int (*memp_sync) __P((DB_ENV *, DB_LSN *));
+ int (*memp_trickle) __P((DB_ENV *, int, int *));
+
+ void *rep_handle; /* Replication handle and methods. */
+ int (*rep_elect) __P((DB_ENV *, int, int, u_int32_t, int *));
+ int (*rep_flush) __P((DB_ENV *));
+ int (*rep_process_message) __P((DB_ENV *, DBT *, DBT *, int *));
+ int (*rep_start) __P((DB_ENV *, DBT *, u_int32_t));
+ int (*rep_stat) __P((DB_ENV *, DB_REP_STAT **, u_int32_t));
+ int (*set_rep_election) __P((DB_ENV *,
u_int32_t, u_int32_t, u_int32_t, u_int32_t));
- gint (*set_rep_limit) __P((DB_ENV *, u_int32_t, u_int32_t));
- gint (*set_rep_request) __P((DB_ENV *, u_int32_t, u_int32_t));
- gint (*set_rep_timeout) __P((DB_ENV *, u_int32_t, u_int32_t));
- gint (*set_rep_transport) __P((DB_ENV *, int,
- gint (*) (DB_ENV *, const DBT *, const DBT *, int, u_int32_t)));
-
- gpointer tx_handle; /* Txn handle and methods. */
- gint (*set_tx_max) __P((DB_ENV *, u_int32_t));
- gint (*set_tx_timestamp) __P((DB_ENV *, time_t *));
- gint (*txn_begin) __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
- gint (*txn_checkpoint) __P((DB_ENV *, u_int32_t, u_int32_t, u_int32_t));
- gint (*txn_id_set) __P((DB_ENV *, u_int32_t, u_int32_t));
- gint (*txn_recover) __P((DB_ENV *,
+ int (*set_rep_limit) __P((DB_ENV *, u_int32_t, u_int32_t));
+ int (*set_rep_request) __P((DB_ENV *, u_int32_t, u_int32_t));
+ int (*set_rep_timeout) __P((DB_ENV *, u_int32_t, u_int32_t));
+ int (*set_rep_transport) __P((DB_ENV *, int,
+ int (*) (DB_ENV *, const DBT *, const DBT *, int, u_int32_t)));
+
+ void *tx_handle; /* Txn handle and methods. */
+ int (*set_tx_max) __P((DB_ENV *, u_int32_t));
+ int (*set_tx_timestamp) __P((DB_ENV *, time_t *));
+ int (*txn_begin) __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
+ int (*txn_checkpoint) __P((DB_ENV *, u_int32_t, u_int32_t, u_int32_t));
+ int (*txn_id_set) __P((DB_ENV *, u_int32_t, u_int32_t));
+ int (*txn_recover) __P((DB_ENV *,
DB_PREPLIST *, long, long *, u_int32_t));
- gint (*txn_stat) __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
- gint (*set_timeout) __P((DB_ENV *, db_timeout_t, u_int32_t));
+ int (*txn_stat) __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
+ int (*set_timeout) __P((DB_ENV *, db_timeout_t, u_int32_t));
#define DB_TEST_ELECTINIT 1 /* after __rep_elect_init */
#define DB_TEST_ELECTSEND 2 /* after REP_ELECT msgnit */
@@ -1805,13 +1805,13 @@ typedef struct __db DBM;
#if defined(_XPG4_2)
typedef struct {
- gchar *dptr;
+ char *dptr;
size_t dsize;
} datum;
#else
typedef struct {
- gchar *dptr;
- gint dsize;
+ char *dptr;
+ int dsize;
} datum;
#endif
@@ -1858,8 +1858,8 @@ typedef enum {
} ACTION;
typedef struct entry {
- gchar *key;
- gchar *data;
+ char *key;
+ char *data;
} ENTRY;
#define hcreate(a) __db_hcreate(a)
@@ -1885,33 +1885,33 @@ typedef struct entry {
extern "C" {
#endif
-gint db_create __P((DB **, DB_ENV *, u_int32_t));
-gchar *db_strerror __P((int));
-gint db_env_create __P((DB_ENV **, u_int32_t));
-gchar *db_version __P((gint *, gint *, gint *));
-gint log_compare __P((const DB_LSN *, const DB_LSN *));
-gint db_env_set_func_close __P((gint (*)(int)));
-gint db_env_set_func_dirfree __P((void (*)(gchar **, int)));
-gint db_env_set_func_dirlist __P((gint (*)(const gchar *, gchar ***, gint *)));
-gint db_env_set_func_exists __P((gint (*)(const gchar *, gint *)));
-gint db_env_set_func_free __P((void (*)(gpointer)));
-gint db_env_set_func_fsync __P((gint (*)(int)));
-gint db_env_set_func_ioinfo __P((gint (*)(const gchar *, int, u_int32_t *, u_int32_t *, u_int32_t *)));
-gint db_env_set_func_malloc __P((gpointer (*)(size_t)));
-gint db_env_set_func_map __P((gint (*)(gchar *, size_t, int, int, gpointer *)));
-gint db_env_set_func_open __P((gint (*)(const gchar *, int, ...)));
-gint db_env_set_func_read __P((ssize_t (*)(int, gpointer , size_t)));
-gint db_env_set_func_realloc __P((gpointer (*)(gpointer , size_t)));
-gint db_env_set_func_rename __P((gint (*)(const gchar *, const gchar *)));
-gint db_env_set_func_seek __P((gint (*)(int, size_t, db_pgno_t, u_int32_t, int, int)));
-gint db_env_set_func_sleep __P((gint (*)(u_long, u_long)));
-gint db_env_set_func_unlink __P((gint (*)(const gchar *)));
-gint db_env_set_func_unmap __P((gint (*)(gpointer , size_t)));
-gint db_env_set_func_write __P((ssize_t (*)(int, gconstpointer , size_t)));
-gint db_env_set_func_yield __P((gint (*)(void)));
-gint txn_abort __P((DB_TXN *));
-gint txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
-gint txn_commit __P((DB_TXN *, u_int32_t));
+int db_create __P((DB **, DB_ENV *, u_int32_t));
+char *db_strerror __P((int));
+int db_env_create __P((DB_ENV **, u_int32_t));
+char *db_version __P((int *, int *, int *));
+int log_compare __P((const DB_LSN *, const DB_LSN *));
+int db_env_set_func_close __P((int (*)(int)));
+int db_env_set_func_dirfree __P((void (*)(char **, int)));
+int db_env_set_func_dirlist __P((int (*)(const char *, char ***, int *)));
+int db_env_set_func_exists __P((int (*)(const char *, int *)));
+int db_env_set_func_free __P((void (*)(void *)));
+int db_env_set_func_fsync __P((int (*)(int)));
+int db_env_set_func_ioinfo __P((int (*)(const char *, int, u_int32_t *, u_int32_t *, u_int32_t *)));
+int db_env_set_func_malloc __P((void *(*)(size_t)));
+int db_env_set_func_map __P((int (*)(char *, size_t, int, int, void **)));
+int db_env_set_func_open __P((int (*)(const char *, int, ...)));
+int db_env_set_func_read __P((ssize_t (*)(int, void *, size_t)));
+int db_env_set_func_realloc __P((void *(*)(void *, size_t)));
+int db_env_set_func_rename __P((int (*)(const char *, const char *)));
+int db_env_set_func_seek __P((int (*)(int, size_t, db_pgno_t, u_int32_t, int, int)));
+int db_env_set_func_sleep __P((int (*)(u_long, u_long)));
+int db_env_set_func_unlink __P((int (*)(const char *)));
+int db_env_set_func_unmap __P((int (*)(void *, size_t)));
+int db_env_set_func_write __P((ssize_t (*)(int, const void *, size_t)));
+int db_env_set_func_yield __P((int (*)(void)));
+int txn_abort __P((DB_TXN *));
+int txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
+int txn_commit __P((DB_TXN *, u_int32_t));
#if DB_DBM_HSEARCH != 0
int __db_ndbm_clearerr __P((DBM *));
void __db_ndbm_close __P((DBM *));
@@ -1921,7 +1921,7 @@ int __db_ndbm_error __P((DBM *));
datum __db_ndbm_fetch __P((DBM *, datum));
datum __db_ndbm_firstkey __P((DBM *));
datum __db_ndbm_nextkey __P((DBM *));
-DBM *__db_ndbm_open __P((const gchar *, int, int));
+DBM *__db_ndbm_open __P((const char *, int, int));
int __db_ndbm_pagfno __P((DBM *));
int __db_ndbm_rdonly __P((DBM *));
int __db_ndbm_store __P((DBM *, datum, datum, int));
@@ -1931,13 +1931,13 @@ int __db_dbm_delete __P((datum));
int __db_dbm_dirf __P((void));
datum __db_dbm_fetch __P((datum));
datum __db_dbm_firstkey __P((void));
-int __db_dbm_init __P((gchar *));
+int __db_dbm_init __P((char *));
datum __db_dbm_nextkey __P((datum));
int __db_dbm_pagf __P((void));
int __db_dbm_store __P((datum, datum));
#endif
#if DB_DBM_HSEARCH != 0
-gint __db_hcreate __P((size_t));
+int __db_hcreate __P((size_t));
ENTRY *__db_hsearch __P((ENTRY, ACTION));
void __db_hdestroy __P((void));
#endif
diff --git a/libdb/build_vxworks/db_archive/db_archive.c b/libdb/build_vxworks/db_archive/db_archive.c
index adb09fb..b0c5a4a 100644
--- a/libdb/build_vxworks/db_archive/db_archive.c
+++ b/libdb/build_vxworks/db_archive/db_archive.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -25,16 +25,16 @@ static const gchar revid[] =
#include "db_int.h"
-gint db_archive_main __P((int, gchar *[]));
-gint db_archive_usage __P((void));
-gint db_archive_version_check __P((const gchar *));
+int db_archive_main __P((int, char *[]));
+int db_archive_usage __P((void));
+int db_archive_version_check __P((const char *));
-gint
+int
db_archive(args)
- gchar *args;
+ char *args;
{
- gint argc;
- gchar **argv;
+ int argc;
+ char **argv;
__db_util_arg("db_archive", args, &argc, &argv);
return (db_archive_main(argc, argv) ? EXIT_FAILURE : EXIT_SUCCESS);
@@ -43,18 +43,18 @@ db_archive(args)
#include <stdio.h>
#define ERROR_RETURN ERROR
-gint
+int
db_archive_main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind, __db_getopt_reset;
- const gchar *progname = "db_archive";
+ extern char *optarg;
+ extern int optind, __db_getopt_reset;
+ const char *progname = "db_archive";
DB_ENV *dbenv;
u_int32_t flags;
- gint ch, e_close, exitval, ret, verbose;
- gchar **file, *home, **list, *passwd;
+ int ch, e_close, exitval, ret, verbose;
+ char **file, *home, **list, *passwd;
if ((ret = db_archive_version_check(progname)) != 0)
return (ret);
@@ -167,7 +167,7 @@ shutdown: exitval = 1;
return (exitval == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
-gint
+int
db_archive_usage()
{
(void)fprintf(stderr,
@@ -175,11 +175,11 @@ db_archive_usage()
return (EXIT_FAILURE);
}
-gint
+int
db_archive_version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/build_vxworks/db_checkpoint/db_checkpoint.c b/libdb/build_vxworks/db_checkpoint/db_checkpoint.c
index b1bd299..5ccd949 100644
--- a/libdb/build_vxworks/db_checkpoint/db_checkpoint.c
+++ b/libdb/build_vxworks/db_checkpoint/db_checkpoint.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -39,16 +39,16 @@ static const gchar revid[] =
#include "dbinc/db_page.h"
#include "dbinc/db_am.h"
-int db_checkpoint_main __P((int, gchar *[]));
+int db_checkpoint_main __P((int, char *[]));
int db_checkpoint_usage __P((void));
-int db_checkpoint_version_check __P((const gchar *));
+int db_checkpoint_version_check __P((const char *));
-gint
+int
db_checkpoint(args)
- gchar *args;
+ char *args;
{
- gint argc;
- gchar **argv;
+ int argc;
+ char **argv;
__db_util_arg("db_checkpoint", args, &argc, &argv);
return (db_checkpoint_main(argc, argv) ? EXIT_FAILURE : EXIT_SUCCESS);
@@ -57,20 +57,20 @@ db_checkpoint(args)
#include <stdio.h>
#define ERROR_RETURN ERROR
-gint
+int
db_checkpoint_main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind, __db_getopt_reset;
+ extern char *optarg;
+ extern int optind, __db_getopt_reset;
DB_ENV *dbenv;
- const gchar *progname = "db_checkpoint";
+ const char *progname = "db_checkpoint";
time_t now;
long argval;
u_int32_t flags, kbytes, minutes, seconds;
- gint ch, e_close, exitval, once, ret, verbose;
- gchar *home, *logfile, *passwd;
+ int ch, e_close, exitval, once, ret, verbose;
+ char *home, *logfile, *passwd;
if ((ret = db_checkpoint_version_check(progname)) != 0)
return (ret);
@@ -229,7 +229,7 @@ shutdown: exitval = 1;
return (exitval == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
-gint
+int
db_checkpoint_usage()
{
(void)fprintf(stderr, "%s\n\t%s\n",
@@ -238,11 +238,11 @@ db_checkpoint_usage()
return (EXIT_FAILURE);
}
-gint
+int
db_checkpoint_version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/build_vxworks/db_deadlock/db_deadlock.c b/libdb/build_vxworks/db_deadlock/db_deadlock.c
index 5d7f7e0..509c885 100644
--- a/libdb/build_vxworks/db_deadlock/db_deadlock.c
+++ b/libdb/build_vxworks/db_deadlock/db_deadlock.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -37,16 +37,16 @@ static const gchar revid[] =
#include "db_int.h"
-gint db_deadlock_main __P((int, gchar *[]));
-gint db_deadlock_usage __P((void));
-gint db_deadlock_version_check __P((const gchar *));
+int db_deadlock_main __P((int, char *[]));
+int db_deadlock_usage __P((void));
+int db_deadlock_version_check __P((const char *));
-gint
+int
db_deadlock(args)
- gchar *args;
+ char *args;
{
- gint argc;
- gchar **argv;
+ int argc;
+ char **argv;
__db_util_arg("db_deadlock", args, &argc, &argv);
return (db_deadlock_main(argc, argv) ? EXIT_FAILURE : EXIT_SUCCESS);
@@ -55,20 +55,20 @@ db_deadlock(args)
#include <stdio.h>
#define ERROR_RETURN ERROR
-gint
+int
db_deadlock_main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind, __db_getopt_reset;
- const gchar *progname = "db_deadlock";
+ extern char *optarg;
+ extern int optind, __db_getopt_reset;
+ const char *progname = "db_deadlock";
DB_ENV *dbenv;
u_int32_t atype;
time_t now;
long secs, usecs;
- gint ch, e_close, exitval, ret, verbose;
- gchar *home, *logfile, *str;
+ int ch, e_close, exitval, ret, verbose;
+ char *home, *logfile, *str;
if ((ret = db_deadlock_version_check(progname)) != 0)
return (ret);
@@ -220,7 +220,7 @@ shutdown: exitval = 1;
return (exitval == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
-gint
+int
db_deadlock_usage()
{
(void)fprintf(stderr, "%s\n\t%s\n",
@@ -229,11 +229,11 @@ db_deadlock_usage()
return (EXIT_FAILURE);
}
-gint
+int
db_deadlock_version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/build_vxworks/db_dump/db_dump.c b/libdb/build_vxworks/db_dump/db_dump.c
index 77993ac..152760c 100644
--- a/libdb/build_vxworks/db_dump/db_dump.c
+++ b/libdb/build_vxworks/db_dump/db_dump.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -27,21 +27,21 @@ static const gchar revid[] =
#include "dbinc/db_page.h"
#include "dbinc/db_am.h"
-int db_dump_db_init __P((DB_ENV *, gchar *, int, u_int32_t, gint *));
+int db_dump_db_init __P((DB_ENV *, char *, int, u_int32_t, int *));
int db_dump_dump __P((DB *, int, int));
-int db_dump_dump_sub __P((DB_ENV *, DB *, gchar *, int, int));
-int db_dump_is_sub __P((DB *, gint *));
-int db_dump_main __P((int, gchar *[]));
+int db_dump_dump_sub __P((DB_ENV *, DB *, char *, int, int));
+int db_dump_is_sub __P((DB *, int *));
+int db_dump_main __P((int, char *[]));
int db_dump_show_subs __P((DB *));
int db_dump_usage __P((void));
-int db_dump_version_check __P((const gchar *));
+int db_dump_version_check __P((const char *));
-gint
+int
db_dump(args)
- gchar *args;
+ char *args;
{
- gint argc;
- gchar **argv;
+ int argc;
+ char **argv;
__db_util_arg("db_dump", args, &argc, &argv);
return (db_dump_main(argc, argv) ? EXIT_FAILURE : EXIT_SUCCESS);
@@ -50,21 +50,21 @@ db_dump(args)
#include <stdio.h>
#define ERROR_RETURN ERROR
-gint
+int
db_dump_main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind, __db_getopt_reset;
- const gchar *progname = "db_dump";
+ extern char *optarg;
+ extern int optind, __db_getopt_reset;
+ const char *progname = "db_dump";
DB_ENV *dbenv;
DB *dbp;
u_int32_t cache;
- gint ch, d_close;
- gint e_close, exitval, keyflag, lflag, nflag, pflag, private;
- gint ret, Rflag, rflag, resize, subs;
- gchar *dopt, *home, *passwd, *subname;
+ int ch, d_close;
+ int e_close, exitval, keyflag, lflag, nflag, pflag, private;
+ int ret, Rflag, rflag, resize, subs;
+ char *dopt, *home, *passwd, *subname;
if ((ret = db_dump_version_check(progname)) != 0)
return (ret);
@@ -289,15 +289,15 @@ done: if (d_close && (ret = dbp->close(dbp, 0)) != 0) {
* db_init --
* Initialize the environment.
*/
-gint
+int
db_dump_db_init(dbenv, home, is_salvage, cache, is_privatep)
DB_ENV *dbenv;
- gchar *home;
- gint is_salvage;
+ char *home;
+ int is_salvage;
u_int32_t cache;
- gint *is_privatep;
+ int *is_privatep;
{
- gint ret;
+ int ret;
/*
* Try and use the underlying environment when opening a database.
@@ -347,14 +347,14 @@ db_dump_db_init(dbenv, home, is_salvage, cache, is_privatep)
* is_sub --
* Return if the database contains subdatabases.
*/
-gint
+int
db_dump_is_sub(dbp, yesno)
DB *dbp;
- gint *yesno;
+ int *yesno;
{
DB_BTREE_STAT *btsp;
DB_HASH_STAT *hsp;
- gint ret;
+ int ret;
switch (dbp->type) {
case DB_BTREE:
@@ -387,18 +387,18 @@ db_dump_is_sub(dbp, yesno)
* dump_sub --
* Dump out the records for a DB containing subdatabases.
*/
-gint
+int
db_dump_dump_sub(dbenv, parent_dbp, parent_name, pflag, keyflag)
DB_ENV *dbenv;
DB *parent_dbp;
- gchar *parent_name;
- gint pflag, keyflag;
+ char *parent_name;
+ int pflag, keyflag;
{
DB *dbp;
DBC *dbcp;
DBT key, data;
- gint ret;
- gchar *subdb;
+ int ret;
+ char *subdb;
/*
* Get a cursor and step through the database, dumping out each
@@ -457,13 +457,13 @@ db_dump_dump_sub(dbenv, parent_dbp, parent_name, pflag, keyflag)
* show_subs --
* Display the subdatabases for a database.
*/
-gint
+int
db_dump_show_subs(dbp)
DB *dbp;
{
DBC *dbcp;
DBT key, data;
- gint ret;
+ int ret;
/*
* Get a cursor and step through the database, printing out the key
@@ -499,17 +499,17 @@ db_dump_show_subs(dbp)
* dump --
* Dump out the records for a DB.
*/
-gint
+int
db_dump_dump(dbp, pflag, keyflag)
DB *dbp;
- gint pflag, keyflag;
+ int pflag, keyflag;
{
DBC *dbcp;
DBT key, data;
DBT keyret, dataret;
db_recno_t recno;
- gint is_recno, failed, ret;
- gpointer pointer;
+ int is_recno, failed, ret;
+ void *pointer;
/*
* Get a cursor and step through the database, printing out each
@@ -597,7 +597,7 @@ err: if (data.data != NULL)
* usage --
* Display the usage message.
*/
-gint
+int
db_dump_usage()
{
(void)fprintf(stderr, "%s\n\t%s\n",
@@ -606,11 +606,11 @@ db_dump_usage()
return (EXIT_FAILURE);
}
-gint
+int
db_dump_version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/build_vxworks/db_int.h b/libdb/build_vxworks/db_int.h
index f5565f1..eb6a8ea 100644
--- a/libdb/build_vxworks/db_int.h
+++ b/libdb/build_vxworks/db_int.h
@@ -132,7 +132,7 @@ typedef unsigned long db_alignp_t;
/* Structure used to print flag values. */
typedef struct __fn {
u_int32_t mask; /* Flag value. */
- const gchar *name; /* Flag name. */
+ const char *name; /* Flag name. */
} FN;
/* Set, clear and test flags. */
@@ -291,7 +291,7 @@ typedef enum {
if (!F_ISSET((dbp)->dbenv, DB_ENV_DBLOCAL)) \
return (__db_mi_env((dbp)->dbenv, name));
#define DB_ILLEGAL_METHOD(dbp, flags) { \
- gint __ret; \
+ int __ret; \
if ((__ret = __dbh_am_chk(dbp, flags)) != 0) \
return (__ret); \
}
diff --git a/libdb/build_vxworks/db_load/db_load.c b/libdb/build_vxworks/db_load/db_load.c
index 4d2915b..05b4bcd 100644
--- a/libdb/build_vxworks/db_load/db_load.c
+++ b/libdb/build_vxworks/db_load/db_load.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -29,7 +29,7 @@ static const gchar revid[] =
#include "dbinc/db_am.h"
typedef struct { /* XXX: Globals. */
- const gchar *progname; /* Program name. */
+ const char *progname; /* Program name. */
char *hdrbuf; /* Input file header. */
u_long lineno; /* Input file line number. */
u_long origline; /* Original file line number. */
@@ -44,19 +44,19 @@ typedef struct { /* XXX: Globals. */
void db_load_badend __P((DB_ENV *));
void db_load_badnum __P((DB_ENV *));
-int db_load_configure __P((DB_ENV *, DB *, gchar **, gchar **, gint *));
-int db_load_convprintable __P((DB_ENV *, gchar *, gchar **));
-int db_load_db_init __P((DB_ENV *, gchar *, u_int32_t, gint *));
+int db_load_configure __P((DB_ENV *, DB *, char **, char **, int *));
+int db_load_convprintable __P((DB_ENV *, char *, char **));
+int db_load_db_init __P((DB_ENV *, char *, u_int32_t, int *));
int db_load_dbt_rdump __P((DB_ENV *, DBT *));
int db_load_dbt_rprint __P((DB_ENV *, DBT *));
int db_load_dbt_rrecno __P((DB_ENV *, DBT *, int));
-int db_load_digitize __P((DB_ENV *, int, gint *));
+int db_load_digitize __P((DB_ENV *, int, int *));
int db_load_env_create __P((DB_ENV **, LDG *));
-int db_load_load __P((DB_ENV *, gchar *, DBTYPE, gchar **, u_int, LDG *, gint *));
-int db_load_main __P((int, gchar *[]));
-int db_load_rheader __P((DB_ENV *, DB *, DBTYPE *, gchar **, gint *, gint *));
+int db_load_load __P((DB_ENV *, char *, DBTYPE, char **, u_int, LDG *, int *));
+int db_load_main __P((int, char *[]));
+int db_load_rheader __P((DB_ENV *, DB *, DBTYPE *, char **, int *, int *));
int db_load_usage __P((void));
-int db_load_version_check __P((const gchar *));
+int db_load_version_check __P((const char *));
#define G(f) ((LDG *)dbenv->app_private)->f
@@ -65,12 +65,12 @@ int db_load_version_check __P((const gchar *));
#define LDF_NOOVERWRITE 0x02 /* Don't overwrite existing rows. */
#define LDF_PASSWORD 0x04 /* Encrypt created databases. */
-gint
+int
db_load(args)
- gchar *args;
+ char *args;
{
- gint argc;
- gchar **argv;
+ int argc;
+ char **argv;
__db_util_arg("db_load", args, &argc, &argv);
return (db_load_main(argc, argv) ? EXIT_FAILURE : EXIT_SUCCESS);
@@ -79,19 +79,19 @@ db_load(args)
#include <stdio.h>
#define ERROR_RETURN ERROR
-gint
+int
db_load_main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind, __db_getopt_reset;
+ extern char *optarg;
+ extern int optind, __db_getopt_reset;
DBTYPE dbtype;
DB_ENV *dbenv;
LDG ldg;
u_int32_t ldf;
- gint ch, existed, exitval, ret;
- gchar **clist, **clp;
+ int ch, existed, exitval, ret;
+ char **clist, **clp;
ldg.progname = "db_load";
ldg.lineno = 0;
@@ -110,7 +110,7 @@ db_load_main(argc, argv)
dbtype = DB_UNKNOWN;
/* Allocate enough room for configuration arguments. */
- if ((clp = clist = (gchar **)calloc(argc + 1, sizeof(gchar *))) == NULL) {
+ if ((clp = clist = (char **)calloc(argc + 1, sizeof(char *))) == NULL) {
fprintf(stderr, "%s: %s\n", ldg.progname, strerror(ENOMEM));
return (EXIT_FAILURE);
}
@@ -220,14 +220,14 @@ shutdown: exitval = 1;
* load --
* Load a database.
*/
-gint
+int
db_load_load(dbenv, name, argtype, clist, flags, ldg, existedp)
DB_ENV *dbenv;
- gchar *name, **clist;
+ char *name, **clist;
DBTYPE argtype;
u_int flags;
LDG *ldg;
- gint *existedp;
+ int *existedp;
{
DB *dbp;
DBT key, rkey, data, *readp, *writep;
@@ -235,8 +235,8 @@ db_load_load(dbenv, name, argtype, clist, flags, ldg, existedp)
DB_TXN *ctxn, *txn;
db_recno_t recno, datarecno;
u_int32_t put_flags;
- gint ascii_recno, checkprint, hexkeys, keyflag, keys, resize, ret, rval;
- gchar *subdb;
+ int ascii_recno, checkprint, hexkeys, keyflag, keys, resize, ret, rval;
+ char *subdb;
*existedp = 0;
@@ -380,11 +380,11 @@ retry_db:
key.data = &recno;
} else
key_data: if ((readp->data =
- (gpointer)malloc(readp->ulen = 1024)) == NULL) {
+ (void *)malloc(readp->ulen = 1024)) == NULL) {
dbenv->err(dbenv, ENOMEM, NULL);
goto err;
}
- if ((data.data = (gpointer)malloc(data.ulen = 1024)) == NULL) {
+ if ((data.data = (void *)malloc(data.ulen = 1024)) == NULL) {
dbenv->err(dbenv, ENOMEM, NULL);
goto err;
}
@@ -518,15 +518,15 @@ err: rval = 1;
* db_init --
* Initialize the environment.
*/
-gint
+int
db_load_db_init(dbenv, home, cache, is_private)
DB_ENV *dbenv;
- gchar *home;
+ char *home;
u_int32_t cache;
- gint *is_private;
+ int *is_private;
{
u_int32_t flags;
- gint ret;
+ int ret;
*is_private = 0;
/* We may be loading into a live environment. Try and join. */
@@ -600,16 +600,16 @@ db_load_db_init(dbenv, home, cache, is_private)
* configure --
* Handle command-line configuration options.
*/
-gint
+int
db_load_configure(dbenv, dbp, clp, subdbp, keysp)
DB_ENV *dbenv;
DB *dbp;
- gchar **clp, **subdbp;
- gint *keysp;
+ char **clp, **subdbp;
+ int *keysp;
{
long val;
- gint ret, savech;
- gchar *name, *value;
+ int ret, savech;
+ char *name, *value;
for (; (name = *clp) != NULL; *--value = savech, ++clp) {
if ((value = strchr(name, '=')) == NULL) {
@@ -673,17 +673,17 @@ nameerr:
* rheader --
* Read the header message.
*/
-gint
+int
db_load_rheader(dbenv, dbp, dbtypep, subdbp, checkprintp, keysp)
DB_ENV *dbenv;
DB *dbp;
DBTYPE *dbtypep;
- gchar **subdbp;
- gint *checkprintp, *keysp;
+ char **subdbp;
+ int *checkprintp, *keysp;
{
long val;
- gint ch, first, hdr, linelen, buflen, ret, start;
- gchar *buf, *name, *p, *value;
+ int ch, first, hdr, linelen, buflen, ret, start;
+ char *buf, *name, *p, *value;
*dbtypep = DB_UNKNOWN;
*checkprintp = 0;
@@ -696,7 +696,7 @@ db_load_rheader(dbenv, dbp, dbtypep, subdbp, checkprintp, keysp)
buflen = 4096;
if (G(hdrbuf) == NULL) {
hdr = 0;
- if ((buf = (gchar *)malloc(buflen)) == NULL) {
+ if ((buf = (char *)malloc(buflen)) == NULL) {
memerr: dbp->errx(dbp, "could not allocate buffer %d", buflen);
return (1);
}
@@ -731,7 +731,7 @@ memerr: dbp->errx(dbp, "could not allocate buffer %d", buflen);
/* If the buffer is too small, double it. */
if (linelen + start == buflen) {
- G(hdrbuf) = (gchar *)realloc(G(hdrbuf),
+ G(hdrbuf) = (char *)realloc(G(hdrbuf),
buflen *= 2);
if (G(hdrbuf) == NULL)
goto memerr;
@@ -881,23 +881,23 @@ badfmt:
* allocations that aren't likely to be a problem here), and this has fewer
* special cases to deal with.
*
- * Note that despite the printable encoding, the gchar * interface to this
+ * Note that despite the printable encoding, the char * interface to this
* function (which is, not coincidentally, also used for database naming)
* means that outstr cannot contain any nuls.
*/
-gint
+int
db_load_convprintable(dbenv, instr, outstrp)
DB_ENV *dbenv;
- gchar *instr, **outstrp;
+ char *instr, **outstrp;
{
- gchar c, *outstr;
- gint e1, e2;
+ char c, *outstr;
+ int e1, e2;
/*
* Just malloc a string big enough for the whole input string;
* the output string will be smaller (or of equal length).
*/
- if ((outstr = (gchar *)malloc(strlen(instr))) == NULL)
+ if ((outstr = (char *)malloc(strlen(instr))) == NULL)
return (ENOMEM);
*outstrp = outstr;
@@ -929,15 +929,15 @@ db_load_convprintable(dbenv, instr, outstrp)
* dbt_rprint --
* Read a printable line into a DBT structure.
*/
-gint
+int
db_load_dbt_rprint(dbenv, dbtp)
DB_ENV *dbenv;
DBT *dbtp;
{
u_int32_t len;
u_int8_t *p;
- gint c1, c2, e, escape, first;
- gchar buf[32];
+ int c1, c2, e, escape, first;
+ char buf[32];
++G(lineno);
@@ -989,7 +989,7 @@ db_load_dbt_rprint(dbenv, dbtp)
if (len >= dbtp->ulen - 10) {
dbtp->ulen *= 2;
if ((dbtp->data =
- (gpointer)realloc(dbtp->data, dbtp->ulen)) == NULL) {
+ (void *)realloc(dbtp->data, dbtp->ulen)) == NULL) {
dbenv->err(dbenv, ENOMEM, NULL);
return (1);
}
@@ -1007,15 +1007,15 @@ db_load_dbt_rprint(dbenv, dbtp)
* dbt_rdump --
* Read a byte dump line into a DBT structure.
*/
-gint
+int
db_load_dbt_rdump(dbenv, dbtp)
DB_ENV *dbenv;
DBT *dbtp;
{
u_int32_t len;
u_int8_t *p;
- gint c1, c2, e, first;
- gchar buf[32];
+ int c1, c2, e, first;
+ char buf[32];
++G(lineno);
@@ -1054,7 +1054,7 @@ db_load_dbt_rdump(dbenv, dbtp)
if (len >= dbtp->ulen - 10) {
dbtp->ulen *= 2;
if ((dbtp->data =
- (gpointer)realloc(dbtp->data, dbtp->ulen)) == NULL) {
+ (void *)realloc(dbtp->data, dbtp->ulen)) == NULL) {
dbenv->err(dbenv, ENOMEM, NULL);
return (1);
}
@@ -1074,13 +1074,13 @@ db_load_dbt_rdump(dbenv, dbtp)
* dbt_rrecno --
* Read a record number dump line into a DBT structure.
*/
-gint
+int
db_load_dbt_rrecno(dbenv, dbtp, ishex)
DB_ENV *dbenv;
DBT *dbtp;
- gint ishex;
+ int ishex;
{
- gchar buf[32], *p, *q;
+ char buf[32], *p, *q;
++G(lineno);
@@ -1133,10 +1133,10 @@ bad: db_load_badend(dbenv);
* digitize --
* Convert a character to an integer.
*/
-gint
+int
db_load_digitize(dbenv, c, errorp)
DB_ENV *dbenv;
- gint c, *errorp;
+ int c, *errorp;
{
switch (c) { /* Don't depend on ASCII ordering. */
case '0': return (0);
@@ -1190,7 +1190,7 @@ db_load_badend(dbenv)
* usage --
* Display the usage message.
*/
-gint
+int
db_load_usage()
{
(void)fprintf(stderr, "%s\n\t%s\n",
@@ -1199,11 +1199,11 @@ db_load_usage()
return (EXIT_FAILURE);
}
-gint
+int
db_load_version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
@@ -1218,13 +1218,13 @@ db_load_version_check(progname)
return (0);
}
-gint
+int
db_load_env_create(dbenvp, ldg)
DB_ENV **dbenvp;
LDG *ldg;
{
DB_ENV *dbenv;
- gint ret;
+ int ret;
if ((ret = db_env_create(dbenvp, 0)) != 0) {
fprintf(stderr,
diff --git a/libdb/build_vxworks/db_printlog/db_printlog.c b/libdb/build_vxworks/db_printlog/db_printlog.c
index 2a60fb3..18e2886 100644
--- a/libdb/build_vxworks/db_printlog/db_printlog.c
+++ b/libdb/build_vxworks/db_printlog/db_printlog.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -34,18 +34,18 @@ static const gchar revid[] =
#include "dbinc/rep.h"
#include "dbinc/txn.h"
-gint db_printlog_main __P((int, gchar *[]));
-gint db_printlog_usage __P((void));
-gint db_printlog_version_check __P((const gchar *));
-gint db_printlog_print_app_record __P((DB_ENV *, DBT *, DB_LSN *, db_recops));
-gint db_printlog_open_rep_db __P((DB_ENV *, DB **, DBC **));
+int db_printlog_main __P((int, char *[]));
+int db_printlog_usage __P((void));
+int db_printlog_version_check __P((const char *));
+int db_printlog_print_app_record __P((DB_ENV *, DBT *, DB_LSN *, db_recops));
+int db_printlog_open_rep_db __P((DB_ENV *, DB **, DBC **));
-gint
+int
db_printlog(args)
- gchar *args;
+ char *args;
{
- gint argc;
- gchar **argv;
+ int argc;
+ char **argv;
__db_util_arg("db_printlog", args, &argc, &argv);
return (db_printlog_main(argc, argv) ? EXIT_FAILURE : EXIT_SUCCESS);
@@ -54,24 +54,24 @@ db_printlog(args)
#include <stdio.h>
#define ERROR_RETURN ERROR
-gint
+int
db_printlog_main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind, __db_getopt_reset;
- const gchar *progname = "db_printlog";
+ extern char *optarg;
+ extern int optind, __db_getopt_reset;
+ const char *progname = "db_printlog";
DB *dbp;
DBC *dbc;
DB_ENV *dbenv;
DB_LOGC *logc;
- gint (**dtab) __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (**dtab) __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t dtabsize;
DBT data, keydbt;
DB_LSN key;
- gint ch, e_close, exitval, nflag, rflag, ret, repflag;
- gchar *home, *passwd;
+ int ch, e_close, exitval, nflag, rflag, ret, repflag;
+ char *home, *passwd;
if ((ret = db_printlog_version_check(progname)) != 0)
return (ret);
@@ -274,7 +274,7 @@ shutdown: exitval = 1;
return (exitval == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
-gint
+int
db_printlog_usage()
{
fprintf(stderr, "%s\n",
@@ -282,11 +282,11 @@ db_printlog_usage()
return (EXIT_FAILURE);
}
-gint
+int
db_printlog_version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
@@ -302,14 +302,14 @@ db_printlog_version_check(progname)
}
/* Print an unknown, application-specific log record as best we can. */
-gint
+int
db_printlog_print_app_record(dbenv, dbt, lsnp, op)
DB_ENV *dbenv;
DBT *dbt;
DB_LSN *lsnp;
db_recops op;
{
- gint ch;
+ int ch;
u_int32_t i, rectype;
DB_ASSERT(op == DB_TXN_PRINT);
@@ -338,13 +338,13 @@ db_printlog_print_app_record(dbenv, dbt, lsnp, op)
return (0);
}
-gint
+int
db_printlog_open_rep_db(dbenv, dbpp, dbcp)
DB_ENV *dbenv;
DB **dbpp;
DBC **dbcp;
{
- gint ret;
+ int ret;
DB *dbp;
*dbpp = NULL;
diff --git a/libdb/build_vxworks/db_recover/db_recover.c b/libdb/build_vxworks/db_recover/db_recover.c
index dd31d7c..9dd9ca7 100644
--- a/libdb/build_vxworks/db_recover/db_recover.c
+++ b/libdb/build_vxworks/db_recover/db_recover.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -36,17 +36,17 @@ static const gchar revid[] =
#include "db_int.h"
#include "dbinc/txn.h"
-gint db_recover_main __P((int, gchar *[]));
-gint db_recover_read_timestamp __P((const gchar *, gchar *, time_t *));
-gint db_recover_usage __P((void));
-gint db_recover_version_check __P((const gchar *));
+int db_recover_main __P((int, char *[]));
+int db_recover_read_timestamp __P((const char *, char *, time_t *));
+int db_recover_usage __P((void));
+int db_recover_version_check __P((const char *));
-gint
+int
db_recover(args)
- gchar *args;
+ char *args;
{
- gint argc;
- gchar **argv;
+ int argc;
+ char **argv;
__db_util_arg("db_recover", args, &argc, &argv);
return (db_recover_main(argc, argv) ? EXIT_FAILURE : EXIT_SUCCESS);
@@ -55,20 +55,20 @@ db_recover(args)
#include <stdio.h>
#define ERROR_RETURN ERROR
-gint
+int
db_recover_main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind, __db_getopt_reset;
- const gchar *progname = "db_recover";
+ extern char *optarg;
+ extern int optind, __db_getopt_reset;
+ const char *progname = "db_recover";
DB_ENV *dbenv;
DB_TXNREGION *region;
time_t now, timestamp;
u_int32_t flags;
- gint ch, exitval, fatal_recover, ret, retain_env, verbose;
- gchar *home, *passwd;
+ int ch, exitval, fatal_recover, ret, retain_env, verbose;
+ char *home, *passwd;
if ((ret = db_recover_version_check(progname)) != 0)
return (ret);
@@ -230,16 +230,16 @@ shutdown: exitval = 1;
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-gint
+int
db_recover_read_timestamp(progname, arg, timep)
- const gchar *progname;
- gchar *arg;
+ const char *progname;
+ char *arg;
time_t *timep;
{
struct tm *t;
time_t now;
- gint yearset;
- gchar *p;
+ int yearset;
+ char *p;
/* Start with the current time. */
(void)time(&now);
if ((t = localtime(&now)) == NULL) {
@@ -300,7 +300,7 @@ terr: fprintf(stderr,
return (0);
}
-gint
+int
db_recover_usage()
{
(void)fprintf(stderr, "%s\n",
@@ -308,11 +308,11 @@ db_recover_usage()
return (EXIT_FAILURE);
}
-gint
+int
db_recover_version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/build_vxworks/db_stat/db_stat.c b/libdb/build_vxworks/db_stat/db_stat.c
index 935b3a0..4cea8a9 100644
--- a/libdb/build_vxworks/db_stat/db_stat.c
+++ b/libdb/build_vxworks/db_stat/db_stat.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -44,31 +44,31 @@ static const gchar revid[] =
typedef enum { T_NOTSET,
T_DB, T_ENV, T_LOCK, T_LOG, T_MPOOL, T_REP, T_TXN } test_t;
-int db_stat_argcheck __P((gchar *, const gchar *));
+int db_stat_argcheck __P((char *, const char *));
int db_stat_btree_stats __P((DB_ENV *, DB *, DB_BTREE_STAT *, int));
-int db_stat_db_init __P((DB_ENV *, gchar *, test_t, u_int32_t, gint *));
-void db_stat_dl __P((const gchar *, u_long));
-void db_stat_dl_bytes __P((const gchar *, u_long, u_long, u_long));
+int db_stat_db_init __P((DB_ENV *, char *, test_t, u_int32_t, int *));
+void db_stat_dl __P((const char *, u_long));
+void db_stat_dl_bytes __P((const char *, u_long, u_long, u_long));
int db_stat_env_stats __P((DB_ENV *, u_int32_t));
int db_stat_hash_stats __P((DB_ENV *, DB *, int));
-int db_stat_lock_stats __P((DB_ENV *, gchar *, u_int32_t));
+int db_stat_lock_stats __P((DB_ENV *, char *, u_int32_t));
int db_stat_log_stats __P((DB_ENV *, u_int32_t));
-int db_stat_main __P((int, gchar *[]));
-int db_stat_mpool_stats __P((DB_ENV *, gchar *, u_int32_t));
+int db_stat_main __P((int, char *[]));
+int db_stat_mpool_stats __P((DB_ENV *, char *, u_int32_t));
void db_stat_prflags __P((u_int32_t, const FN *));
int db_stat_queue_stats __P((DB_ENV *, DB *, int));
int db_stat_rep_stats __P((DB_ENV *, u_int32_t));
-int db_stat_txn_compare __P((gconstpointer , gconstpointer ));
+int db_stat_txn_compare __P((const void *, const void *));
int db_stat_txn_stats __P((DB_ENV *, u_int32_t));
int db_stat_usage __P((void));
-int db_stat_version_check __P((const gchar *));
+int db_stat_version_check __P((const char *));
-gint
+int
db_stat(args)
- gchar *args;
+ char *args;
{
- gint argc;
- gchar **argv;
+ int argc;
+ char **argv;
__db_util_arg("db_stat", args, &argc, &argv);
return (db_stat_main(argc, argv) ? EXIT_FAILURE : EXIT_SUCCESS);
@@ -77,22 +77,22 @@ db_stat(args)
#include <stdio.h>
#define ERROR_RETURN ERROR
-gint
+int
db_stat_main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind, __db_getopt_reset;
- const gchar *progname = "db_stat";
+ extern char *optarg;
+ extern int optind, __db_getopt_reset;
+ const char *progname = "db_stat";
DB_ENV *dbenv;
DB_BTREE_STAT *sp;
DB *alt_dbp, *dbp;
test_t ttype;
u_int32_t cache;
- gint ch, checked, d_close, e_close, exitval, fast, flags;
- gint nflag, private, resize, ret;
- gchar *db, *home, *internal, *passwd, *subdb;
+ int ch, checked, d_close, e_close, exitval, fast, flags;
+ int nflag, private, resize, ret;
+ char *db, *home, *internal, *passwd, *subdb;
if ((ret = db_stat_version_check(progname)) != 0)
return (ret);
@@ -389,15 +389,15 @@ shutdown: exitval = 1;
* env_stats --
* Display environment statistics.
*/
-gint
+int
db_stat_env_stats(dbenv, flags)
DB_ENV *dbenv;
u_int32_t flags;
{
REGENV renv;
REGION *rp, regs[1024];
- gint n, ret;
- const gchar *lable;
+ int n, ret;
+ const char *lable;
n = sizeof(regs) / sizeof(regs[0]);
if ((ret = __db_e_stat(dbenv, &renv, regs, &n, flags)) != 0) {
@@ -461,12 +461,12 @@ db_stat_env_stats(dbenv, flags)
* btree_stats --
* Display btree/recno statistics.
*/
-gint
+int
db_stat_btree_stats(dbenv, dbp, msp, fast)
DB_ENV *dbenv;
DB *dbp;
DB_BTREE_STAT *msp;
- gint fast;
+ int fast;
{
static const FN fn[] = {
{ BTM_DUP, "duplicates" },
@@ -478,7 +478,7 @@ db_stat_btree_stats(dbenv, dbp, msp, fast)
{ 0, NULL }
};
DB_BTREE_STAT *sp;
- gint ret;
+ int ret;
COMPQUIET(dbenv, NULL);
@@ -549,11 +549,11 @@ db_stat_btree_stats(dbenv, dbp, msp, fast)
* hash_stats --
* Display hash statistics.
*/
-gint
+int
db_stat_hash_stats(dbenv, dbp, fast)
DB_ENV *dbenv;
DB *dbp;
- gint fast;
+ int fast;
{
static const FN fn[] = {
{ DB_HASH_DUP, "duplicates" },
@@ -561,7 +561,7 @@ db_stat_hash_stats(dbenv, dbp, fast)
{ 0, NULL }
};
DB_HASH_STAT *sp;
- gint ret;
+ int ret;
COMPQUIET(dbenv, NULL);
@@ -612,14 +612,14 @@ db_stat_hash_stats(dbenv, dbp, fast)
* queue_stats --
* Display queue statistics.
*/
-gint
+int
db_stat_queue_stats(dbenv, dbp, fast)
DB_ENV *dbenv;
DB *dbp;
- gint fast;
+ int fast;
{
DB_QUEUE_STAT *sp;
- gint ret;
+ int ret;
COMPQUIET(dbenv, NULL);
@@ -657,14 +657,14 @@ db_stat_queue_stats(dbenv, dbp, fast)
* lock_stats --
* Display lock statistics.
*/
-gint
+int
db_stat_lock_stats(dbenv, internal, flags)
DB_ENV *dbenv;
- gchar *internal;
+ char *internal;
u_int32_t flags;
{
DB_LOCK_STAT *sp;
- gint ret;
+ int ret;
if (internal != NULL) {
if ((ret =
@@ -728,13 +728,13 @@ db_stat_lock_stats(dbenv, internal, flags)
* log_stats --
* Display log statistics.
*/
-gint
+int
db_stat_log_stats(dbenv, flags)
DB_ENV *dbenv;
u_int32_t flags;
{
DB_LOG_STAT *sp;
- gint ret;
+ int ret;
if ((ret = dbenv->log_stat(dbenv, &sp, flags)) != 0) {
dbenv->err(dbenv, ret, NULL);
@@ -787,15 +787,15 @@ db_stat_log_stats(dbenv, flags)
* mpool_stats --
* Display mpool statistics.
*/
-gint
+int
db_stat_mpool_stats(dbenv, internal, flags)
DB_ENV *dbenv;
- gchar *internal;
+ char *internal;
u_int32_t flags;
{
DB_MPOOL_FSTAT **fsp;
DB_MPOOL_STAT *gsp;
- gint ret;
+ int ret;
if (internal != NULL) {
if ((ret =
@@ -902,14 +902,14 @@ db_stat_mpool_stats(dbenv, internal, flags)
* rep_stats --
* Display replication statistics.
*/
-gint
+int
db_stat_rep_stats(dbenv, flags)
DB_ENV *dbenv;
u_int32_t flags;
{
DB_REP_STAT *sp;
- gint is_client, ret;
- const gchar *p;
+ int is_client, ret;
+ const char *p;
if ((ret = dbenv->rep_stat(dbenv, &sp, flags)) != 0) {
dbenv->err(dbenv, ret, NULL);
@@ -1017,15 +1017,15 @@ db_stat_rep_stats(dbenv, flags)
* txn_stats --
* Display transaction statistics.
*/
-gint
+int
db_stat_txn_stats(dbenv, flags)
DB_ENV *dbenv;
u_int32_t flags;
{
DB_TXN_STAT *sp;
u_int32_t i;
- gint ret;
- const gchar *p;
+ int ret;
+ const char *p;
if ((ret = dbenv->txn_stat(dbenv, &sp, flags)) != 0) {
dbenv->err(dbenv, ret, NULL);
@@ -1078,9 +1078,9 @@ db_stat_txn_stats(dbenv, flags)
return (0);
}
-gint
+int
db_stat_txn_compare(a1, b1)
- gconstpointer a1, *b1;
+ const void *a1, *b1;
{
const DB_TXN_ACTIVE *a, *b;
@@ -1100,7 +1100,7 @@ db_stat_txn_compare(a1, b1)
*/
void
db_stat_dl(msg, value)
- const gchar *msg;
+ const char *msg;
u_long value;
{
/*
@@ -1119,10 +1119,10 @@ db_stat_dl(msg, value)
*/
void
db_stat_dl_bytes(msg, gbytes, mbytes, bytes)
- const gchar *msg;
+ const char *msg;
u_long gbytes, mbytes, bytes;
{
- const gchar *sep;
+ const char *sep;
/* Normalize the values. */
while (bytes >= MEGABYTE) {
@@ -1163,7 +1163,7 @@ db_stat_prflags(flags, fnp)
u_int32_t flags;
const FN *fnp;
{
- const gchar *sep;
+ const char *sep;
sep = "\t";
printf("Flags:");
@@ -1179,16 +1179,16 @@ db_stat_prflags(flags, fnp)
* db_init --
* Initialize the environment.
*/
-gint
+int
db_stat_db_init(dbenv, home, ttype, cache, is_private)
DB_ENV *dbenv;
- gchar *home;
+ char *home;
test_t ttype;
u_int32_t cache;
- gint *is_private;
+ int *is_private;
{
u_int32_t oflags;
- gint ret;
+ int ret;
/*
* If our environment open fails, and we're trying to look at a
@@ -1242,10 +1242,10 @@ db_stat_db_init(dbenv, home, ttype, cache, is_private)
* argcheck --
* Return if argument flags are okay.
*/
-gint
+int
db_stat_argcheck(arg, ok_args)
- gchar *arg;
- const gchar *ok_args;
+ char *arg;
+ const char *ok_args;
{
for (; *arg != '\0'; ++arg)
if (strchr(ok_args, *arg) == NULL)
@@ -1253,7 +1253,7 @@ db_stat_argcheck(arg, ok_args)
return (1);
}
-gint
+int
db_stat_usage()
{
fprintf(stderr, "%s\n\t%s\n",
@@ -1262,11 +1262,11 @@ db_stat_usage()
return (EXIT_FAILURE);
}
-gint
+int
db_stat_version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/build_vxworks/db_upgrade/db_upgrade.c b/libdb/build_vxworks/db_upgrade/db_upgrade.c
index 1040a26..b3fc3cc 100644
--- a/libdb/build_vxworks/db_upgrade/db_upgrade.c
+++ b/libdb/build_vxworks/db_upgrade/db_upgrade.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -25,16 +25,16 @@ static const gchar revid[] =
#include "db_int.h"
-gint db_upgrade_main __P((int, gchar *[]));
-gint db_upgrade_usage __P((void));
-gint db_upgrade_version_check __P((const gchar *));
+int db_upgrade_main __P((int, char *[]));
+int db_upgrade_usage __P((void));
+int db_upgrade_version_check __P((const char *));
-gint
+int
db_upgrade(args)
- gchar *args;
+ char *args;
{
- gint argc;
- gchar **argv;
+ int argc;
+ char **argv;
__db_util_arg("db_upgrade", args, &argc, &argv);
return (db_upgrade_main(argc, argv) ? EXIT_FAILURE : EXIT_SUCCESS);
@@ -43,19 +43,19 @@ db_upgrade(args)
#include <stdio.h>
#define ERROR_RETURN ERROR
-gint
+int
db_upgrade_main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind, __db_getopt_reset;
- const gchar *progname = "db_upgrade";
+ extern char *optarg;
+ extern int optind, __db_getopt_reset;
+ const char *progname = "db_upgrade";
DB *dbp;
DB_ENV *dbenv;
u_int32_t flags;
- gint ch, e_close, exitval, nflag, ret, t_ret;
- gchar *home, *passwd;
+ int ch, e_close, exitval, nflag, ret, t_ret;
+ char *home, *passwd;
if ((ret = db_upgrade_version_check(progname)) != 0)
return (ret);
@@ -177,7 +177,7 @@ shutdown: exitval = 1;
return (exitval == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
-gint
+int
db_upgrade_usage()
{
fprintf(stderr, "%s\n",
@@ -185,11 +185,11 @@ db_upgrade_usage()
return (EXIT_FAILURE);
}
-gint
+int
db_upgrade_version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/build_vxworks/db_verify/db_verify.c b/libdb/build_vxworks/db_verify/db_verify.c
index 862ab37..3f2fe4e 100644
--- a/libdb/build_vxworks/db_verify/db_verify.c
+++ b/libdb/build_vxworks/db_verify/db_verify.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -25,16 +25,16 @@ static const gchar revid[] =
#include "db_int.h"
-gint db_verify_main __P((int, gchar *[]));
-gint db_verify_usage __P((void));
-gint db_verify_version_check __P((const gchar *));
+int db_verify_main __P((int, char *[]));
+int db_verify_usage __P((void));
+int db_verify_version_check __P((const char *));
-gint
+int
db_verify(args)
- gchar *args;
+ char *args;
{
- gint argc;
- gchar **argv;
+ int argc;
+ char **argv;
__db_util_arg("db_verify", args, &argc, &argv);
return (db_verify_main(argc, argv) ? EXIT_FAILURE : EXIT_SUCCESS);
@@ -43,20 +43,20 @@ db_verify(args)
#include <stdio.h>
#define ERROR_RETURN ERROR
-gint
+int
db_verify_main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind, __db_getopt_reset;
- const gchar *progname = "db_verify";
+ extern char *optarg;
+ extern int optind, __db_getopt_reset;
+ const char *progname = "db_verify";
DB *dbp, *dbp1;
DB_ENV *dbenv;
u_int32_t cache;
- gint ch, d_close, e_close, exitval, nflag, oflag, private;
- gint quiet, resize, ret, t_ret;
- gchar *home, *passwd;
+ int ch, d_close, e_close, exitval, nflag, oflag, private;
+ int quiet, resize, ret, t_ret;
+ char *home, *passwd;
if ((ret = db_verify_version_check(progname)) != 0)
return (ret);
@@ -235,7 +235,7 @@ shutdown: exitval = 1;
return (exitval == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
-gint
+int
db_verify_usage()
{
fprintf(stderr, "%s\n",
@@ -243,11 +243,11 @@ db_verify_usage()
return (EXIT_FAILURE);
}
-gint
+int
db_verify_version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/build_vxworks/dbdemo/dbdemo.c b/libdb/build_vxworks/dbdemo/dbdemo.c
index e658248..887f71c 100644
--- a/libdb/build_vxworks/dbdemo/dbdemo.c
+++ b/libdb/build_vxworks/dbdemo/dbdemo.c
@@ -14,7 +14,7 @@
#include <string.h>
#ifdef _WIN32
-extern gint getopt(int, gchar * const *, const gchar *);
+extern int getopt(int, char * const *, const char *);
#else
#include <unistd.h>
#endif
@@ -23,15 +23,15 @@ extern gint getopt(int, gchar * const *, const gchar *);
#include <db_int.h>
#define DATABASE "access.db"
-gint dbdemo_main __P((int, gchar *[]));
-gint dbdemo_usage __P((void));
+int dbdemo_main __P((int, char *[]));
+int dbdemo_usage __P((void));
-gint
+int
dbdemo(args)
- gchar *args;
+ char *args;
{
- gint argc;
- gchar **argv;
+ int argc;
+ char **argv;
__db_util_arg("dbdemo", args, &argc, &argv);
return (dbdemo_main(argc, argv) ? EXIT_FAILURE : EXIT_SUCCESS);
@@ -40,19 +40,19 @@ dbdemo(args)
#include <stdio.h>
#define ERROR_RETURN ERROR
-gint
+int
dbdemo_main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gint optind, __db_getopt_reset;
+ extern int optind, __db_getopt_reset;
DB *dbp;
DBC *dbcp;
DBT key, data;
u_int32_t len;
- gint ch, ret, rflag;
- gchar *database, *p, *t, buf[1024], rbuf[1024];
- const gchar *progname = "dbdemo"; /* Program name. */
+ int ch, ret, rflag;
+ char *database, *p, *t, buf[1024], rbuf[1024];
+ const char *progname = "dbdemo"; /* Program name. */
rflag = 0;
__db_getopt_reset = 1;
@@ -146,8 +146,8 @@ dbdemo_main(argc, argv)
/* Walk through the database and print out the key/data pairs. */
while ((ret = dbcp->c_get(dbcp, &key, &data, DB_NEXT)) == 0)
printf("%.*s : %.*s\n",
- (int)key.size, (gchar *)key.data,
- (int)data.size, (gchar *)data.data);
+ (int)key.size, (char *)key.data,
+ (int)data.size, (char *)data.data);
if (ret != DB_NOTFOUND) {
dbp->err(dbp, ret, "DBcursor->get");
goto err2;
@@ -170,7 +170,7 @@ err1: (void)dbp->close(dbp, 0);
return (EXIT_FAILURE);
}
-gint
+int
dbdemo_usage()
{
(void)fprintf(stderr, "usage: ex_access [-r] [database]\n");
diff --git a/libdb/build_win32/db.h b/libdb/build_win32/db.h
index 13cfa06..5531f2e 100644
--- a/libdb/build_win32/db.h
+++ b/libdb/build_win32/db.h
@@ -74,23 +74,23 @@ extern "C" {
*/
#ifndef __BIT_TYPES_DEFINED__
#define __BIT_TYPES_DEFINED__
-typedef guchar u_int8_t;
+typedef unsigned char u_int8_t;
typedef short int16_t;
typedef unsigned short u_int16_t;
-typedef gint int32_t;
-typedef guint u_int32_t;
+typedef int int32_t;
+typedef unsigned int u_int32_t;
#endif
#if !defined(_WINSOCKAPI_)
-typedef guchar u_char;
+typedef unsigned char u_char;
typedef unsigned short u_short;
-typedef guint u_int;
+typedef unsigned int u_int;
typedef unsigned long u_long;
#endif
#if defined(_WIN64)
typedef __int64 ssize_t;
#else
-typedef gint ssize_t;
+typedef int ssize_t;
#endif
/* Basic types that are exported or quasi-exported. */
@@ -513,8 +513,8 @@ struct __db_log_cursor {
u_int32_t bp_maxrec; /* Max record length in the log file. */
/* Methods. */
- gint (*close) __P((DB_LOGC *, u_int32_t));
- gint (*get) __P((DB_LOGC *, DB_LSN *, DBT *, u_int32_t));
+ int (*close) __P((DB_LOGC *, u_int32_t));
+ int (*get) __P((DB_LOGC *, DB_LSN *, DBT *, u_int32_t));
#define DB_LOG_DISK 0x01 /* Log record came from disk. */
#define DB_LOG_LOCKED 0x02 /* Log region already locked */
@@ -526,7 +526,7 @@ struct __db_log_cursor {
struct __db_log_stat {
u_int32_t st_magic; /* Log file magic number. */
u_int32_t st_version; /* Log file version number. */
- gint st_mode; /* Log file mode. */
+ int st_mode; /* Log file mode. */
u_int32_t st_lg_bsize; /* Log buffer size. */
u_int32_t st_lg_size; /* Log file size. */
u_int32_t st_w_bytes; /* Bytes to log. */
@@ -615,22 +615,22 @@ struct __db_mpoolfile {
size_t len; /* Length of mmap'd region. */
/* Methods. */
- gint (*close) __P((DB_MPOOLFILE *, u_int32_t));
- gint (*get) __P((DB_MPOOLFILE *, db_pgno_t *, u_int32_t, gpointer ));
+ int (*close) __P((DB_MPOOLFILE *, u_int32_t));
+ int (*get) __P((DB_MPOOLFILE *, db_pgno_t *, u_int32_t, void *));
void (*get_fileid) __P((DB_MPOOLFILE *, u_int8_t *));
void (*last_pgno) __P((DB_MPOOLFILE *, db_pgno_t *));
- gint (*open)__P((DB_MPOOLFILE *, const gchar *, u_int32_t, int, size_t));
- gint (*put) __P((DB_MPOOLFILE *, gpointer , u_int32_t));
+ int (*open)__P((DB_MPOOLFILE *, const char *, u_int32_t, int, size_t));
+ int (*put) __P((DB_MPOOLFILE *, void *, u_int32_t));
void (*refcnt) __P((DB_MPOOLFILE *, db_pgno_t *));
- gint (*set) __P((DB_MPOOLFILE *, gpointer , u_int32_t));
- gint (*set_clear_len) __P((DB_MPOOLFILE *, u_int32_t));
- gint (*set_fileid) __P((DB_MPOOLFILE *, u_int8_t *));
- gint (*set_ftype) __P((DB_MPOOLFILE *, int));
- gint (*set_lsn_offset) __P((DB_MPOOLFILE *, int32_t));
- gint (*set_pgcookie) __P((DB_MPOOLFILE *, DBT *));
- gint (*set_priority) __P((DB_MPOOLFILE *, DB_CACHE_PRIORITY));
+ int (*set) __P((DB_MPOOLFILE *, void *, u_int32_t));
+ int (*set_clear_len) __P((DB_MPOOLFILE *, u_int32_t));
+ int (*set_fileid) __P((DB_MPOOLFILE *, u_int8_t *));
+ int (*set_ftype) __P((DB_MPOOLFILE *, int));
+ int (*set_lsn_offset) __P((DB_MPOOLFILE *, int32_t));
+ int (*set_pgcookie) __P((DB_MPOOLFILE *, DBT *));
+ int (*set_priority) __P((DB_MPOOLFILE *, DB_CACHE_PRIORITY));
void (*set_unlink) __P((DB_MPOOLFILE *, int));
- gint (*sync) __P((DB_MPOOLFILE *));
+ int (*sync) __P((DB_MPOOLFILE *));
/*
* MP_OPEN_CALLED and MP_READONLY do not need to be thread protected
@@ -686,7 +686,7 @@ struct __db_mpool_stat {
/* Mpool file statistics structure. */
struct __db_mpool_fstat {
- gchar *file_name; /* File name. */
+ char *file_name; /* File name. */
size_t st_pagesize; /* Page size. */
u_int32_t st_map; /* Pages from mapped files. */
u_int32_t st_cache_hit; /* Pages found in the cache. */
@@ -863,8 +863,8 @@ struct __db_rep_stat {
u_int32_t st_dupmasters; /* # of times a duplicate master
condition was detected.+ */
- gint st_env_id; /* Current environment ID. */
- gint st_env_priority; /* Current environment priority. */
+ int st_env_id; /* Current environment ID. */
+ int st_env_priority; /* Current environment priority. */
u_int32_t st_gen; /* Current generation number. */
u_int32_t st_log_duplicated; /* Log records received multiply.+ */
u_int32_t st_log_queued; /* Log records currently queued.+ */
@@ -872,7 +872,7 @@ struct __db_rep_stat {
u_int32_t st_log_queued_total; /* Total # of log recs. ever queued.+ */
u_int32_t st_log_records; /* Log records received and put.+ */
u_int32_t st_log_requested; /* Log recs. missed and requested.+ */
- gint st_master; /* Env. ID of the current master. */
+ int st_master; /* Env. ID of the current master. */
u_int32_t st_master_changes; /* # of times we've switched masters. */
u_int32_t st_msgs_badgen; /* Messages with a bad generation #.+ */
u_int32_t st_msgs_processed; /* Messages received and processed.+ */
@@ -881,7 +881,7 @@ struct __db_rep_stat {
u_int32_t st_msgs_send_failures;/* # of failed message sends.+ */
u_int32_t st_msgs_sent; /* # of successful message sends.+ */
u_int32_t st_newsites; /* # of NEWSITE msgs. received.+ */
- gint st_nsites; /* Current number of sites we will
+ int st_nsites; /* Current number of sites we will
assume during elections. */
u_int32_t st_nthrottles; /* # of times we were throttled. */
u_int32_t st_outdated; /* # of times we detected and returned
@@ -893,14 +893,14 @@ struct __db_rep_stat {
u_int32_t st_elections_won; /* # of elections won by this site.+ */
/* Statistics about an in-progress election. */
- gint st_election_cur_winner; /* Current front-runner. */
+ int st_election_cur_winner; /* Current front-runner. */
u_int32_t st_election_gen; /* Election generation number. */
DB_LSN st_election_lsn; /* Max. LSN of current winner. */
- gint st_election_nsites; /* # of "registered voters". */
- gint st_election_priority; /* Current election priority. */
- gint st_election_status; /* Current election status. */
- gint st_election_tiebreaker; /* Election tiebreaker value. */
- gint st_election_votes; /* Votes received in this round. */
+ int st_election_nsites; /* # of "registered voters". */
+ int st_election_priority; /* Current election priority. */
+ int st_election_status; /* Current election status. */
+ int st_election_tiebreaker; /* Election tiebreaker value. */
+ int st_election_votes; /* Votes received in this round. */
};
/*******************************************************
@@ -1039,9 +1039,9 @@ struct __db {
u_int32_t pgsize; /* Database logical page size. */
/* Callbacks. */
- gint (*db_append_recno) __P((DB *, DBT *, db_recno_t));
+ int (*db_append_recno) __P((DB *, DBT *, db_recno_t));
void (*db_feedback) __P((DB *, int, int));
- gint (*dup_compare) __P((DB *, const DBT *, const DBT *));
+ int (*dup_compare) __P((DB *, const DBT *, const DBT *));
void *app_private; /* Application-private handle. */
@@ -1176,79 +1176,79 @@ struct __db {
void *xa_internal; /* XA. */
/* Methods. */
- gint (*associate) __P((DB *, DB_TXN *, DB *, gint (*)(DB *, const DBT *,
+ int (*associate) __P((DB *, DB_TXN *, DB *, int (*)(DB *, const DBT *,
const DBT *, DBT *), u_int32_t));
- gint (*close) __P((DB *, u_int32_t));
- gint (*cursor) __P((DB *, DB_TXN *, DBC **, u_int32_t));
- gint (*del) __P((DB *, DB_TXN *, DBT *, u_int32_t));
- void (*err) __P((DB *, int, const gchar *, ...));
- void (*errx) __P((DB *, const gchar *, ...));
- gint (*fd) __P((DB *, gint *));
- gint (*get) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
- gint (*pget) __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
- gint (*get_byteswapped) __P((DB *, gint *));
- gint (*get_type) __P((DB *, DBTYPE *));
- gint (*join) __P((DB *, DBC **, DBC **, u_int32_t));
- gint (*key_range) __P((DB *,
+ int (*close) __P((DB *, u_int32_t));
+ int (*cursor) __P((DB *, DB_TXN *, DBC **, u_int32_t));
+ int (*del) __P((DB *, DB_TXN *, DBT *, u_int32_t));
+ void (*err) __P((DB *, int, const char *, ...));
+ void (*errx) __P((DB *, const char *, ...));
+ int (*fd) __P((DB *, int *));
+ int (*get) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+ int (*pget) __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
+ int (*get_byteswapped) __P((DB *, int *));
+ int (*get_type) __P((DB *, DBTYPE *));
+ int (*join) __P((DB *, DBC **, DBC **, u_int32_t));
+ int (*key_range) __P((DB *,
DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t));
- gint (*open) __P((DB *, DB_TXN *,
- const gchar *, const gchar *, DBTYPE, u_int32_t, int));
- gint (*put) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
- gint (*remove) __P((DB *, const gchar *, const gchar *, u_int32_t));
- gint (*rename) __P((DB *,
- const gchar *, const gchar *, const gchar *, u_int32_t));
- gint (*truncate) __P((DB *, DB_TXN *, u_int32_t *, u_int32_t));
- gint (*set_append_recno) __P((DB *, gint (*)(DB *, DBT *, db_recno_t)));
- gint (*set_alloc) __P((DB *, gpointer (*)(size_t),
- gpointer (*)(gpointer , size_t), void (*)(gpointer)));
- gint (*set_cachesize) __P((DB *, u_int32_t, u_int32_t, int));
- gint (*set_cache_priority) __P((DB *, DB_CACHE_PRIORITY));
- gint (*set_dup_compare) __P((DB *,
- gint (*)(DB *, const DBT *, const DBT *)));
- gint (*set_encrypt) __P((DB *, const gchar *, u_int32_t));
- void (*set_errcall) __P((DB *, void (*)(const gchar *, gchar *)));
+ int (*open) __P((DB *, DB_TXN *,
+ const char *, const char *, DBTYPE, u_int32_t, int));
+ int (*put) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+ int (*remove) __P((DB *, const char *, const char *, u_int32_t));
+ int (*rename) __P((DB *,
+ const char *, const char *, const char *, u_int32_t));
+ int (*truncate) __P((DB *, DB_TXN *, u_int32_t *, u_int32_t));
+ int (*set_append_recno) __P((DB *, int (*)(DB *, DBT *, db_recno_t)));
+ int (*set_alloc) __P((DB *, void *(*)(size_t),
+ void *(*)(void *, size_t), void (*)(void *)));
+ int (*set_cachesize) __P((DB *, u_int32_t, u_int32_t, int));
+ int (*set_cache_priority) __P((DB *, DB_CACHE_PRIORITY));
+ int (*set_dup_compare) __P((DB *,
+ int (*)(DB *, const DBT *, const DBT *)));
+ int (*set_encrypt) __P((DB *, const char *, u_int32_t));
+ void (*set_errcall) __P((DB *, void (*)(const char *, char *)));
void (*set_errfile) __P((DB *, FILE *));
- void (*set_errpfx) __P((DB *, const gchar *));
- gint (*set_feedback) __P((DB *, void (*)(DB *, int, int)));
- gint (*set_flags) __P((DB *, u_int32_t));
- gint (*set_lorder) __P((DB *, int));
- gint (*set_pagesize) __P((DB *, u_int32_t));
- gint (*set_paniccall) __P((DB *, void (*)(DB_ENV *, int)));
- gint (*stat) __P((DB *, gpointer , u_int32_t));
- gint (*sync) __P((DB *, u_int32_t));
- gint (*upgrade) __P((DB *, const gchar *, u_int32_t));
- gint (*verify) __P((DB *,
- const gchar *, const gchar *, FILE *, u_int32_t));
-
- gint (*set_bt_compare) __P((DB *,
- gint (*)(DB *, const DBT *, const DBT *)));
- gint (*set_bt_maxkey) __P((DB *, u_int32_t));
- gint (*set_bt_minkey) __P((DB *, u_int32_t));
- gint (*set_bt_prefix) __P((DB *,
+ void (*set_errpfx) __P((DB *, const char *));
+ int (*set_feedback) __P((DB *, void (*)(DB *, int, int)));
+ int (*set_flags) __P((DB *, u_int32_t));
+ int (*set_lorder) __P((DB *, int));
+ int (*set_pagesize) __P((DB *, u_int32_t));
+ int (*set_paniccall) __P((DB *, void (*)(DB_ENV *, int)));
+ int (*stat) __P((DB *, void *, u_int32_t));
+ int (*sync) __P((DB *, u_int32_t));
+ int (*upgrade) __P((DB *, const char *, u_int32_t));
+ int (*verify) __P((DB *,
+ const char *, const char *, FILE *, u_int32_t));
+
+ int (*set_bt_compare) __P((DB *,
+ int (*)(DB *, const DBT *, const DBT *)));
+ int (*set_bt_maxkey) __P((DB *, u_int32_t));
+ int (*set_bt_minkey) __P((DB *, u_int32_t));
+ int (*set_bt_prefix) __P((DB *,
size_t (*)(DB *, const DBT *, const DBT *)));
- gint (*set_h_ffactor) __P((DB *, u_int32_t));
- gint (*set_h_hash) __P((DB *,
- u_int32_t (*)(DB *, gconstpointer , u_int32_t)));
- gint (*set_h_nelem) __P((DB *, u_int32_t));
+ int (*set_h_ffactor) __P((DB *, u_int32_t));
+ int (*set_h_hash) __P((DB *,
+ u_int32_t (*)(DB *, const void *, u_int32_t)));
+ int (*set_h_nelem) __P((DB *, u_int32_t));
- gint (*set_re_delim) __P((DB *, int));
- gint (*set_re_len) __P((DB *, u_int32_t));
- gint (*set_re_pad) __P((DB *, int));
- gint (*set_re_source) __P((DB *, const gchar *));
- gint (*set_q_extentsize) __P((DB *, u_int32_t));
+ int (*set_re_delim) __P((DB *, int));
+ int (*set_re_len) __P((DB *, u_int32_t));
+ int (*set_re_pad) __P((DB *, int));
+ int (*set_re_source) __P((DB *, const char *));
+ int (*set_q_extentsize) __P((DB *, u_int32_t));
- gint (*db_am_remove) __P((DB *,
- DB_TXN *, const gchar *, const gchar *, DB_LSN *));
- gint (*db_am_rename) __P((DB *, DB_TXN *,
- const gchar *, const gchar *, const gchar *));
+ int (*db_am_remove) __P((DB *,
+ DB_TXN *, const char *, const char *, DB_LSN *));
+ int (*db_am_rename) __P((DB *, DB_TXN *,
+ const char *, const char *, const char *));
/*
* Never called; these are a place to save function pointers
* so that we can undo an associate.
*/
- gint (*stored_get) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
- gint (*stored_close) __P((DB *, u_int32_t));
+ int (*stored_get) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+ int (*stored_close) __P((DB *, u_int32_t));
#define DB_OK_BTREE 0x01
#define DB_OK_HASH 0x02
@@ -1399,25 +1399,25 @@ struct __dbc {
DBC_INTERNAL *internal; /* Access method private. */
- gint (*c_close) __P((DBC *)); /* Methods: public. */
- gint (*c_count) __P((DBC *, db_recno_t *, u_int32_t));
- gint (*c_del) __P((DBC *, u_int32_t));
- gint (*c_dup) __P((DBC *, DBC **, u_int32_t));
- gint (*c_get) __P((DBC *, DBT *, DBT *, u_int32_t));
- gint (*c_pget) __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
- gint (*c_put) __P((DBC *, DBT *, DBT *, u_int32_t));
+ int (*c_close) __P((DBC *)); /* Methods: public. */
+ int (*c_count) __P((DBC *, db_recno_t *, u_int32_t));
+ int (*c_del) __P((DBC *, u_int32_t));
+ int (*c_dup) __P((DBC *, DBC **, u_int32_t));
+ int (*c_get) __P((DBC *, DBT *, DBT *, u_int32_t));
+ int (*c_pget) __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
+ int (*c_put) __P((DBC *, DBT *, DBT *, u_int32_t));
/* Methods: private. */
- gint (*c_am_bulk) __P((DBC *, DBT *, u_int32_t));
- gint (*c_am_close) __P((DBC *, db_pgno_t, gint *));
- gint (*c_am_del) __P((DBC *));
- gint (*c_am_destroy) __P((DBC *));
- gint (*c_am_get) __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
- gint (*c_am_put) __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
- gint (*c_am_writelock) __P((DBC *));
+ int (*c_am_bulk) __P((DBC *, DBT *, u_int32_t));
+ int (*c_am_close) __P((DBC *, db_pgno_t, int *));
+ int (*c_am_del) __P((DBC *));
+ int (*c_am_destroy) __P((DBC *));
+ int (*c_am_get) __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
+ int (*c_am_put) __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
+ int (*c_am_writelock) __P((DBC *));
/* Private: for secondary indices. */
- gint (*c_real_get) __P((DBC *, DBT *, DBT *, u_int32_t));
+ int (*c_real_get) __P((DBC *, DBT *, DBT *, u_int32_t));
#define DBC_ACTIVE 0x0001 /* Cursor in use. */
#define DBC_COMPENSATE 0x0002 /* Cursor compensating, don't lock. */
@@ -1516,14 +1516,14 @@ struct __db_env {
FILE *db_errfile; /* Error message file stream. */
const char *db_errpfx; /* Error message prefix. */
/* Callbacks. */
- void (*db_errcall) __P((const gchar *, gchar *));
+ void (*db_errcall) __P((const char *, char *));
void (*db_feedback) __P((DB_ENV *, int, int));
void (*db_paniccall) __P((DB_ENV *, int));
/* App-specified alloc functions. */
- gpointer (*db_malloc) __P((size_t));
- gpointer (*db_realloc) __P((gpointer , size_t));
- void (*db_free) __P((gpointer));
+ void *(*db_malloc) __P((size_t));
+ void *(*db_realloc) __P((void *, size_t));
+ void (*db_free) __P((void *));
/*
* Currently, the verbose list is a bit field with room for 32
@@ -1539,7 +1539,7 @@ struct __db_env {
void *app_private; /* Application-private handle. */
- gint (*app_dispatch) /* User-specified recovery dispatch. */
+ int (*app_dispatch) /* User-specified recovery dispatch. */
__P((DB_ENV *, DBT *, DB_LSN *, db_recops));
/* Locking. */
@@ -1590,7 +1590,7 @@ struct __db_env {
DB_FH *lockfhp; /* fcntl(2) locking file handle. */
int (**recover_dtab) /* Dispatch table for recover funcs. */
- __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t recover_dtab_size;
/* Slots in the dispatch table. */
@@ -1646,106 +1646,106 @@ struct __db_env {
u_long *mt; /* Mersenne Twister state vector. */
/* DB_ENV Methods. */
- gint (*close) __P((DB_ENV *, u_int32_t));
- gint (*dbremove) __P((DB_ENV *,
- DB_TXN *, const gchar *, const gchar *, u_int32_t));
- gint (*dbrename) __P((DB_ENV *, DB_TXN *,
- const gchar *, const gchar *, const gchar *, u_int32_t));
- void (*err) __P((const DB_ENV *, int, const gchar *, ...));
- void (*errx) __P((const DB_ENV *, const gchar *, ...));
- gint (*open) __P((DB_ENV *, const gchar *, u_int32_t, int));
- gint (*remove) __P((DB_ENV *, const gchar *, u_int32_t));
- gint (*set_data_dir) __P((DB_ENV *, const gchar *));
- gint (*set_alloc) __P((DB_ENV *, gpointer (*)(size_t),
- gpointer (*)(gpointer , size_t), void (*)(gpointer)));
- gint (*set_app_dispatch) __P((DB_ENV *,
- gint (*)(DB_ENV *, DBT *, DB_LSN *, db_recops)));
- gint (*set_encrypt) __P((DB_ENV *, const gchar *, u_int32_t));
- void (*set_errcall) __P((DB_ENV *, void (*)(const gchar *, gchar *)));
+ int (*close) __P((DB_ENV *, u_int32_t));
+ int (*dbremove) __P((DB_ENV *,
+ DB_TXN *, const char *, const char *, u_int32_t));
+ int (*dbrename) __P((DB_ENV *, DB_TXN *,
+ const char *, const char *, const char *, u_int32_t));
+ void (*err) __P((const DB_ENV *, int, const char *, ...));
+ void (*errx) __P((const DB_ENV *, const char *, ...));
+ int (*open) __P((DB_ENV *, const char *, u_int32_t, int));
+ int (*remove) __P((DB_ENV *, const char *, u_int32_t));
+ int (*set_data_dir) __P((DB_ENV *, const char *));
+ int (*set_alloc) __P((DB_ENV *, void *(*)(size_t),
+ void *(*)(void *, size_t), void (*)(void *)));
+ int (*set_app_dispatch) __P((DB_ENV *,
+ int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops)));
+ int (*set_encrypt) __P((DB_ENV *, const char *, u_int32_t));
+ void (*set_errcall) __P((DB_ENV *, void (*)(const char *, char *)));
void (*set_errfile) __P((DB_ENV *, FILE *));
- void (*set_errpfx) __P((DB_ENV *, const gchar *));
- gint (*set_feedback) __P((DB_ENV *, void (*)(DB_ENV *, int, int)));
- gint (*set_flags) __P((DB_ENV *, u_int32_t, int));
- gint (*set_paniccall) __P((DB_ENV *, void (*)(DB_ENV *, int)));
- gint (*set_rpc_server) __P((DB_ENV *,
- gpointer , const gchar *, long, long, u_int32_t));
- gint (*set_shm_key) __P((DB_ENV *, long));
- gint (*set_tas_spins) __P((DB_ENV *, u_int32_t));
- gint (*set_tmp_dir) __P((DB_ENV *, const gchar *));
- gint (*set_verbose) __P((DB_ENV *, u_int32_t, int));
-
- gpointer lg_handle; /* Log handle and methods. */
- gint (*set_lg_bsize) __P((DB_ENV *, u_int32_t));
- gint (*set_lg_dir) __P((DB_ENV *, const gchar *));
- gint (*set_lg_max) __P((DB_ENV *, u_int32_t));
- gint (*set_lg_regionmax) __P((DB_ENV *, u_int32_t));
- gint (*log_archive) __P((DB_ENV *, gchar **[], u_int32_t));
- gint (*log_cursor) __P((DB_ENV *, DB_LOGC **, u_int32_t));
- gint (*log_file) __P((DB_ENV *, const DB_LSN *, gchar *, size_t));
- gint (*log_flush) __P((DB_ENV *, const DB_LSN *));
- gint (*log_put) __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
- gint (*log_stat) __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
-
- gpointer lk_handle; /* Lock handle and methods. */
- gint (*set_lk_conflicts) __P((DB_ENV *, u_int8_t *, int));
- gint (*set_lk_detect) __P((DB_ENV *, u_int32_t));
- gint (*set_lk_max) __P((DB_ENV *, u_int32_t));
- gint (*set_lk_max_locks) __P((DB_ENV *, u_int32_t));
- gint (*set_lk_max_lockers) __P((DB_ENV *, u_int32_t));
- gint (*set_lk_max_objects) __P((DB_ENV *, u_int32_t));
- gint (*lock_detect) __P((DB_ENV *, u_int32_t, u_int32_t, gint *));
- gint (*lock_dump_region) __P((DB_ENV *, gchar *, FILE *));
- gint (*lock_get) __P((DB_ENV *,
+ void (*set_errpfx) __P((DB_ENV *, const char *));
+ int (*set_feedback) __P((DB_ENV *, void (*)(DB_ENV *, int, int)));
+ int (*set_flags) __P((DB_ENV *, u_int32_t, int));
+ int (*set_paniccall) __P((DB_ENV *, void (*)(DB_ENV *, int)));
+ int (*set_rpc_server) __P((DB_ENV *,
+ void *, const char *, long, long, u_int32_t));
+ int (*set_shm_key) __P((DB_ENV *, long));
+ int (*set_tas_spins) __P((DB_ENV *, u_int32_t));
+ int (*set_tmp_dir) __P((DB_ENV *, const char *));
+ int (*set_verbose) __P((DB_ENV *, u_int32_t, int));
+
+ void *lg_handle; /* Log handle and methods. */
+ int (*set_lg_bsize) __P((DB_ENV *, u_int32_t));
+ int (*set_lg_dir) __P((DB_ENV *, const char *));
+ int (*set_lg_max) __P((DB_ENV *, u_int32_t));
+ int (*set_lg_regionmax) __P((DB_ENV *, u_int32_t));
+ int (*log_archive) __P((DB_ENV *, char **[], u_int32_t));
+ int (*log_cursor) __P((DB_ENV *, DB_LOGC **, u_int32_t));
+ int (*log_file) __P((DB_ENV *, const DB_LSN *, char *, size_t));
+ int (*log_flush) __P((DB_ENV *, const DB_LSN *));
+ int (*log_put) __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
+ int (*log_stat) __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
+
+ void *lk_handle; /* Lock handle and methods. */
+ int (*set_lk_conflicts) __P((DB_ENV *, u_int8_t *, int));
+ int (*set_lk_detect) __P((DB_ENV *, u_int32_t));
+ int (*set_lk_max) __P((DB_ENV *, u_int32_t));
+ int (*set_lk_max_locks) __P((DB_ENV *, u_int32_t));
+ int (*set_lk_max_lockers) __P((DB_ENV *, u_int32_t));
+ int (*set_lk_max_objects) __P((DB_ENV *, u_int32_t));
+ int (*lock_detect) __P((DB_ENV *, u_int32_t, u_int32_t, int *));
+ int (*lock_dump_region) __P((DB_ENV *, char *, FILE *));
+ int (*lock_get) __P((DB_ENV *,
u_int32_t, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *));
- gint (*lock_put) __P((DB_ENV *, DB_LOCK *));
- gint (*lock_id) __P((DB_ENV *, u_int32_t *));
- gint (*lock_id_free) __P((DB_ENV *, u_int32_t));
- gint (*lock_id_set) __P((DB_ENV *, u_int32_t, u_int32_t));
- gint (*lock_stat) __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
- gint (*lock_vec) __P((DB_ENV *,
+ int (*lock_put) __P((DB_ENV *, DB_LOCK *));
+ int (*lock_id) __P((DB_ENV *, u_int32_t *));
+ int (*lock_id_free) __P((DB_ENV *, u_int32_t));
+ int (*lock_id_set) __P((DB_ENV *, u_int32_t, u_int32_t));
+ int (*lock_stat) __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
+ int (*lock_vec) __P((DB_ENV *,
u_int32_t, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **));
- gint (*lock_downgrade) __P((DB_ENV *,
+ int (*lock_downgrade) __P((DB_ENV *,
DB_LOCK *, db_lockmode_t, u_int32_t));
- gpointer mp_handle; /* Mpool handle and methods. */
- gint (*set_mp_mmapsize) __P((DB_ENV *, size_t));
- gint (*set_cachesize) __P((DB_ENV *, u_int32_t, u_int32_t, int));
- gint (*memp_dump_region) __P((DB_ENV *, gchar *, FILE *));
- gint (*memp_fcreate) __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
- gint (*memp_nameop) __P((DB_ENV *,
- u_int8_t *, const gchar *, const gchar *, const gchar *));
- gint (*memp_register) __P((DB_ENV *, int,
- gint (*)(DB_ENV *, db_pgno_t, gpointer , DBT *),
- gint (*)(DB_ENV *, db_pgno_t, gpointer , DBT *)));
- gint (*memp_stat) __P((DB_ENV *,
+ void *mp_handle; /* Mpool handle and methods. */
+ int (*set_mp_mmapsize) __P((DB_ENV *, size_t));
+ int (*set_cachesize) __P((DB_ENV *, u_int32_t, u_int32_t, int));
+ int (*memp_dump_region) __P((DB_ENV *, char *, FILE *));
+ int (*memp_fcreate) __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
+ int (*memp_nameop) __P((DB_ENV *,
+ u_int8_t *, const char *, const char *, const char *));
+ int (*memp_register) __P((DB_ENV *, int,
+ int (*)(DB_ENV *, db_pgno_t, void *, DBT *),
+ int (*)(DB_ENV *, db_pgno_t, void *, DBT *)));
+ int (*memp_stat) __P((DB_ENV *,
DB_MPOOL_STAT **, DB_MPOOL_FSTAT ***, u_int32_t));
- gint (*memp_sync) __P((DB_ENV *, DB_LSN *));
- gint (*memp_trickle) __P((DB_ENV *, int, gint *));
-
- gpointer rep_handle; /* Replication handle and methods. */
- gint (*rep_elect) __P((DB_ENV *, int, int, u_int32_t, gint *));
- gint (*rep_flush) __P((DB_ENV *));
- gint (*rep_process_message) __P((DB_ENV *, DBT *, DBT *, gint *));
- gint (*rep_start) __P((DB_ENV *, DBT *, u_int32_t));
- gint (*rep_stat) __P((DB_ENV *, DB_REP_STAT **, u_int32_t));
- gint (*set_rep_election) __P((DB_ENV *,
+ int (*memp_sync) __P((DB_ENV *, DB_LSN *));
+ int (*memp_trickle) __P((DB_ENV *, int, int *));
+
+ void *rep_handle; /* Replication handle and methods. */
+ int (*rep_elect) __P((DB_ENV *, int, int, u_int32_t, int *));
+ int (*rep_flush) __P((DB_ENV *));
+ int (*rep_process_message) __P((DB_ENV *, DBT *, DBT *, int *));
+ int (*rep_start) __P((DB_ENV *, DBT *, u_int32_t));
+ int (*rep_stat) __P((DB_ENV *, DB_REP_STAT **, u_int32_t));
+ int (*set_rep_election) __P((DB_ENV *,
u_int32_t, u_int32_t, u_int32_t, u_int32_t));
- gint (*set_rep_limit) __P((DB_ENV *, u_int32_t, u_int32_t));
- gint (*set_rep_request) __P((DB_ENV *, u_int32_t, u_int32_t));
- gint (*set_rep_timeout) __P((DB_ENV *, u_int32_t, u_int32_t));
- gint (*set_rep_transport) __P((DB_ENV *, int,
- gint (*) (DB_ENV *, const DBT *, const DBT *, int, u_int32_t)));
-
- gpointer tx_handle; /* Txn handle and methods. */
- gint (*set_tx_max) __P((DB_ENV *, u_int32_t));
- gint (*set_tx_timestamp) __P((DB_ENV *, time_t *));
- gint (*txn_begin) __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
- gint (*txn_checkpoint) __P((DB_ENV *, u_int32_t, u_int32_t, u_int32_t));
- gint (*txn_id_set) __P((DB_ENV *, u_int32_t, u_int32_t));
- gint (*txn_recover) __P((DB_ENV *,
+ int (*set_rep_limit) __P((DB_ENV *, u_int32_t, u_int32_t));
+ int (*set_rep_request) __P((DB_ENV *, u_int32_t, u_int32_t));
+ int (*set_rep_timeout) __P((DB_ENV *, u_int32_t, u_int32_t));
+ int (*set_rep_transport) __P((DB_ENV *, int,
+ int (*) (DB_ENV *, const DBT *, const DBT *, int, u_int32_t)));
+
+ void *tx_handle; /* Txn handle and methods. */
+ int (*set_tx_max) __P((DB_ENV *, u_int32_t));
+ int (*set_tx_timestamp) __P((DB_ENV *, time_t *));
+ int (*txn_begin) __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
+ int (*txn_checkpoint) __P((DB_ENV *, u_int32_t, u_int32_t, u_int32_t));
+ int (*txn_id_set) __P((DB_ENV *, u_int32_t, u_int32_t));
+ int (*txn_recover) __P((DB_ENV *,
DB_PREPLIST *, long, long *, u_int32_t));
- gint (*txn_stat) __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
- gint (*set_timeout) __P((DB_ENV *, db_timeout_t, u_int32_t));
+ int (*txn_stat) __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
+ int (*set_timeout) __P((DB_ENV *, db_timeout_t, u_int32_t));
#define DB_TEST_ELECTINIT 1 /* after __rep_elect_init */
#define DB_TEST_ELECTSEND 2 /* after REP_ELECT msgnit */
@@ -1813,13 +1813,13 @@ typedef struct __db DBM;
#if defined(_XPG4_2)
typedef struct {
- gchar *dptr;
+ char *dptr;
size_t dsize;
} datum;
#else
typedef struct {
- gchar *dptr;
- gint dsize;
+ char *dptr;
+ int dsize;
} datum;
#endif
@@ -1866,8 +1866,8 @@ typedef enum {
} ACTION;
typedef struct entry {
- gchar *key;
- gchar *data;
+ char *key;
+ char *data;
} ENTRY;
#define hcreate(a) __db_hcreate(a)
@@ -1893,33 +1893,33 @@ typedef struct entry {
extern "C" {
#endif
-gint db_create __P((DB **, DB_ENV *, u_int32_t));
-gchar *db_strerror __P((int));
-gint db_env_create __P((DB_ENV **, u_int32_t));
-gchar *db_version __P((gint *, gint *, gint *));
-gint log_compare __P((const DB_LSN *, const DB_LSN *));
-gint db_env_set_func_close __P((gint (*)(int)));
-gint db_env_set_func_dirfree __P((void (*)(gchar **, int)));
-gint db_env_set_func_dirlist __P((gint (*)(const gchar *, gchar ***, gint *)));
-gint db_env_set_func_exists __P((gint (*)(const gchar *, gint *)));
-gint db_env_set_func_free __P((void (*)(gpointer)));
-gint db_env_set_func_fsync __P((gint (*)(int)));
-gint db_env_set_func_ioinfo __P((gint (*)(const gchar *, int, u_int32_t *, u_int32_t *, u_int32_t *)));
-gint db_env_set_func_malloc __P((gpointer (*)(size_t)));
-gint db_env_set_func_map __P((gint (*)(gchar *, size_t, int, int, gpointer *)));
-gint db_env_set_func_open __P((gint (*)(const gchar *, int, ...)));
-gint db_env_set_func_read __P((ssize_t (*)(int, gpointer , size_t)));
-gint db_env_set_func_realloc __P((gpointer (*)(gpointer , size_t)));
-gint db_env_set_func_rename __P((gint (*)(const gchar *, const gchar *)));
-gint db_env_set_func_seek __P((gint (*)(int, size_t, db_pgno_t, u_int32_t, int, int)));
-gint db_env_set_func_sleep __P((gint (*)(u_long, u_long)));
-gint db_env_set_func_unlink __P((gint (*)(const gchar *)));
-gint db_env_set_func_unmap __P((gint (*)(gpointer , size_t)));
-gint db_env_set_func_write __P((ssize_t (*)(int, gconstpointer , size_t)));
-gint db_env_set_func_yield __P((gint (*)(void)));
-gint txn_abort __P((DB_TXN *));
-gint txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
-gint txn_commit __P((DB_TXN *, u_int32_t));
+int db_create __P((DB **, DB_ENV *, u_int32_t));
+char *db_strerror __P((int));
+int db_env_create __P((DB_ENV **, u_int32_t));
+char *db_version __P((int *, int *, int *));
+int log_compare __P((const DB_LSN *, const DB_LSN *));
+int db_env_set_func_close __P((int (*)(int)));
+int db_env_set_func_dirfree __P((void (*)(char **, int)));
+int db_env_set_func_dirlist __P((int (*)(const char *, char ***, int *)));
+int db_env_set_func_exists __P((int (*)(const char *, int *)));
+int db_env_set_func_free __P((void (*)(void *)));
+int db_env_set_func_fsync __P((int (*)(int)));
+int db_env_set_func_ioinfo __P((int (*)(const char *, int, u_int32_t *, u_int32_t *, u_int32_t *)));
+int db_env_set_func_malloc __P((void *(*)(size_t)));
+int db_env_set_func_map __P((int (*)(char *, size_t, int, int, void **)));
+int db_env_set_func_open __P((int (*)(const char *, int, ...)));
+int db_env_set_func_read __P((ssize_t (*)(int, void *, size_t)));
+int db_env_set_func_realloc __P((void *(*)(void *, size_t)));
+int db_env_set_func_rename __P((int (*)(const char *, const char *)));
+int db_env_set_func_seek __P((int (*)(int, size_t, db_pgno_t, u_int32_t, int, int)));
+int db_env_set_func_sleep __P((int (*)(u_long, u_long)));
+int db_env_set_func_unlink __P((int (*)(const char *)));
+int db_env_set_func_unmap __P((int (*)(void *, size_t)));
+int db_env_set_func_write __P((ssize_t (*)(int, const void *, size_t)));
+int db_env_set_func_yield __P((int (*)(void)));
+int txn_abort __P((DB_TXN *));
+int txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
+int txn_commit __P((DB_TXN *, u_int32_t));
#if DB_DBM_HSEARCH != 0
int __db_ndbm_clearerr __P((DBM *));
void __db_ndbm_close __P((DBM *));
@@ -1929,7 +1929,7 @@ int __db_ndbm_error __P((DBM *));
datum __db_ndbm_fetch __P((DBM *, datum));
datum __db_ndbm_firstkey __P((DBM *));
datum __db_ndbm_nextkey __P((DBM *));
-DBM *__db_ndbm_open __P((const gchar *, int, int));
+DBM *__db_ndbm_open __P((const char *, int, int));
int __db_ndbm_pagfno __P((DBM *));
int __db_ndbm_rdonly __P((DBM *));
int __db_ndbm_store __P((DBM *, datum, datum, int));
@@ -1939,13 +1939,13 @@ int __db_dbm_delete __P((datum));
int __db_dbm_dirf __P((void));
datum __db_dbm_fetch __P((datum));
datum __db_dbm_firstkey __P((void));
-int __db_dbm_init __P((gchar *));
+int __db_dbm_init __P((char *));
datum __db_dbm_nextkey __P((datum));
int __db_dbm_pagf __P((void));
int __db_dbm_store __P((datum, datum));
#endif
#if DB_DBM_HSEARCH != 0
-gint __db_hcreate __P((size_t));
+int __db_hcreate __P((size_t));
ENTRY *__db_hsearch __P((ENTRY, ACTION));
void __db_hdestroy __P((void));
#endif
diff --git a/libdb/build_win32/db_config.h b/libdb/build_win32/db_config.h
index 544fad1..497bf37 100644
--- a/libdb/build_win32/db_config.h
+++ b/libdb/build_win32/db_config.h
@@ -411,9 +411,9 @@
#if defined(__cplusplus)
extern "C" {
#endif
-extern gint optind;
-extern gchar *optarg;
-extern gint getopt(int, gchar * const *, const gchar *);
+extern int optind;
+extern char *optarg;
+extern int getopt(int, char * const *, const char *);
#if defined(__cplusplus)
}
#endif
diff --git a/libdb/build_win32/db_cxx.h b/libdb/build_win32/db_cxx.h
index 28d4348..4929362 100644
--- a/libdb/build_win32/db_cxx.h
+++ b/libdb/build_win32/db_cxx.h
@@ -131,24 +131,24 @@ class DbTxnImp;
// the choices.
//
extern "C" {
- typedef gpointer (*db_malloc_fcn_type)
+ typedef void * (*db_malloc_fcn_type)
(size_t);
- typedef gpointer (*db_realloc_fcn_type)
- (gpointer , size_t);
+ typedef void * (*db_realloc_fcn_type)
+ (void *, size_t);
typedef void (*db_free_fcn_type)
- (gpointer);
- typedef gint (*bt_compare_fcn_type) /*C++ version available*/
+ (void *);
+ typedef int (*bt_compare_fcn_type) /*C++ version available*/
(DB *, const DBT *, const DBT *);
typedef size_t (*bt_prefix_fcn_type) /*C++ version available*/
(DB *, const DBT *, const DBT *);
- typedef gint (*dup_compare_fcn_type) /*C++ version available*/
+ typedef int (*dup_compare_fcn_type) /*C++ version available*/
(DB *, const DBT *, const DBT *);
typedef u_int32_t (*h_hash_fcn_type) /*C++ version available*/
- (DB *, gconstpointer , u_int32_t);
- typedef gint (*pgin_fcn_type)
- (DB_ENV *dbenv, db_pgno_t pgno, gpointer pgaddr, DBT *pgcookie);
- typedef gint (*pgout_fcn_type)
- (DB_ENV *dbenv, db_pgno_t pgno, gpointer pgaddr, DBT *pgcookie);
+ (DB *, const void *, u_int32_t);
+ typedef int (*pgin_fcn_type)
+ (DB_ENV *dbenv, db_pgno_t pgno, void *pgaddr, DBT *pgcookie);
+ typedef int (*pgout_fcn_type)
+ (DB_ENV *dbenv, db_pgno_t pgno, void *pgaddr, DBT *pgcookie);
};
////////////////////////////////////////////////////////////////
@@ -202,20 +202,20 @@ private:
DEFINE_DB_CLASS(DbMpoolFile);
public:
- gint close(u_int32_t flags);
- gint get(db_pgno_t *pgnoaddr, u_int32_t flags, gpointer pagep);
+ int close(u_int32_t flags);
+ int get(db_pgno_t *pgnoaddr, u_int32_t flags, void *pagep);
void last_pgno(db_pgno_t *pgnoaddr);
- gint open(const gchar *file, u_int32_t flags, gint mode, size_t pagesize);
- gint put(gpointer pgaddr, u_int32_t flags);
+ int open(const char *file, u_int32_t flags, int mode, size_t pagesize);
+ int put(void *pgaddr, u_int32_t flags);
void refcnt(db_pgno_t *pgnoaddr);
- gint set(gpointer pgaddr, u_int32_t flags);
- gint set_clear_len(u_int32_t len);
- gint set_fileid(u_int8_t *fileid);
- gint set_ftype(gint ftype);
- gint set_lsn_offset(int32_t offset);
- gint set_pgcookie(DBT *dbt);
+ int set(void *pgaddr, u_int32_t flags);
+ int set_clear_len(u_int32_t len);
+ int set_fileid(u_int8_t *fileid);
+ int set_ftype(int ftype);
+ int set_lsn_offset(int32_t offset);
+ int set_pgcookie(DBT *dbt);
void set_unlink(int);
- gint sync();
+ int sync();
virtual DB_MPOOLFILE *get_DB_MPOOLFILE()
{
@@ -275,12 +275,12 @@ private:
DEFINE_DB_CLASS(DbTxn);
public:
- gint abort();
- gint commit(u_int32_t flags);
- gint discard(u_int32_t flags);
+ int abort();
+ int commit(u_int32_t flags);
+ int discard(u_int32_t flags);
u_int32_t id();
- gint prepare(u_int8_t *gid);
- gint set_timeout(db_timeout_t timeout, u_int32_t flags);
+ int prepare(u_int8_t *gid);
+ int set_timeout(db_timeout_t timeout, u_int32_t flags);
virtual DB_TXN *get_DB_TXN()
{
@@ -355,56 +355,56 @@ public:
// These methods match those in the C interface.
//
- virtual gint close(u_int32_t);
- virtual gint dbremove(DbTxn *txn, const gchar *name, const gchar *subdb,
+ virtual int close(u_int32_t);
+ virtual int dbremove(DbTxn *txn, const char *name, const char *subdb,
u_int32_t flags);
- virtual gint dbrename(DbTxn *txn, const gchar *name, const gchar *subdb,
- const gchar *newname, u_int32_t flags);
- virtual void err(int, const gchar *, ...);
- virtual void errx(const gchar *, ...);
- virtual gpointer get_app_private() const;
- virtual gint open(const gchar *, u_int32_t, int);
- virtual gint remove(const gchar *, u_int32_t);
- virtual gint set_alloc(db_malloc_fcn_type, db_realloc_fcn_type,
+ virtual int dbrename(DbTxn *txn, const char *name, const char *subdb,
+ const char *newname, u_int32_t flags);
+ virtual void err(int, const char *, ...);
+ virtual void errx(const char *, ...);
+ virtual void *get_app_private() const;
+ virtual int open(const char *, u_int32_t, int);
+ virtual int remove(const char *, u_int32_t);
+ virtual int set_alloc(db_malloc_fcn_type, db_realloc_fcn_type,
db_free_fcn_type);
- virtual void set_app_private(gpointer);
- virtual gint set_cachesize(u_int32_t, u_int32_t, int);
- virtual gint set_data_dir(const gchar *);
- virtual gint set_encrypt(const gchar *, int);
- virtual void set_errcall(void (*)(const gchar *, gchar *));
+ virtual void set_app_private(void *);
+ virtual int set_cachesize(u_int32_t, u_int32_t, int);
+ virtual int set_data_dir(const char *);
+ virtual int set_encrypt(const char *, int);
+ virtual void set_errcall(void (*)(const char *, char *));
virtual void set_errfile(FILE *);
- virtual void set_errpfx(const gchar *);
- virtual gint set_flags(u_int32_t, int);
- virtual gint set_feedback(void (*)(DbEnv *, int, int));
- virtual gint set_lg_bsize(u_int32_t);
- virtual gint set_lg_dir(const gchar *);
- virtual gint set_lg_max(u_int32_t);
- virtual gint set_lg_regionmax(u_int32_t);
- virtual gint set_lk_conflicts(u_int8_t *, int);
- virtual gint set_lk_detect(u_int32_t);
- virtual gint set_lk_max(u_int32_t);
- virtual gint set_lk_max_lockers(u_int32_t);
- virtual gint set_lk_max_locks(u_int32_t);
- virtual gint set_lk_max_objects(u_int32_t);
- virtual gint set_mp_mmapsize(size_t);
- virtual gint set_paniccall(void (*)(DbEnv *, int));
- virtual gint set_rpc_server(gpointer , gchar *, long, long, u_int32_t);
- virtual gint set_shm_key(long);
- virtual gint set_timeout(db_timeout_t timeout, u_int32_t flags);
- virtual gint set_tmp_dir(const gchar *);
- virtual gint set_tas_spins(u_int32_t);
- virtual gint set_tx_max(u_int32_t);
- virtual gint set_app_dispatch(gint (*)(DbEnv *,
+ virtual void set_errpfx(const char *);
+ virtual int set_flags(u_int32_t, int);
+ virtual int set_feedback(void (*)(DbEnv *, int, int));
+ virtual int set_lg_bsize(u_int32_t);
+ virtual int set_lg_dir(const char *);
+ virtual int set_lg_max(u_int32_t);
+ virtual int set_lg_regionmax(u_int32_t);
+ virtual int set_lk_conflicts(u_int8_t *, int);
+ virtual int set_lk_detect(u_int32_t);
+ virtual int set_lk_max(u_int32_t);
+ virtual int set_lk_max_lockers(u_int32_t);
+ virtual int set_lk_max_locks(u_int32_t);
+ virtual int set_lk_max_objects(u_int32_t);
+ virtual int set_mp_mmapsize(size_t);
+ virtual int set_paniccall(void (*)(DbEnv *, int));
+ virtual int set_rpc_server(void *, char *, long, long, u_int32_t);
+ virtual int set_shm_key(long);
+ virtual int set_timeout(db_timeout_t timeout, u_int32_t flags);
+ virtual int set_tmp_dir(const char *);
+ virtual int set_tas_spins(u_int32_t);
+ virtual int set_tx_max(u_int32_t);
+ virtual int set_app_dispatch(int (*)(DbEnv *,
Dbt *, DbLsn *, db_recops));
- virtual gint set_tx_timestamp(time_t *);
- virtual gint set_verbose(u_int32_t which, gint onoff);
+ virtual int set_tx_timestamp(time_t *);
+ virtual int set_verbose(u_int32_t which, int onoff);
// Version information. A static method so it can be obtained anytime.
//
- static gchar *version(gint *major, gint *minor, gint *patch);
+ static char *version(int *major, int *minor, int *patch);
// Convert DB errors to strings
- static gchar *strerror(int);
+ static char *strerror(int);
// If an error is detected and the error call function
// or stream is set, a message is dispatched or printed.
@@ -418,66 +418,66 @@ public:
virtual void set_error_stream(__DB_OSTREAMCLASS *);
// used internally
- static void runtime_error(const gchar *caller, gint err,
- gint error_policy);
- static void runtime_error_dbt(const gchar *caller, Dbt *dbt,
- gint error_policy);
- static void runtime_error_lock_get(const gchar *caller, gint err,
+ static void runtime_error(const char *caller, int err,
+ int error_policy);
+ static void runtime_error_dbt(const char *caller, Dbt *dbt,
+ int error_policy);
+ static void runtime_error_lock_get(const char *caller, int err,
db_lockop_t op, db_lockmode_t mode,
- const Dbt *obj, DbLock lock, gint index,
- gint error_policy);
+ const Dbt *obj, DbLock lock, int index,
+ int error_policy);
// Lock functions
//
- virtual gint lock_detect(u_int32_t flags, u_int32_t atype, gint *aborted);
- virtual gint lock_get(u_int32_t locker, u_int32_t flags, const Dbt *obj,
+ virtual int lock_detect(u_int32_t flags, u_int32_t atype, int *aborted);
+ virtual int lock_get(u_int32_t locker, u_int32_t flags, const Dbt *obj,
db_lockmode_t lock_mode, DbLock *lock);
- virtual gint lock_id(u_int32_t *idp);
- virtual gint lock_id_free(u_int32_t id);
- virtual gint lock_put(DbLock *lock);
- virtual gint lock_stat(DB_LOCK_STAT **statp, u_int32_t flags);
- virtual gint lock_vec(u_int32_t locker, u_int32_t flags, DB_LOCKREQ list[],
- gint nlist, DB_LOCKREQ **elistp);
+ virtual int lock_id(u_int32_t *idp);
+ virtual int lock_id_free(u_int32_t id);
+ virtual int lock_put(DbLock *lock);
+ virtual int lock_stat(DB_LOCK_STAT **statp, u_int32_t flags);
+ virtual int lock_vec(u_int32_t locker, u_int32_t flags, DB_LOCKREQ list[],
+ int nlist, DB_LOCKREQ **elistp);
// Log functions
//
- virtual gint log_archive(gchar **list[], u_int32_t flags);
- static gint log_compare(const DbLsn *lsn0, const DbLsn *lsn1);
- virtual gint log_cursor(DbLogc **cursorp, u_int32_t flags);
- virtual gint log_file(DbLsn *lsn, gchar *namep, size_t len);
- virtual gint log_flush(const DbLsn *lsn);
- virtual gint log_put(DbLsn *lsn, const Dbt *data, u_int32_t flags);
+ virtual int log_archive(char **list[], u_int32_t flags);
+ static int log_compare(const DbLsn *lsn0, const DbLsn *lsn1);
+ virtual int log_cursor(DbLogc **cursorp, u_int32_t flags);
+ virtual int log_file(DbLsn *lsn, char *namep, size_t len);
+ virtual int log_flush(const DbLsn *lsn);
+ virtual int log_put(DbLsn *lsn, const Dbt *data, u_int32_t flags);
- virtual gint log_stat(DB_LOG_STAT **spp, u_int32_t flags);
+ virtual int log_stat(DB_LOG_STAT **spp, u_int32_t flags);
// Mpool functions
//
- virtual gint memp_fcreate(DbMpoolFile **dbmfp, u_int32_t flags);
- virtual gint memp_register(gint ftype,
+ virtual int memp_fcreate(DbMpoolFile **dbmfp, u_int32_t flags);
+ virtual int memp_register(int ftype,
pgin_fcn_type pgin_fcn,
pgout_fcn_type pgout_fcn);
- virtual gint memp_stat(DB_MPOOL_STAT
+ virtual int memp_stat(DB_MPOOL_STAT
**gsp, DB_MPOOL_FSTAT ***fsp, u_int32_t flags);
- virtual gint memp_sync(DbLsn *lsn);
- virtual gint memp_trickle(gint pct, gint *nwrotep);
+ virtual int memp_sync(DbLsn *lsn);
+ virtual int memp_trickle(int pct, int *nwrotep);
// Transaction functions
//
- virtual gint txn_begin(DbTxn *pid, DbTxn **tid, u_int32_t flags);
- virtual gint txn_checkpoint(u_int32_t kbyte, u_int32_t min, u_int32_t flags);
- virtual gint txn_recover(DbPreplist *preplist, long count,
+ virtual int txn_begin(DbTxn *pid, DbTxn **tid, u_int32_t flags);
+ virtual int txn_checkpoint(u_int32_t kbyte, u_int32_t min, u_int32_t flags);
+ virtual int txn_recover(DbPreplist *preplist, long count,
long *retp, u_int32_t flags);
- virtual gint txn_stat(DB_TXN_STAT **statp, u_int32_t flags);
+ virtual int txn_stat(DB_TXN_STAT **statp, u_int32_t flags);
// Replication functions
//
- virtual gint rep_elect(int, int, u_int32_t, gint *);
- virtual gint rep_process_message(Dbt *, Dbt *, gint *);
- virtual gint rep_start(Dbt *, u_int32_t);
- virtual gint rep_stat(DB_REP_STAT **statp, u_int32_t flags);
- virtual gint set_rep_limit(u_int32_t, u_int32_t);
- virtual gint set_rep_transport(u_int32_t,
- gint (*)(DbEnv *, const Dbt *, const Dbt *, int, u_int32_t));
+ virtual int rep_elect(int, int, u_int32_t, int *);
+ virtual int rep_process_message(Dbt *, Dbt *, int *);
+ virtual int rep_start(Dbt *, u_int32_t);
+ virtual int rep_stat(DB_REP_STAT **statp, u_int32_t flags);
+ virtual int set_rep_limit(u_int32_t, u_int32_t);
+ virtual int set_rep_transport(u_int32_t,
+ int (*)(DbEnv *, const Dbt *, const Dbt *, int, u_int32_t));
// Conversion functions
//
@@ -508,19 +508,19 @@ public:
// via C functions. They should never be called by users
// of this class.
//
- static void _stream_error_function(const gchar *, gchar *);
- static gint _app_dispatch_intercept(DB_ENV *env, DBT *dbt, DB_LSN *lsn,
+ static void _stream_error_function(const char *, char *);
+ static int _app_dispatch_intercept(DB_ENV *env, DBT *dbt, DB_LSN *lsn,
db_recops op);
- static void _paniccall_intercept(DB_ENV *env, gint errval);
- static void _feedback_intercept(DB_ENV *env, gint opcode, gint pct);
- static gint _rep_send_intercept(DB_ENV *env,
+ static void _paniccall_intercept(DB_ENV *env, int errval);
+ static void _feedback_intercept(DB_ENV *env, int opcode, int pct);
+ static int _rep_send_intercept(DB_ENV *env,
const DBT *cntrl, const DBT *data,
- gint id, u_int32_t flags);
+ int id, u_int32_t flags);
private:
void cleanup();
- gint initialize(DB_ENV *env);
- gint error_policy();
+ int initialize(DB_ENV *env);
+ int error_policy();
// For internal use only.
DbEnv(DB_ENV *, u_int32_t flags);
@@ -530,16 +530,16 @@ private:
void operator = (const DbEnv &);
// instance data
- gint construct_error_;
+ int construct_error_;
u_int32_t construct_flags_;
- gint (*app_dispatch_callback_)(DbEnv *, Dbt *, DbLsn *, db_recops);
+ int (*app_dispatch_callback_)(DbEnv *, Dbt *, DbLsn *, db_recops);
void (*feedback_callback_)(DbEnv *, int, int);
void (*paniccall_callback_)(DbEnv *, int);
- gint (*pgin_callback_)(DbEnv *dbenv, db_pgno_t pgno,
- gpointer pgaddr, Dbt *pgcookie);
- gint (*pgout_callback_)(DbEnv *dbenv, db_pgno_t pgno,
- gpointer pgaddr, Dbt *pgcookie);
- gint (*rep_send_callback_)(DbEnv *,
+ int (*pgin_callback_)(DbEnv *dbenv, db_pgno_t pgno,
+ void *pgaddr, Dbt *pgcookie);
+ int (*pgout_callback_)(DbEnv *dbenv, db_pgno_t pgno,
+ void *pgaddr, Dbt *pgcookie);
+ int (*rep_send_callback_)(DbEnv *,
const Dbt *, const Dbt *, int, u_int32_t);
// class data
@@ -569,65 +569,65 @@ public:
// These methods exactly match those in the C interface.
//
- virtual gint associate(DbTxn *txn, Db *secondary,
- gint (*callback)(Db *, const Dbt *, const Dbt *, Dbt *),
+ virtual int associate(DbTxn *txn, Db *secondary,
+ int (*callback)(Db *, const Dbt *, const Dbt *, Dbt *),
u_int32_t flags);
- virtual gint close(u_int32_t flags);
- virtual gint cursor(DbTxn *txnid, Dbc **cursorp, u_int32_t flags);
- virtual gint del(DbTxn *txnid, Dbt *key, u_int32_t flags);
- virtual void err(int, const gchar *, ...);
- virtual void errx(const gchar *, ...);
- virtual gint fd(gint *fdp);
- virtual gint get(DbTxn *txnid, Dbt *key, Dbt *data, u_int32_t flags);
- virtual gpointer get_app_private() const;
- virtual gint get_byteswapped(gint *);
- virtual gint get_type(DBTYPE *);
- virtual gint join(Dbc **curslist, Dbc **dbcp, u_int32_t flags);
- virtual gint key_range(DbTxn *, Dbt *, DB_KEY_RANGE *, u_int32_t);
- virtual gint open(DbTxn *txnid,
- const gchar *, const gchar *subname, DBTYPE, u_int32_t, int);
- virtual gint pget(DbTxn *txnid, Dbt *key, Dbt *pkey, Dbt *data,
+ virtual int close(u_int32_t flags);
+ virtual int cursor(DbTxn *txnid, Dbc **cursorp, u_int32_t flags);
+ virtual int del(DbTxn *txnid, Dbt *key, u_int32_t flags);
+ virtual void err(int, const char *, ...);
+ virtual void errx(const char *, ...);
+ virtual int fd(int *fdp);
+ virtual int get(DbTxn *txnid, Dbt *key, Dbt *data, u_int32_t flags);
+ virtual void *get_app_private() const;
+ virtual int get_byteswapped(int *);
+ virtual int get_type(DBTYPE *);
+ virtual int join(Dbc **curslist, Dbc **dbcp, u_int32_t flags);
+ virtual int key_range(DbTxn *, Dbt *, DB_KEY_RANGE *, u_int32_t);
+ virtual int open(DbTxn *txnid,
+ const char *, const char *subname, DBTYPE, u_int32_t, int);
+ virtual int pget(DbTxn *txnid, Dbt *key, Dbt *pkey, Dbt *data,
u_int32_t flags);
- virtual gint put(DbTxn *, Dbt *, Dbt *, u_int32_t);
- virtual gint remove(const gchar *, const gchar *, u_int32_t);
- virtual gint rename(const gchar *, const gchar *, const gchar *, u_int32_t);
- virtual gint set_alloc(db_malloc_fcn_type, db_realloc_fcn_type,
+ virtual int put(DbTxn *, Dbt *, Dbt *, u_int32_t);
+ virtual int remove(const char *, const char *, u_int32_t);
+ virtual int rename(const char *, const char *, const char *, u_int32_t);
+ virtual int set_alloc(db_malloc_fcn_type, db_realloc_fcn_type,
db_free_fcn_type);
- virtual void set_app_private(gpointer);
- virtual gint set_append_recno(gint (*)(Db *, Dbt *, db_recno_t));
- virtual gint set_bt_compare(bt_compare_fcn_type); /*deprecated*/
- virtual gint set_bt_compare(gint (*)(Db *, const Dbt *, const Dbt *));
- virtual gint set_bt_maxkey(u_int32_t);
- virtual gint set_bt_minkey(u_int32_t);
- virtual gint set_bt_prefix(bt_prefix_fcn_type); /*deprecated*/
- virtual gint set_bt_prefix(size_t (*)(Db *, const Dbt *, const Dbt *));
- virtual gint set_cachesize(u_int32_t, u_int32_t, int);
- virtual gint set_cache_priority(DB_CACHE_PRIORITY);
- virtual gint set_dup_compare(dup_compare_fcn_type); /*deprecated*/
- virtual gint set_dup_compare(gint (*)(Db *, const Dbt *, const Dbt *));
- virtual gint set_encrypt(const gchar *, int);
- virtual void set_errcall(void (*)(const gchar *, gchar *));
+ virtual void set_app_private(void *);
+ virtual int set_append_recno(int (*)(Db *, Dbt *, db_recno_t));
+ virtual int set_bt_compare(bt_compare_fcn_type); /*deprecated*/
+ virtual int set_bt_compare(int (*)(Db *, const Dbt *, const Dbt *));
+ virtual int set_bt_maxkey(u_int32_t);
+ virtual int set_bt_minkey(u_int32_t);
+ virtual int set_bt_prefix(bt_prefix_fcn_type); /*deprecated*/
+ virtual int set_bt_prefix(size_t (*)(Db *, const Dbt *, const Dbt *));
+ virtual int set_cachesize(u_int32_t, u_int32_t, int);
+ virtual int set_cache_priority(DB_CACHE_PRIORITY);
+ virtual int set_dup_compare(dup_compare_fcn_type); /*deprecated*/
+ virtual int set_dup_compare(int (*)(Db *, const Dbt *, const Dbt *));
+ virtual int set_encrypt(const char *, int);
+ virtual void set_errcall(void (*)(const char *, char *));
virtual void set_errfile(FILE *);
- virtual void set_errpfx(const gchar *);
- virtual gint set_feedback(void (*)(Db *, int, int));
- virtual gint set_flags(u_int32_t);
- virtual gint set_h_ffactor(u_int32_t);
- virtual gint set_h_hash(h_hash_fcn_type); /*deprecated*/
- virtual gint set_h_hash(u_int32_t (*)(Db *, gconstpointer , u_int32_t));
- virtual gint set_h_nelem(u_int32_t);
- virtual gint set_lorder(int);
- virtual gint set_pagesize(u_int32_t);
- virtual gint set_paniccall(void (*)(DbEnv *, int));
- virtual gint set_re_delim(int);
- virtual gint set_re_len(u_int32_t);
- virtual gint set_re_pad(int);
- virtual gint set_re_source(gchar *);
- virtual gint set_q_extentsize(u_int32_t);
- virtual gint stat(gpointer sp, u_int32_t flags);
- virtual gint sync(u_int32_t flags);
- virtual gint truncate(DbTxn *, u_int32_t *, u_int32_t);
- virtual gint upgrade(const gchar *name, u_int32_t flags);
- virtual gint verify(const gchar *, const gchar *, __DB_OSTREAMCLASS *, u_int32_t);
+ virtual void set_errpfx(const char *);
+ virtual int set_feedback(void (*)(Db *, int, int));
+ virtual int set_flags(u_int32_t);
+ virtual int set_h_ffactor(u_int32_t);
+ virtual int set_h_hash(h_hash_fcn_type); /*deprecated*/
+ virtual int set_h_hash(u_int32_t (*)(Db *, const void *, u_int32_t));
+ virtual int set_h_nelem(u_int32_t);
+ virtual int set_lorder(int);
+ virtual int set_pagesize(u_int32_t);
+ virtual int set_paniccall(void (*)(DbEnv *, int));
+ virtual int set_re_delim(int);
+ virtual int set_re_len(u_int32_t);
+ virtual int set_re_pad(int);
+ virtual int set_re_source(char *);
+ virtual int set_q_extentsize(u_int32_t);
+ virtual int stat(void *sp, u_int32_t flags);
+ virtual int sync(u_int32_t flags);
+ virtual int truncate(DbTxn *, u_int32_t *, u_int32_t);
+ virtual int upgrade(const char *name, u_int32_t flags);
+ virtual int verify(const char *, const char *, __DB_OSTREAMCLASS *, u_int32_t);
// These additional methods are not in the C interface, and
// are only available for C++.
@@ -660,12 +660,12 @@ private:
Db &operator = (const Db &);
void cleanup();
- gint initialize();
- gint error_policy();
+ int initialize();
+ int error_policy();
// instance data
DbEnv *env_;
- gint construct_error_;
+ int construct_error_;
u_int32_t flags_;
u_int32_t construct_flags_;
@@ -674,13 +674,13 @@ public:
// via C callback functions. They should never be used by
// external users of this class.
//
- gint (*append_recno_callback_)(Db *, Dbt *, db_recno_t);
- gint (*associate_callback_)(Db *, const Dbt *, const Dbt *, Dbt *);
- gint (*bt_compare_callback_)(Db *, const Dbt *, const Dbt *);
+ int (*append_recno_callback_)(Db *, Dbt *, db_recno_t);
+ int (*associate_callback_)(Db *, const Dbt *, const Dbt *, Dbt *);
+ int (*bt_compare_callback_)(Db *, const Dbt *, const Dbt *);
size_t (*bt_prefix_callback_)(Db *, const Dbt *, const Dbt *);
- gint (*dup_compare_callback_)(Db *, const Dbt *, const Dbt *);
+ int (*dup_compare_callback_)(Db *, const Dbt *, const Dbt *);
void (*feedback_callback_)(Db *, int, int);
- u_int32_t (*h_hash_callback_)(Db *, gconstpointer , u_int32_t);
+ u_int32_t (*h_hash_callback_)(Db *, const void *, u_int32_t);
};
//
@@ -696,8 +696,8 @@ class _exported Dbt : private DBT
public:
// key/data
- gpointer get_data() const { return data; }
- void set_data(gpointer value) { data = value; }
+ void *get_data() const { return data; }
+ void set_data(void *value) { data = value; }
// key/data length
u_int32_t get_size() const { return size; }
@@ -727,7 +727,7 @@ public:
static const Dbt* get_const_Dbt(const DBT *dbt)
{ return (const Dbt *)dbt; }
- Dbt(gpointer data, u_int32_t size);
+ Dbt(void *data, u_int32_t size);
Dbt();
~Dbt();
Dbt(const Dbt &);
@@ -750,13 +750,13 @@ class _exported Dbc : protected DBC
friend class Db;
public:
- gint close();
- gint count(db_recno_t *countp, u_int32_t flags);
- gint del(u_int32_t flags);
- gint dup(Dbc** cursorp, u_int32_t flags);
- gint get(Dbt* key, Dbt *data, u_int32_t flags);
- gint pget(Dbt* key, Dbt* pkey, Dbt *data, u_int32_t flags);
- gint put(Dbt* key, Dbt *data, u_int32_t flags);
+ int close();
+ int count(db_recno_t *countp, u_int32_t flags);
+ int del(u_int32_t flags);
+ int dup(Dbc** cursorp, u_int32_t flags);
+ int get(Dbt* key, Dbt *data, u_int32_t flags);
+ int pget(Dbt* key, Dbt* pkey, Dbt *data, u_int32_t flags);
+ int put(Dbt* key, Dbt *data, u_int32_t flags);
private:
// No data is permitted in this class (see comment at top)
@@ -777,8 +777,8 @@ class _exported DbLogc : protected DB_LOGC
friend class DbEnv;
public:
- gint close(u_int32_t _flags);
- gint get(DbLsn *lsn, Dbt *data, u_int32_t _flags);
+ int close(u_int32_t _flags);
+ int get(DbLsn *lsn, Dbt *data, u_int32_t _flags);
private:
// No data is permitted in this class (see comment at top)
diff --git a/libdb/build_win32/db_int.h b/libdb/build_win32/db_int.h
index 9ebdd65..c775a12 100644
--- a/libdb/build_win32/db_int.h
+++ b/libdb/build_win32/db_int.h
@@ -132,7 +132,7 @@ typedef unsigned long db_alignp_t;
/* Structure used to print flag values. */
typedef struct __fn {
u_int32_t mask; /* Flag value. */
- const gchar *name; /* Flag name. */
+ const char *name; /* Flag name. */
} FN;
/* Set, clear and test flags. */
@@ -291,7 +291,7 @@ typedef enum {
if (!F_ISSET((dbp)->dbenv, DB_ENV_DBLOCAL)) \
return (__db_mi_env((dbp)->dbenv, name));
#define DB_ILLEGAL_METHOD(dbp, flags) { \
- gint __ret; \
+ int __ret; \
if ((__ret = __dbh_am_chk(dbp, flags)) != 0) \
return (__ret); \
}
diff --git a/libdb/clib/getcwd.c b/libdb/clib/getcwd.c
index d428ab6..d2e7410 100644
--- a/libdb/clib/getcwd.c
+++ b/libdb/clib/getcwd.c
@@ -36,7 +36,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -81,26 +81,26 @@ static const gchar revid[] = "$Id$";
* Get the current working directory.
*
* PUBLIC: #ifndef HAVE_GETCWD
- * PUBLIC: gchar *getcwd __P((gchar *, size_t));
+ * PUBLIC: char *getcwd __P((char *, size_t));
* PUBLIC: #endif
*/
-gchar *
+char *
getcwd(pt, size)
- gchar *pt;
+ char *pt;
size_t size;
{
register struct dirent *dp;
register DIR *dir;
register dev_t dev;
register ino_t ino;
- register gint first;
- register gchar *bpt, *bup;
+ register int first;
+ register char *bpt, *bup;
struct stat s;
dev_t root_dev;
ino_t root_ino;
size_t ptsize, upsize;
- gint ret, save_errno;
- gchar *ept, *eup, *up;
+ int ret, save_errno;
+ char *ept, *eup, *up;
/*
* If no buffer specified by the user, allocate one as necessary.
diff --git a/libdb/clib/getopt.c b/libdb/clib/getopt.c
index 6c105ec..f9c0fc8 100644
--- a/libdb/clib/getopt.c
+++ b/libdb/clib/getopt.c
@@ -36,7 +36,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -67,18 +67,18 @@ char *optarg; /* argument associated with option */
* Parse argc/argv argument vector.
*
* PUBLIC: #ifndef HAVE_GETOPT
- * PUBLIC: gint getopt __P((int, gchar * const *, const gchar *));
+ * PUBLIC: int getopt __P((int, char * const *, const char *));
* PUBLIC: #endif
*/
-gint
+int
getopt(nargc, nargv, ostr)
- gint nargc;
- gchar * const *nargv;
- const gchar *ostr;
+ int nargc;
+ char * const *nargv;
+ const char *ostr;
{
- static gchar *progname;
- static gchar *place = EMSG; /* option letter processing */
- gchar *oli; /* option letter list index */
+ static char *progname;
+ static char *place = EMSG; /* option letter processing */
+ char *oli; /* option letter list index */
/*
* VxWorks needs to be able to repeatedly call getopt from multiple
@@ -95,9 +95,9 @@ getopt(nargc, nargv, ostr)
}
if (!progname) {
if ((progname = __db_rpath(*nargv)) == NULL)
- progname = *nargv;
- else
- ++progname;
+ progname = *nargv;
+ else
+ ++progname;
}
if (optreset || !*place) { /* update scanning pointer */
@@ -145,7 +145,7 @@ getopt(nargc, nargv, ostr)
progname, optopt);
return (BADCH);
}
- else /* white space */
+ else /* white space */
optarg = nargv[optind];
place = EMSG;
++optind;
diff --git a/libdb/clib/memcmp.c b/libdb/clib/memcmp.c
index 571c05f..f3c1337 100644
--- a/libdb/clib/memcmp.c
+++ b/libdb/clib/memcmp.c
@@ -36,7 +36,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -47,17 +47,17 @@ static const gchar revid[] = "$Id$";
* memcmp --
*
* PUBLIC: #ifndef HAVE_MEMCMP
- * PUBLIC: gint memcmp __P((gconstpointer , gconstpointer , size_t));
+ * PUBLIC: int memcmp __P((const void *, const void *, size_t));
* PUBLIC: #endif
*/
-gint
+int
memcmp(s1, s2, n)
- gchar *s1, *s2;
+ char *s1, *s2;
size_t n;
{
if (n != 0) {
- guchar *p1 = (guchar *)s1,
- *p2 = (guchar *)s2;
+ unsigned char *p1 = (unsigned char *)s1,
+ *p2 = (unsigned char *)s2;
do {
if (*p1++ != *p2++)
return (*--p1 - *--p2);
diff --git a/libdb/clib/memmove.c b/libdb/clib/memmove.c
index 8fe3bd5..8cf3c3e 100644
--- a/libdb/clib/memmove.c
+++ b/libdb/clib/memmove.c
@@ -36,7 +36,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -47,7 +47,7 @@ static const gchar revid[] = "$Id$";
* sizeof(word) MUST BE A POWER OF TWO
* SO THAT wmask BELOW IS ALL ONES
*/
-typedef gint word; /* "word" used for optimal copy speed */
+typedef int word; /* "word" used for optimal copy speed */
#undef wsize
#define wsize sizeof(word)
@@ -62,31 +62,31 @@ typedef gint word; /* "word" used for optimal copy speed */
#ifdef MEMCOPY
/*
* PUBLIC: #ifndef HAVE_MEMCPY
- * PUBLIC: gpointer memcpy __P((gpointer , gconstpointer , size_t));
+ * PUBLIC: void *memcpy __P((void *, const void *, size_t));
* PUBLIC: #endif
*/
-gpointer
+void *
memcpy(dst0, src0, length)
#else
#ifdef MEMMOVE
/*
* PUBLIC: #ifndef HAVE_MEMMOVE
- * PUBLIC: gpointer memmove __P((gpointer , gconstpointer , size_t));
+ * PUBLIC: void *memmove __P((void *, const void *, size_t));
* PUBLIC: #endif
*/
-gpointer
+void *
memmove(dst0, src0, length)
#else
void
bcopy(src0, dst0, length)
#endif
#endif
- gpointer dst0;
- gconstpointer src0;
+ void *dst0;
+ const void *src0;
register size_t length;
{
- register gchar *dst = dst0;
- register const gchar *src = src0;
+ register char *dst = dst0;
+ register const char *src = src0;
register size_t t;
if (length == 0 || dst == src) /* nothing to do */
diff --git a/libdb/clib/raise.c b/libdb/clib/raise.c
index 7b13a5c..810c0f8 100644
--- a/libdb/clib/raise.c
+++ b/libdb/clib/raise.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -21,12 +21,12 @@ static const gchar revid[] = "$Id$";
* Send a signal to the current process.
*
* PUBLIC: #ifndef HAVE_RAISE
- * PUBLIC: gint raise __P((int));
+ * PUBLIC: int raise __P((int));
* PUBLIC: #endif
*/
-gint
+int
raise(s)
- gint s;
+ int s;
{
/*
* Do not use __os_id(), as it may not return the process ID -- any
diff --git a/libdb/clib/snprintf.c b/libdb/clib/snprintf.c
index 7e5f312..f269c05 100644
--- a/libdb/clib/snprintf.c
+++ b/libdb/clib/snprintf.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,24 +24,24 @@ static const gchar revid[] = "$Id$";
* Bounded version of sprintf.
*
* PUBLIC: #ifndef HAVE_SNPRINTF
- * PUBLIC: gint snprintf __P((gchar *, size_t, const gchar *, ...));
+ * PUBLIC: int snprintf __P((char *, size_t, const char *, ...));
* PUBLIC: #endif
*/
#ifndef HAVE_SNPRINTF
-gint
+int
#ifdef __STDC__
-snprintf(gchar *str, size_t n, const gchar *fmt, ...)
+snprintf(char *str, size_t n, const char *fmt, ...)
#else
snprintf(str, n, fmt, va_alist)
- gchar *str;
+ char *str;
size_t n;
- const gchar *fmt;
+ const char *fmt;
va_dcl
#endif
{
- static gint ret_charpnt = -1;
+ static int ret_charpnt = -1;
va_list ap;
- gint len;
+ int len;
COMPQUIET(n, 0);
@@ -54,7 +54,7 @@ snprintf(str, n, fmt, va_alist)
* cross-compilation environment.
*/
if (ret_charpnt == -1) {
- gchar buf[10];
+ char buf[10];
ret_charpnt =
sprintf(buf, "123") != 3 ||
diff --git a/libdb/clib/strcasecmp.c b/libdb/clib/strcasecmp.c
index 4731177..de8f0e7 100644
--- a/libdb/clib/strcasecmp.c
+++ b/libdb/clib/strcasecmp.c
@@ -34,7 +34,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -46,7 +46,7 @@ static const gchar revid[] = "$Id$";
* together for a case independent comparison. The mappings are
* based upon ascii character sequences.
*/
-static const guchar charmap[] = {
+static const unsigned char charmap[] = {
'\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
'\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
'\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
@@ -86,16 +86,16 @@ static const guchar charmap[] = {
* Do strcmp(3) in a case-insensitive manner.
*
* PUBLIC: #ifndef HAVE_STRCASECMP
- * PUBLIC: gint strcasecmp __P((const gchar *, const gchar *));
+ * PUBLIC: int strcasecmp __P((const char *, const char *));
* PUBLIC: #endif
*/
-gint
+int
strcasecmp(s1, s2)
- const gchar *s1, *s2;
+ const char *s1, *s2;
{
- register const guchar *cm = charmap,
- *us1 = (const guchar *)s1,
- *us2 = (const guchar *)s2;
+ register const unsigned char *cm = charmap,
+ *us1 = (const unsigned char *)s1,
+ *us2 = (const unsigned char *)s2;
while (cm[*us1] == cm[*us2++])
if (*us1++ == '\0')
@@ -108,18 +108,18 @@ strcasecmp(s1, s2)
* Do strncmp(3) in a case-insensitive manner.
*
* PUBLIC: #ifndef HAVE_STRCASECMP
- * PUBLIC: gint strncasecmp __P((const gchar *, const gchar *, size_t));
+ * PUBLIC: int strncasecmp __P((const char *, const char *, size_t));
* PUBLIC: #endif
*/
-gint
+int
strncasecmp(s1, s2, n)
- const gchar *s1, *s2;
+ const char *s1, *s2;
register size_t n;
{
if (n != 0) {
- register const guchar *cm = charmap,
- *us1 = (const guchar *)s1,
- *us2 = (const guchar *)s2;
+ register const unsigned char *cm = charmap,
+ *us1 = (const unsigned char *)s1,
+ *us2 = (const unsigned char *)s2;
do {
if (cm[*us1] != cm[*us2++])
diff --git a/libdb/clib/strdup.c b/libdb/clib/strdup.c
index 935e283..3593195 100644
--- a/libdb/clib/strdup.c
+++ b/libdb/clib/strdup.c
@@ -34,7 +34,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -49,15 +49,15 @@ static const gchar revid[] = "$Id$";
* strdup --
*
* PUBLIC: #ifndef HAVE_STRDUP
- * PUBLIC: gchar *strdup __P((const gchar *));
+ * PUBLIC: char *strdup __P((const char *));
* PUBLIC: #endif
*/
-gchar *
+char *
strdup(str)
- const gchar *str;
+ const char *str;
{
size_t len;
- gchar *copy;
+ char *copy;
len = strlen(str) + 1;
if (!(copy = malloc((u_int)len)))
diff --git a/libdb/clib/strerror.c b/libdb/clib/strerror.c
index 6c0a0b5..c61a787 100644
--- a/libdb/clib/strerror.c
+++ b/libdb/clib/strerror.c
@@ -36,7 +36,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
/*
@@ -44,20 +44,20 @@ static const gchar revid[] = "$Id$";
* Return the string associated with an errno.
*
* PUBLIC: #ifndef HAVE_STRERROR
- * PUBLIC: gchar *strerror __P((int));
+ * PUBLIC: char *strerror __P((int));
* PUBLIC: #endif
*/
-gchar *
+char *
strerror(num)
- gint num;
+ int num;
{
- extern gint sys_nerr;
- extern gchar *sys_errlist[];
+ extern int sys_nerr;
+ extern char *sys_errlist[];
#undef UPREFIX
#define UPREFIX "Unknown error: "
- static gchar ebuf[40] = UPREFIX; /* 64-bit number + slop */
- gint errnum;
- gchar *p, *t, tmp[40];
+ static char ebuf[40] = UPREFIX; /* 64-bit number + slop */
+ int errnum;
+ char *p, *t, tmp[40];
errnum = num; /* convert to unsigned */
if (errnum < sys_nerr)
diff --git a/libdb/clib/vsnprintf.c b/libdb/clib/vsnprintf.c
index d621171..272e92e 100644
--- a/libdb/clib/vsnprintf.c
+++ b/libdb/clib/vsnprintf.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,15 +24,15 @@ static const gchar revid[] = "$Id$";
* Bounded version of vsprintf.
*
* PUBLIC: #ifndef HAVE_VSNPRINTF
- * PUBLIC: gint vsnprintf __P((gchar *, size_t, const gchar *, va_list));
+ * PUBLIC: int vsnprintf __P((char *, size_t, const char *, va_list));
* PUBLIC: #endif
*/
#ifndef HAVE_VSNPRINTF
-gint
+int
vsnprintf(str, n, fmt, ap)
- gchar *str;
+ char *str;
size_t n;
- const gchar *fmt;
+ const char *fmt;
va_list ap;
{
COMPQUIET(n, 0);
diff --git a/libdb/common/db_byteorder.c b/libdb/common/db_byteorder.c
index ed7b464..e2f8ab5 100644
--- a/libdb/common/db_byteorder.c
+++ b/libdb/common/db_byteorder.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,14 +24,14 @@ static const gchar revid[] = "$Id$";
* configuration time so cross-compilation and general embedded
* system support is simpler.
*
- * PUBLIC: gint __db_isbigendian __P((void));
+ * PUBLIC: int __db_isbigendian __P((void));
*/
-gint
+int
__db_isbigendian()
{
union { /* From Harbison & Steele. */
long l;
- gchar c[sizeof(long)];
+ char c[sizeof(long)];
} u;
u.l = 1;
@@ -43,14 +43,14 @@ __db_isbigendian()
* Return if we need to do byte swapping, checking for illegal
* values.
*
- * PUBLIC: gint __db_byteorder __P((DB_ENV *, int));
+ * PUBLIC: int __db_byteorder __P((DB_ENV *, int));
*/
-gint
+int
__db_byteorder(dbenv, lorder)
DB_ENV *dbenv;
- gint lorder;
+ int lorder;
{
- gint is_bigendian;
+ int is_bigendian;
is_bigendian = __db_isbigendian();
diff --git a/libdb/common/db_err.c b/libdb/common/db_err.c
index 27a78ec..afe10a7 100644
--- a/libdb/common/db_err.c
+++ b/libdb/common/db_err.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -31,12 +31,12 @@ static const gchar revid[] = "$Id$";
* __db_fchk --
* General flags checking routine.
*
- * PUBLIC: gint __db_fchk __P((DB_ENV *, const gchar *, u_int32_t, u_int32_t));
+ * PUBLIC: int __db_fchk __P((DB_ENV *, const char *, u_int32_t, u_int32_t));
*/
-gint
+int
__db_fchk(dbenv, name, flags, ok_flags)
DB_ENV *dbenv;
- const gchar *name;
+ const char *name;
u_int32_t flags, ok_flags;
{
return (LF_ISSET(~ok_flags) ? __db_ferr(dbenv, name, 0) : 0);
@@ -46,13 +46,13 @@ __db_fchk(dbenv, name, flags, ok_flags)
* __db_fcchk --
* General combination flags checking routine.
*
- * PUBLIC: gint __db_fcchk
- * PUBLIC: __P((DB_ENV *, const gchar *, u_int32_t, u_int32_t, u_int32_t));
+ * PUBLIC: int __db_fcchk
+ * PUBLIC: __P((DB_ENV *, const char *, u_int32_t, u_int32_t, u_int32_t));
*/
-gint
+int
__db_fcchk(dbenv, name, flags, flag1, flag2)
DB_ENV *dbenv;
- const gchar *name;
+ const char *name;
u_int32_t flags, flag1, flag2;
{
return (LF_ISSET(flag1) &&
@@ -63,13 +63,13 @@ __db_fcchk(dbenv, name, flags, flag1, flag2)
* __db_ferr --
* Common flag errors.
*
- * PUBLIC: gint __db_ferr __P((const DB_ENV *, const gchar *, int));
+ * PUBLIC: int __db_ferr __P((const DB_ENV *, const char *, int));
*/
-gint
+int
__db_ferr(dbenv, name, iscombo)
const DB_ENV *dbenv;
- const gchar *name;
- gint iscombo;
+ const char *name;
+ int iscombo;
{
__db_err(dbenv, "illegal flag %sspecified to %s",
iscombo ? "combination " : "", name);
@@ -86,7 +86,7 @@ void
__db_pgerr(dbp, pgno, errval)
DB *dbp;
db_pgno_t pgno;
- gint errval;
+ int errval;
{
/*
* Three things are certain:
@@ -102,9 +102,9 @@ __db_pgerr(dbp, pgno, errval)
* __db_pgfmt --
* Error when a page has the wrong format.
*
- * PUBLIC: gint __db_pgfmt __P((DB_ENV *, db_pgno_t));
+ * PUBLIC: int __db_pgfmt __P((DB_ENV *, db_pgno_t));
*/
-gint
+int
__db_pgfmt(dbenv, pgno)
DB_ENV *dbenv;
db_pgno_t pgno;
@@ -117,9 +117,9 @@ __db_pgfmt(dbenv, pgno)
* __db_eopnotsup --
* Common operation not supported message.
*
- * PUBLIC: gint __db_eopnotsup __P((const DB_ENV *));
+ * PUBLIC: int __db_eopnotsup __P((const DB_ENV *));
*/
-gint
+int
__db_eopnotsup(dbenv)
const DB_ENV *dbenv;
{
@@ -137,13 +137,13 @@ __db_eopnotsup(dbenv)
* Error when an assertion fails. Only checked if #DIAGNOSTIC defined.
*
* PUBLIC: #ifdef DIAGNOSTIC
- * PUBLIC: void __db_assert __P((const gchar *, const gchar *, int));
+ * PUBLIC: void __db_assert __P((const char *, const char *, int));
* PUBLIC: #endif
*/
void
__db_assert(failedexpr, file, line)
- const gchar *failedexpr, *file;
- gint line;
+ const char *failedexpr, *file;
+ int line;
{
(void)fprintf(stderr,
"__db_assert: \"%s\" failed: file \"%s\", line %d\n",
@@ -161,9 +161,9 @@ __db_assert(failedexpr, file, line)
* __db_panic_msg --
* Just report that someone else paniced.
*
- * PUBLIC: gint __db_panic_msg __P((DB_ENV *));
+ * PUBLIC: int __db_panic_msg __P((DB_ENV *));
*/
-gint
+int
__db_panic_msg(dbenv)
DB_ENV *dbenv;
{
@@ -175,12 +175,12 @@ __db_panic_msg(dbenv)
* __db_panic --
* Lock out the tree due to unrecoverable error.
*
- * PUBLIC: gint __db_panic __P((DB_ENV *, int));
+ * PUBLIC: int __db_panic __P((DB_ENV *, int));
*/
-gint
+int
__db_panic(dbenv, errval)
DB_ENV *dbenv;
- gint errval;
+ int errval;
{
if (dbenv != NULL) {
PANIC_SET(dbenv, 1);
@@ -216,11 +216,11 @@ __db_panic(dbenv, errval)
* db_strerror --
* ANSI C strerror(3) for DB.
*
- * EXTERN: gchar *db_strerror __P((int));
+ * EXTERN: char *db_strerror __P((int));
*/
-gchar *
+char *
db_strerror(error)
- gint error;
+ int error;
{
if (error == 0)
return ("Successful return: 0");
@@ -285,7 +285,7 @@ db_strerror(error)
* if we're given an unknown error, which should never happen.
* Note, however, we're no longer thread-safe if it does.
*/
- static gchar ebuf[40];
+ static char ebuf[40];
(void)snprintf(ebuf, sizeof(ebuf), "Unknown error: %d", error);
return (ebuf);
@@ -298,15 +298,15 @@ db_strerror(error)
* Standard DB error routine. The same as errx, except we don't write
* to stderr if no output mechanism was specified.
*
- * PUBLIC: void __db_err __P((const DB_ENV *, const gchar *, ...));
+ * PUBLIC: void __db_err __P((const DB_ENV *, const char *, ...));
*/
void
#ifdef __STDC__
-__db_err(const DB_ENV *dbenv, const gchar *fmt, ...)
+__db_err(const DB_ENV *dbenv, const char *fmt, ...)
#else
__db_err(dbenv, fmt, va_alist)
const DB_ENV *dbenv;
- const gchar *fmt;
+ const char *fmt;
va_dcl
#endif
{
@@ -318,17 +318,17 @@ __db_err(dbenv, fmt, va_alist)
* Do the error message work for callback functions.
*
* PUBLIC: void __db_errcall
- * PUBLIC: __P((const DB_ENV *, int, int, const gchar *, va_list));
+ * PUBLIC: __P((const DB_ENV *, int, int, const char *, va_list));
*/
void
__db_errcall(dbenv, error, error_set, fmt, ap)
const DB_ENV *dbenv;
- gint error, error_set;
- const gchar *fmt;
+ int error, error_set;
+ const char *fmt;
va_list ap;
{
- gchar *p;
- gchar errbuf[2048]; /* !!!: END OF THE STACK DON'T TRUST SPRINTF. */
+ char *p;
+ char errbuf[2048]; /* !!!: END OF THE STACK DON'T TRUST SPRINTF. */
p = errbuf;
if (fmt != NULL)
@@ -363,13 +363,13 @@ __db_errcall(dbenv, error, error_set, fmt, ap)
* Do the error message work for FILE *s.
*
* PUBLIC: void __db_errfile
- * PUBLIC: __P((const DB_ENV *, int, int, const gchar *, va_list));
+ * PUBLIC: __P((const DB_ENV *, int, int, const char *, va_list));
*/
void
__db_errfile(dbenv, error, error_set, fmt, ap)
const DB_ENV *dbenv;
- gint error, error_set;
- const gchar *fmt;
+ int error, error_set;
+ const char *fmt;
va_list ap;
{
FILE *fp;
@@ -395,17 +395,17 @@ __db_errfile(dbenv, error, error_set, fmt, ap)
* Write information into the DB log.
*
* PUBLIC: void __db_logmsg __P((const DB_ENV *,
- * PUBLIC: DB_TXN *, const gchar *, u_int32_t, const gchar *, ...));
+ * PUBLIC: DB_TXN *, const char *, u_int32_t, const char *, ...));
*/
void
#ifdef __STDC__
__db_logmsg(const DB_ENV *dbenv,
- DB_TXN *txnid, const gchar *opname, u_int32_t flags, const gchar *fmt, ...)
+ DB_TXN *txnid, const char *opname, u_int32_t flags, const char *fmt, ...)
#else
__db_logmsg(dbenv, txnid, opname, flags, fmt, va_alist)
const DB_ENV *dbenv;
DB_TXN *txnid;
- const gchar *opname, *fmt;
+ const char *opname, *fmt;
u_int32_t flags;
va_dcl
#endif
@@ -413,7 +413,7 @@ __db_logmsg(dbenv, txnid, opname, flags, fmt, va_alist)
DBT opdbt, msgdbt;
DB_LSN lsn;
va_list ap;
- gchar __logbuf[2048]; /* !!!: END OF THE STACK DON'T TRUST SPRINTF. */
+ char __logbuf[2048]; /* !!!: END OF THE STACK DON'T TRUST SPRINTF. */
if (!LOGGING_ON(dbenv))
return;
@@ -424,7 +424,7 @@ __db_logmsg(dbenv, txnid, opname, flags, fmt, va_alist)
va_start(ap);
#endif
memset(&opdbt, 0, sizeof(opdbt));
- opdbt.data = (gpointer)opname;
+ opdbt.data = (void *)opname;
opdbt.size = (u_int32_t)(strlen(opname) + 1);
memset(&msgdbt, 0, sizeof(msgdbt));
@@ -445,12 +445,12 @@ __db_logmsg(dbenv, txnid, opname, flags, fmt, va_alist)
/*
* __db_unknown_flag -- report internal error
*
- * PUBLIC: gint __db_unknown_flag __P((DB_ENV *, gchar *, u_int32_t));
+ * PUBLIC: int __db_unknown_flag __P((DB_ENV *, char *, u_int32_t));
*/
-gint
+int
__db_unknown_flag(dbenv, routine, flag)
DB_ENV *dbenv;
- gchar *routine;
+ char *routine;
u_int32_t flag;
{
__db_err(dbenv, "%s: Unknown flag: 0x%x", routine, flag);
@@ -461,12 +461,12 @@ __db_unknown_flag(dbenv, routine, flag)
/*
* __db_unknown_type -- report internal error
*
- * PUBLIC: gint __db_unknown_type __P((DB_ENV *, gchar *, DBTYPE));
+ * PUBLIC: int __db_unknown_type __P((DB_ENV *, char *, DBTYPE));
*/
-gint
+int
__db_unknown_type(dbenv, routine, type)
DB_ENV *dbenv;
- gchar *routine;
+ char *routine;
DBTYPE type;
{
__db_err(dbenv, "%s: Unknown db type: 0x%x", routine, type);
@@ -478,14 +478,14 @@ __db_unknown_type(dbenv, routine, type)
* __db_check_txn --
* Check for common transaction errors.
*
- * PUBLIC: gint __db_check_txn __P((DB *, DB_TXN *, u_int32_t, int));
+ * PUBLIC: int __db_check_txn __P((DB *, DB_TXN *, u_int32_t, int));
*/
-gint
+int
__db_check_txn(dbp, txn, assoc_lid, read_op)
DB *dbp;
DB_TXN *txn;
u_int32_t assoc_lid;
- gint read_op;
+ int read_op;
{
DB_ENV *dbenv;
@@ -568,9 +568,9 @@ open_err:
* __db_not_txn_env --
* DB handle must be in an environment that supports transactions.
*
- * PUBLIC: gint __db_not_txn_env __P((DB_ENV *));
+ * PUBLIC: int __db_not_txn_env __P((DB_ENV *));
*/
-gint
+int
__db_not_txn_env(dbenv)
DB_ENV *dbenv;
{
diff --git a/libdb/common/db_getlong.c b/libdb/common/db_getlong.c
index 6c87f80..b298ecb 100644
--- a/libdb/common/db_getlong.c
+++ b/libdb/common/db_getlong.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,18 +25,18 @@ static const gchar revid[] = "$Id$";
* __db_getlong --
* Return a long value inside of basic parameters.
*
- * PUBLIC: gint __db_getlong
- * PUBLIC: __P((DB *, const gchar *, gchar *, long, long, long *));
+ * PUBLIC: int __db_getlong
+ * PUBLIC: __P((DB *, const char *, char *, long, long, long *));
*/
-gint
+int
__db_getlong(dbp, progname, p, min, max, storep)
DB *dbp;
- const gchar *progname;
- gchar *p;
+ const char *progname;
+ char *p;
long min, max, *storep;
{
long val;
- gchar *end;
+ char *end;
__os_set_errno(0);
val = strtol(p, &end, 10);
@@ -85,14 +85,14 @@ __db_getlong(dbp, progname, p, min, max, storep)
* __db_getulong --
* Return an unsigned long value inside of basic parameters.
*
- * PUBLIC: gint __db_getulong
- * PUBLIC: __P((DB *, const gchar *, gchar *, u_long, u_long, u_long *));
+ * PUBLIC: int __db_getulong
+ * PUBLIC: __P((DB *, const char *, char *, u_long, u_long, u_long *));
*/
-gint
+int
__db_getulong(dbp, progname, p, min, max, storep)
DB *dbp;
- const gchar *progname;
- gchar *p;
+ const char *progname;
+ char *p;
u_long min, max, *storep;
{
#if !defined(HAVE_STRTOUL)
@@ -101,7 +101,7 @@ __db_getulong(dbp, progname, p, min, max, storep)
return (__db_getlong(dbp, progname, p, 0, max, (long *)storep));
#else
u_long val;
- gchar *end;
+ char *end;
__os_set_errno(0);
val = strtoul(p, &end, 10);
diff --git a/libdb/common/db_idspace.c b/libdb/common/db_idspace.c
index 04e29d6..1d60fee 100644
--- a/libdb/common/db_idspace.c
+++ b/libdb/common/db_idspace.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -19,12 +19,12 @@ static const gchar revid[] = "$Id$";
#include "db_int.h"
-static gint __db_idcmp __P((gconstpointer , gconstpointer ));
+static int __db_idcmp __P((const void *, const void *));
static int
__db_idcmp(a, b)
- gconstpointer a;
- gconstpointer b;
+ const void *a;
+ const void *b;
{
u_int32_t i, j;
@@ -51,10 +51,10 @@ __db_idcmp(a, b)
void
__db_idspace(inuse, n, minp, maxp)
u_int32_t *inuse;
- gint n;
+ int n;
u_int32_t *minp, *maxp;
{
- gint i, low;
+ int i, low;
u_int32_t gap, t;
/* A single locker ID is a special case. */
diff --git a/libdb/common/db_log2.c b/libdb/common/db_log2.c
index 28fb74d..fd43cad 100644
--- a/libdb/common/db_log2.c
+++ b/libdb/common/db_log2.c
@@ -39,7 +39,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
diff --git a/libdb/common/util_arg.c b/libdb/common/util_arg.c
index 7a64880..c0a24ee 100644
--- a/libdb/common/util_arg.c
+++ b/libdb/common/util_arg.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -17,25 +17,25 @@ static const gchar revid[] = "$Id$";
#include "db_int.h"
-static gchar *__db_strsep __P((gchar **, const gchar *));
+static char *__db_strsep __P((char **, const char *));
/*
* __db_util_arg --
* Convert a string into an argc/argv pair.
*
- * PUBLIC: gint __db_util_arg __P((gchar *, gchar *, gint *, gchar ***));
+ * PUBLIC: int __db_util_arg __P((char *, char *, int *, char ***));
*/
-gint
+int
__db_util_arg(arg0, str, argcp, argvp)
- gchar *arg0, *str, ***argvp;
- gint *argcp;
+ char *arg0, *str, ***argvp;
+ int *argcp;
{
- gint n, ret;
- gchar **ap, **argv;
+ int n, ret;
+ char **ap, **argv;
#define MAXARGS 25
if ((ret =
- __os_malloc(NULL, (MAXARGS + 1) * sizeof(gchar **), &argv)) != 0)
+ __os_malloc(NULL, (MAXARGS + 1) * sizeof(char **), &argv)) != 0)
return (ret);
ap = argv;
@@ -97,14 +97,14 @@ __db_util_arg(arg0, str, argcp, argvp)
*
* If *stringp is NULL, strsep returns NULL.
*/
-static gchar *
+static char *
__db_strsep(stringp, delim)
- gchar **stringp;
- const gchar *delim;
+ char **stringp;
+ const char *delim;
{
- const gchar *spanp;
- gint c, sc;
- gchar *s, *tok;
+ const char *spanp;
+ int c, sc;
+ char *s, *tok;
if ((s = *stringp) == NULL)
return (NULL);
diff --git a/libdb/common/util_cache.c b/libdb/common/util_cache.c
index 6264da2..b7954fc 100644
--- a/libdb/common/util_cache.c
+++ b/libdb/common/util_cache.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -26,22 +26,22 @@ static const gchar revid[] = "$Id$";
* __db_util_cache --
* Compute if we have enough cache.
*
- * PUBLIC: gint __db_util_cache __P((DB_ENV *, DB *, u_int32_t *, gint *));
+ * PUBLIC: int __db_util_cache __P((DB_ENV *, DB *, u_int32_t *, int *));
*/
-gint
+int
__db_util_cache(dbenv, dbp, cachep, resizep)
DB_ENV *dbenv;
DB *dbp;
u_int32_t *cachep;
- gint *resizep;
+ int *resizep;
{
DBTYPE type;
DB_BTREE_STAT *bsp;
DB_HASH_STAT *hsp;
DB_QUEUE_STAT *qsp;
u_int32_t pgsize;
- gint ret;
- gpointer sp;
+ int ret;
+ void *sp;
/*
* The current cache size is in cachep. If it's insufficient, set the
diff --git a/libdb/common/util_log.c b/libdb/common/util_log.c
index 078e7ad..457505c 100644
--- a/libdb/common/util_log.c
+++ b/libdb/common/util_log.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -36,12 +36,12 @@ static const gchar revid[] = "$Id$";
* __db_util_logset --
* Log that we're running.
*
- * PUBLIC: gint __db_util_logset __P((const gchar *, gchar *));
+ * PUBLIC: int __db_util_logset __P((const char *, char *));
*/
-gint
+int
__db_util_logset(progname, fname)
- const gchar *progname;
- gchar *fname;
+ const char *progname;
+ char *fname;
{
FILE *fp;
time_t now;
diff --git a/libdb/common/util_sig.c b/libdb/common/util_sig.c
index 7779954..b286cdc 100644
--- a/libdb/common/util_sig.c
+++ b/libdb/common/util_sig.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -28,7 +28,7 @@ static void onint __P((int));
*/
static void
onint(signo)
- gint signo;
+ int signo;
{
if ((interrupt = signo) == 0)
interrupt = SIGINT;
@@ -61,9 +61,9 @@ __db_util_siginit()
* __db_util_interrupted --
* Return if interrupted.
*
- * PUBLIC: gint __db_util_interrupted __P((void));
+ * PUBLIC: int __db_util_interrupted __P((void));
*/
-gint
+int
__db_util_interrupted()
{
return (interrupt != 0);
diff --git a/libdb/db/crdel_auto.c b/libdb/db/crdel_auto.c
index cee8e9f..ba2e95d 100644
--- a/libdb/db/crdel_auto.c
+++ b/libdb/db/crdel_auto.c
@@ -18,10 +18,10 @@
#include "dbinc/txn.h"
/*
- * PUBLIC: gint __crdel_metasub_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __crdel_metasub_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_pgno_t, const DBT *, DB_LSN *));
*/
-gint
+int
__crdel_metasub_log(dbp, txnid, ret_lsnp, flags, pgno, page, lsn)
DB *dbp;
DB_TXN *txnid;
@@ -37,7 +37,7 @@ __crdel_metasub_log(dbp, txnid, ret_lsnp, flags, pgno, page, lsn)
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -131,16 +131,16 @@ __crdel_metasub_log(dbp, txnid, ret_lsnp, flags, pgno, page, lsn)
}
/*
- * PUBLIC: gint __crdel_metasub_getpgnos __P((DB_ENV *, DBT *,
- * PUBLIC: DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __crdel_metasub_getpgnos __P((DB_ENV *, DBT *,
+ * PUBLIC: DB_LSN *, db_recops, void *));
*/
-gint
+int
__crdel_metasub_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -177,21 +177,21 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __crdel_metasub_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __crdel_metasub_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__crdel_metasub_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__crdel_metasub_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -222,19 +222,19 @@ __crdel_metasub_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __crdel_metasub_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int __crdel_metasub_read __P((DB_ENV *, void *,
* PUBLIC: __crdel_metasub_args **));
*/
-gint
+int
__crdel_metasub_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__crdel_metasub_args **argpp;
{
__crdel_metasub_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__crdel_metasub_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -274,16 +274,16 @@ __crdel_metasub_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __crdel_init_print __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __crdel_init_print __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__crdel_init_print(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__crdel_metasub_print, DB___crdel_metasub)) != 0)
@@ -292,17 +292,17 @@ __crdel_init_print(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __crdel_init_getpgnos __P((DB_ENV *,
- * PUBLIC: gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ),
+ * PUBLIC: int __crdel_init_getpgnos __P((DB_ENV *,
+ * PUBLIC: int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *),
* PUBLIC: size_t *));
*/
-gint
+int
__crdel_init_getpgnos(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__crdel_metasub_getpgnos, DB___crdel_metasub)) != 0)
@@ -311,16 +311,16 @@ __crdel_init_getpgnos(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __crdel_init_recover __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __crdel_init_recover __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__crdel_init_recover(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__crdel_metasub_recover, DB___crdel_metasub)) != 0)
diff --git a/libdb/db/crdel_rec.c b/libdb/db/crdel_rec.c
index 7a63265..e17e9a2 100644
--- a/libdb/db/crdel_rec.c
+++ b/libdb/db/crdel_rec.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -26,23 +26,23 @@ static const gchar revid[] = "$Id$";
* __crdel_metasub_recover --
* Recovery function for metasub.
*
- * PUBLIC: gint __crdel_metasub_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __crdel_metasub_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__crdel_metasub_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__crdel_metasub_args *argp;
DB *file_dbp;
DBC *dbc;
DB_MPOOLFILE *mpf;
PAGE *pagep;
- gint cmp_p, modified, ret;
+ int cmp_p, modified, ret;
pagep = NULL;
COMPQUIET(info, NULL);
diff --git a/libdb/db/db.c b/libdb/db/db.c
index 3a4bef0..e08f6a2 100644
--- a/libdb/db/db.c
+++ b/libdb/db/db.c
@@ -40,7 +40,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -64,11 +64,11 @@ static const gchar revid[] = "$Id$";
#include "dbinc/qam.h"
#include "dbinc/txn.h"
-static gint __db_disassociate __P((DB *));
+static int __db_disassociate __P((DB *));
#if CONFIG_TEST
-static void __db_makecopy __P((const gchar *, const gchar *));
-static gint __db_testdocopy __P((DB_ENV *, const gchar *));
-static gint __qam_testdocopy __P((DB *, const gchar *));
+static void __db_makecopy __P((const char *, const char *));
+static int __db_testdocopy __P((DB_ENV *, const char *));
+static int __qam_testdocopy __P((DB *, const char *));
#endif
/*
@@ -80,20 +80,20 @@ static gint __qam_testdocopy __P((DB *, const gchar *));
* __db_master_open --
* Open up a handle on a master database.
*
- * PUBLIC: gint __db_master_open __P((DB *,
- * PUBLIC: DB_TXN *, const gchar *, u_int32_t, int, DB **));
+ * PUBLIC: int __db_master_open __P((DB *,
+ * PUBLIC: DB_TXN *, const char *, u_int32_t, int, DB **));
*/
-gint
+int
__db_master_open(subdbp, txn, name, flags, mode, dbpp)
DB *subdbp;
DB_TXN *txn;
- const gchar *name;
+ const char *name;
u_int32_t flags;
- gint mode;
+ int mode;
DB **dbpp;
{
DB *dbp;
- gint ret;
+ int ret;
/* Open up a handle on the main database. */
if ((ret = db_create(&dbp, subdbp->dbenv, 0)) != 0)
@@ -153,17 +153,17 @@ err:
* __db_master_update --
* Add/Open/Remove a subdatabase from a master database.
*
- * PUBLIC: gint __db_master_update __P((DB *, DB *, DB_TXN *, const gchar *,
- * PUBLIC: DBTYPE, mu_action, const gchar *, u_int32_t));
+ * PUBLIC: int __db_master_update __P((DB *, DB *, DB_TXN *, const char *,
+ * PUBLIC: DBTYPE, mu_action, const char *, u_int32_t));
*/
-gint
+int
__db_master_update(mdbp, sdbp, txn, subdb, type, action, newname, flags)
DB *mdbp, *sdbp;
DB_TXN *txn;
- const gchar *subdb;
+ const char *subdb;
DBTYPE type;
mu_action action;
- const gchar *newname;
+ const char *newname;
u_int32_t flags;
{
DB_ENV *dbenv;
@@ -171,7 +171,7 @@ __db_master_update(mdbp, sdbp, txn, subdb, type, action, newname, flags)
DBT key, data, ndata;
PAGE *p;
db_pgno_t t_pgno;
- gint modify, ret, t_ret;
+ int modify, ret, t_ret;
dbenv = mdbp->dbenv;
dbc = ndbc = NULL;
@@ -204,7 +204,7 @@ __db_master_update(mdbp, sdbp, txn, subdb, type, action, newname, flags)
* !!!
* We don't include the name's nul termination in the database.
*/
- key.data = (gpointer)subdb;
+ key.data = (void *)subdb;
key.size = (u_int32_t)strlen(subdb);
F_SET(&data, DB_DBT_MALLOC);
@@ -267,7 +267,7 @@ __db_master_update(mdbp, sdbp, txn, subdb, type, action, newname, flags)
if ((ret = mdbp->cursor(mdbp, txn, &ndbc, 0)) != 0)
goto err;
DB_ASSERT(newname != NULL);
- key.data = (gpointer)newname;
+ key.data = (void *)newname;
key.size = (u_int32_t)strlen(newname);
/*
@@ -400,14 +400,14 @@ done: /*
* __db_dbenv_setup --
* Set up the underlying environment during a db_open.
*
- * PUBLIC: gint __db_dbenv_setup __P((DB *,
- * PUBLIC: DB_TXN *, const gchar *, u_int32_t, u_int32_t));
+ * PUBLIC: int __db_dbenv_setup __P((DB *,
+ * PUBLIC: DB_TXN *, const char *, u_int32_t, u_int32_t));
*/
-gint
+int
__db_dbenv_setup(dbp, txn, name, id, flags)
DB *dbp;
DB_TXN *txn;
- const gchar *name;
+ const char *name;
u_int32_t id;
u_int32_t flags;
{
@@ -418,7 +418,7 @@ __db_dbenv_setup(dbp, txn, name, id, flags)
DB_MPOOLFILE *mpf;
DB_PGINFO pginfo;
u_int32_t maxid;
- gint ftype, ret;
+ int ftype, ret;
dbenv = dbp->dbenv;
@@ -601,9 +601,9 @@ __db_dbenv_setup(dbp, txn, name, id, flags)
* __db_close --
* DB destructor.
*
- * PUBLIC: gint __db_close __P((DB *, u_int32_t));
+ * PUBLIC: int __db_close __P((DB *, u_int32_t));
*/
-gint
+int
__db_close(dbp, flags)
DB *dbp;
u_int32_t flags;
@@ -625,16 +625,16 @@ __db_close(dbp, flags)
* __db_close_i --
* Internal DB destructor.
*
- * PUBLIC: gint __db_close_i __P((DB *, DB_TXN *, u_int32_t));
+ * PUBLIC: int __db_close_i __P((DB *, DB_TXN *, u_int32_t));
*/
-gint
+int
__db_close_i(dbp, txn, flags)
DB *dbp;
DB_TXN *txn;
u_int32_t flags;
{
DB_ENV *dbenv;
- gint ret, t_ret;
+ int ret, t_ret;
dbenv = dbp->dbenv;
ret = 0;
@@ -689,9 +689,9 @@ __db_close_i(dbp, txn, flags)
* the actual handle) and during abort processing, we may have a
* fully opened handle.
*
- * PUBLIC: gint __db_refresh __P((DB *, DB_TXN *, u_int32_t));
+ * PUBLIC: int __db_refresh __P((DB *, DB_TXN *, u_int32_t));
*/
-gint
+int
__db_refresh(dbp, txn, flags)
DB *dbp;
DB_TXN *txn;
@@ -702,7 +702,7 @@ __db_refresh(dbp, txn, flags)
DB_ENV *dbenv;
DB_LOCKREQ lreq;
DB_MPOOL *dbmp;
- gint ret, t_ret;
+ int ret, t_ret;
ret = 0;
@@ -913,9 +913,9 @@ never_opened:
* __db_log_page
* Log a meta-data or root page during a subdatabase create operation.
*
- * PUBLIC: gint __db_log_page __P((DB *, DB_TXN *, DB_LSN *, db_pgno_t, PAGE *));
+ * PUBLIC: int __db_log_page __P((DB *, DB_TXN *, DB_LSN *, db_pgno_t, PAGE *));
*/
-gint
+int
__db_log_page(dbp, txn, lsn, pgno, page)
DB *dbp;
DB_TXN *txn;
@@ -925,7 +925,7 @@ __db_log_page(dbp, txn, lsn, pgno, page)
{
DBT page_dbt;
DB_LSN new_lsn;
- gint ret;
+ int ret;
if (!LOGGING_ON(dbp->dbenv) || txn == NULL)
return (0);
@@ -945,8 +945,8 @@ __db_log_page(dbp, txn, lsn, pgno, page)
* __db_backup_name
* Create the backup file name for a given file.
*
- * PUBLIC: gint __db_backup_name __P((DB_ENV *,
- * PUBLIC: const gchar *, DB_TXN *, gchar **));
+ * PUBLIC: int __db_backup_name __P((DB_ENV *,
+ * PUBLIC: const char *, DB_TXN *, char **));
*/
#undef BACKUP_PREFIX
#define BACKUP_PREFIX "__db."
@@ -954,17 +954,17 @@ __db_log_page(dbp, txn, lsn, pgno, page)
#undef MAX_LSN_TO_TEXT
#define MAX_LSN_TO_TEXT 17
-gint
+int
__db_backup_name(dbenv, name, txn, backup)
DB_ENV *dbenv;
- const gchar *name;
+ const char *name;
DB_TXN *txn;
- gchar **backup;
+ char **backup;
{
DB_LSN lsn;
size_t len;
- gint plen, ret;
- gchar *p, *retp;
+ int plen, ret;
+ char *p, *retp;
/*
* Create the name. Backup file names are in one of two forms:
@@ -1026,7 +1026,7 @@ __db_backup_name(dbenv, name, txn, backup)
if (txn == NULL) /* case 3 */
snprintf(retp, len,
"%.*s%s%s.", plen, name, BACKUP_PREFIX, p);
- else /* case 4 */
+ else /* case 4 */
snprintf(retp, len,
"%.*s%x.%x.", plen, name, lsn.file, lsn.offset);
}
@@ -1066,7 +1066,7 @@ __db_disassociate(sdbp)
DB *sdbp;
{
DBC *dbc;
- gint ret, t_ret;
+ int ret, t_ret;
ret = 0;
@@ -1102,14 +1102,14 @@ __db_disassociate(sdbp)
* Create a copy of all backup files and our "main" DB.
*
* PUBLIC: #if CONFIG_TEST
- * PUBLIC: gint __db_testcopy __P((DB_ENV *, DB *, const gchar *));
+ * PUBLIC: int __db_testcopy __P((DB_ENV *, DB *, const char *));
* PUBLIC: #endif
*/
-gint
+int
__db_testcopy(dbenv, dbp, name)
DB_ENV *dbenv;
DB *dbp;
- const gchar *name;
+ const char *name;
{
DB_MPOOLFILE *mpf;
@@ -1129,11 +1129,11 @@ __db_testcopy(dbenv, dbp, name)
static int
__qam_testdocopy(dbp, name)
DB *dbp;
- const gchar *name;
+ const char *name;
{
QUEUE_FILELIST *filelist, *fp;
- gchar buf[256], *dir;
- gint ret;
+ char buf[256], *dir;
+ int ret;
filelist = NULL;
if ((ret = __db_testdocopy(dbp->dbenv, name)) != 0)
@@ -1164,11 +1164,11 @@ __qam_testdocopy(dbp, name)
static int
__db_testdocopy(dbenv, name)
DB_ENV *dbenv;
- const gchar *name;
+ const char *name;
{
size_t len;
- gint dircnt, i, ret;
- gchar **namesp, *backup, *copy, *dir, *p, *real_name;
+ int dircnt, i, ret;
+ char **namesp, *backup, *copy, *dir, *p, *real_name;
real_name = NULL;
/* Get the real backing file name. */
if ((ret = __db_appname(dbenv,
@@ -1275,11 +1275,11 @@ out:
static void
__db_makecopy(src, dest)
- const gchar *src, *dest;
+ const char *src, *dest;
{
DB_FH rfh, wfh;
size_t rcnt, wcnt;
- gchar *buf;
+ char *buf;
memset(&rfh, 0, sizeof(rfh));
memset(&wfh, 0, sizeof(wfh));
diff --git a/libdb/db/db_am.c b/libdb/db/db_am.c
index b385cea..3f74ff1 100644
--- a/libdb/db/db_am.c
+++ b/libdb/db/db_am.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -27,21 +27,21 @@ static const gchar revid[] = "$Id$";
#include "dbinc/mp.h"
#include "dbinc/qam.h"
-static gint __db_append_primary __P((DBC *, DBT *, DBT *));
-static gint __db_secondary_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-static gint __db_secondary_close __P((DB *, u_int32_t));
+static int __db_append_primary __P((DBC *, DBT *, DBT *));
+static int __db_secondary_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+static int __db_secondary_close __P((DB *, u_int32_t));
#ifdef DEBUG
-static gint __db_cprint_item __P((DBC *));
+static int __db_cprint_item __P((DBC *));
#endif
/*
* __db_cursor --
* Allocate and return a cursor.
*
- * PUBLIC: gint __db_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
+ * PUBLIC: int __db_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
*/
-gint
+int
__db_cursor(dbp, txn, dbcp, flags)
DB *dbp;
DB_TXN *txn;
@@ -52,7 +52,7 @@ __db_cursor(dbp, txn, dbcp, flags)
DBC *dbc;
db_lockmode_t mode;
u_int32_t op;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
@@ -109,23 +109,23 @@ __db_cursor(dbp, txn, dbcp, flags)
* non-NULL it is assumed to point to an area to
* initialize as a cursor.
*
- * PUBLIC: gint __db_icursor
+ * PUBLIC: int __db_icursor
* PUBLIC: __P((DB *, DB_TXN *, DBTYPE, db_pgno_t, int, u_int32_t, DBC **));
*/
-gint
+int
__db_icursor(dbp, txn, dbtype, root, is_opd, lockerid, dbcp)
DB *dbp;
DB_TXN *txn;
DBTYPE dbtype;
db_pgno_t root;
- gint is_opd;
+ int is_opd;
u_int32_t lockerid;
DBC **dbcp;
{
DBC *dbc, *adbc;
DBC_INTERNAL *cp;
DB_ENV *dbenv;
- gint allocated, ret;
+ int allocated, ret;
dbenv = dbp->dbenv;
allocated = 0;
@@ -333,14 +333,14 @@ err: if (allocated)
* __db_cprint --
* Display the cursor active and free queues.
*
- * PUBLIC: gint __db_cprint __P((DB *));
+ * PUBLIC: int __db_cprint __P((DB *));
*/
-gint
+int
__db_cprint(dbp)
DB *dbp;
{
DBC *dbc;
- gint ret, t_ret;
+ int ret, t_ret;
ret = 0;
MUTEX_THREAD_LOCK(dbp->dbenv, dbp->mutexp);
@@ -360,7 +360,7 @@ __db_cprint(dbp)
}
static
-gint __db_cprint_item(dbc)
+int __db_cprint_item(dbc)
DBC *dbc;
{
static const FN fn[] = {
@@ -377,7 +377,7 @@ gint __db_cprint_item(dbc)
};
DB *dbp;
DBC_INTERNAL *cp;
- const gchar *s;
+ const char *s;
dbp = dbc->dbp;
cp = dbc->internal;
@@ -417,15 +417,15 @@ gint __db_cprint_item(dbc)
* db_fd --
* Return a file descriptor for flock'ing.
*
- * PUBLIC: gint __db_fd __P((DB *, gint *));
+ * PUBLIC: int __db_fd __P((DB *, int *));
*/
-gint
+int
__db_fd(dbp, fdp)
DB *dbp;
- gint *fdp;
+ int *fdp;
{
DB_FH *fhp;
- gint ret;
+ int ret;
PANIC_CHECK(dbp->dbenv);
DB_ILLEGAL_BEFORE_OPEN(dbp, "DB->fd");
@@ -451,9 +451,9 @@ __db_fd(dbp, fdp)
* __db_get --
* Return a key/data pair.
*
- * PUBLIC: gint __db_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+ * PUBLIC: int __db_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
*/
-gint
+int
__db_get(dbp, txn, key, data, flags)
DB *dbp;
DB_TXN *txn;
@@ -461,7 +461,7 @@ __db_get(dbp, txn, key, data, flags)
u_int32_t flags;
{
DBC *dbc;
- gint mode, ret, t_ret;
+ int mode, ret, t_ret;
PANIC_CHECK(dbp->dbenv);
DB_ILLEGAL_BEFORE_OPEN(dbp, "DB->get");
@@ -514,9 +514,9 @@ __db_get(dbp, txn, key, data, flags)
* __db_put --
* Store a key/data pair.
*
- * PUBLIC: gint __db_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+ * PUBLIC: int __db_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
*/
-gint
+int
__db_put(dbp, txn, key, data, flags)
DB *dbp;
DB_TXN *txn;
@@ -526,7 +526,7 @@ __db_put(dbp, txn, key, data, flags)
DBC *dbc;
DBT tdata;
DB_ENV *dbenv;
- gint ret, t_ret, txn_local;
+ int ret, t_ret, txn_local;
dbc = NULL;
dbenv = dbp->dbenv;
@@ -670,9 +670,9 @@ err: /* Close the cursor. */
* __db_delete --
* Delete the items referenced by a key.
*
- * PUBLIC: gint __db_delete __P((DB *, DB_TXN *, DBT *, u_int32_t));
+ * PUBLIC: int __db_delete __P((DB *, DB_TXN *, DBT *, u_int32_t));
*/
-gint
+int
__db_delete(dbp, txn, key, flags)
DB *dbp;
DB_TXN *txn;
@@ -683,7 +683,7 @@ __db_delete(dbp, txn, key, flags)
DBT data, lkey;
DB_ENV *dbenv;
u_int32_t f_init, f_next;
- gint ret, t_ret, txn_local;
+ int ret, t_ret, txn_local;
dbc = NULL;
dbenv = dbp->dbenv;
@@ -801,14 +801,14 @@ err: /* Discard the cursor. */
* __db_sync --
* Flush the database cache.
*
- * PUBLIC: gint __db_sync __P((DB *, u_int32_t));
+ * PUBLIC: int __db_sync __P((DB *, u_int32_t));
*/
-gint
+int
__db_sync(dbp, flags)
DB *dbp;
u_int32_t flags;
{
- gint ret, t_ret;
+ int ret, t_ret;
PANIC_CHECK(dbp->dbenv);
DB_ILLEGAL_BEFORE_OPEN(dbp, "DB->sync");
@@ -838,20 +838,20 @@ __db_sync(dbp, flags)
* __db_associate --
* Associate another database as a secondary index to this one.
*
- * PUBLIC: gint __db_associate __P((DB *, DB_TXN *, DB *,
- * PUBLIC: gint (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
+ * PUBLIC: int __db_associate __P((DB *, DB_TXN *, DB *,
+ * PUBLIC: int (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
*/
-gint
+int
__db_associate(dbp, txn, sdbp, callback, flags)
DB *dbp, *sdbp;
DB_TXN *txn;
- gint (*callback) __P((DB *, const DBT *, const DBT *, DBT *));
+ int (*callback) __P((DB *, const DBT *, const DBT *, DBT *));
u_int32_t flags;
{
DB_ENV *dbenv;
DBC *pdbc, *sdbc;
DBT skey, key, data;
- gint build, ret, t_ret, txn_local;
+ int build, ret, t_ret, txn_local;
dbenv = dbp->dbenv;
@@ -1031,9 +1031,9 @@ err: if (pdbc != NULL && (t_ret = pdbc->c_close(pdbc)) != 0 && ret == 0)
* __db_pget --
* Return a primary key/data pair given a secondary key.
*
- * PUBLIC: gint __db_pget __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
+ * PUBLIC: int __db_pget __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
*/
-gint
+int
__db_pget(dbp, txn, skey, pkey, data, flags)
DB *dbp;
DB_TXN *txn;
@@ -1041,7 +1041,7 @@ __db_pget(dbp, txn, skey, pkey, data, flags)
u_int32_t flags;
{
DBC *dbc;
- gint ret, t_ret;
+ int ret, t_ret;
PANIC_CHECK(dbp->dbenv);
DB_ILLEGAL_BEFORE_OPEN(dbp, "DB->pget");
@@ -1111,7 +1111,7 @@ __db_secondary_close(sdbp, flags)
u_int32_t flags;
{
DB *primary;
- gint doclose;
+ int doclose;
doclose = 0;
primary = sdbp->s_primary;
@@ -1154,7 +1154,7 @@ __db_append_primary(dbc, key, data)
DB *dbp, *sdbp;
DBC *sdbc, *pdbc;
DBT oldpkey, pkey, pdata, skey;
- gint cmp, ret, t_ret;
+ int cmp, ret, t_ret;
dbp = dbc->dbp;
sdbp = NULL;
diff --git a/libdb/db/db_auto.c b/libdb/db/db_auto.c
index d9c4cc0..6b43b9c 100644
--- a/libdb/db/db_auto.c
+++ b/libdb/db/db_auto.c
@@ -18,11 +18,11 @@
#include "dbinc/txn.h"
/*
- * PUBLIC: gint __db_addrem_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __db_addrem_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, u_int32_t, db_pgno_t, u_int32_t, u_int32_t,
* PUBLIC: const DBT *, const DBT *, DB_LSN *));
*/
-gint
+int
__db_addrem_log(dbp, txnid, ret_lsnp, flags,
opcode, pgno, indx, nbytes, hdr,
dbt, pagelsn)
@@ -44,7 +44,7 @@ __db_addrem_log(dbp, txnid, ret_lsnp, flags,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -165,16 +165,16 @@ __db_addrem_log(dbp, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __db_addrem_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_addrem_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_addrem_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -211,21 +211,21 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __db_addrem_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_addrem_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_addrem_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__db_addrem_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -265,18 +265,18 @@ __db_addrem_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __db_addrem_read __P((DB_ENV *, gpointer , __db_addrem_args **));
+ * PUBLIC: int __db_addrem_read __P((DB_ENV *, void *, __db_addrem_args **));
*/
-gint
+int
__db_addrem_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__db_addrem_args **argpp;
{
__db_addrem_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__db_addrem_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -334,11 +334,11 @@ __db_addrem_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __db_big_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __db_big_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, u_int32_t, db_pgno_t, db_pgno_t, db_pgno_t,
* PUBLIC: const DBT *, DB_LSN *, DB_LSN *, DB_LSN *));
*/
-gint
+int
__db_big_log(dbp, txnid, ret_lsnp, flags,
opcode, pgno, prev_pgno, next_pgno, dbt,
pagelsn, prevlsn, nextlsn)
@@ -361,7 +361,7 @@ __db_big_log(dbp, txnid, ret_lsnp, flags,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -484,16 +484,16 @@ __db_big_log(dbp, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __db_big_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_big_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_big_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -550,21 +550,21 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __db_big_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_big_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_big_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__db_big_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -602,18 +602,18 @@ __db_big_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __db_big_read __P((DB_ENV *, gpointer , __db_big_args **));
+ * PUBLIC: int __db_big_read __P((DB_ENV *, void *, __db_big_args **));
*/
-gint
+int
__db_big_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__db_big_args **argpp;
{
__db_big_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__db_big_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -671,10 +671,10 @@ __db_big_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __db_ovref_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __db_ovref_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_pgno_t, int32_t, DB_LSN *));
*/
-gint
+int
__db_ovref_log(dbp, txnid, ret_lsnp, flags, pgno, adjust, lsn)
DB *dbp;
DB_TXN *txnid;
@@ -689,7 +689,7 @@ __db_ovref_log(dbp, txnid, ret_lsnp, flags, pgno, adjust, lsn)
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -776,16 +776,16 @@ __db_ovref_log(dbp, txnid, ret_lsnp, flags, pgno, adjust, lsn)
}
/*
- * PUBLIC: gint __db_ovref_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_ovref_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_ovref_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -822,19 +822,19 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __db_ovref_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_ovref_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_ovref_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__db_ovref_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -860,18 +860,18 @@ __db_ovref_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __db_ovref_read __P((DB_ENV *, gpointer , __db_ovref_args **));
+ * PUBLIC: int __db_ovref_read __P((DB_ENV *, void *, __db_ovref_args **));
*/
-gint
+int
__db_ovref_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__db_ovref_args **argpp;
{
__db_ovref_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__db_ovref_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -909,11 +909,11 @@ __db_ovref_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __db_relink_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __db_relink_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *,
* PUBLIC: db_pgno_t, DB_LSN *));
*/
-gint
+int
__db_relink_log(dbp, txnid, ret_lsnp, flags,
opcode, pgno, lsn, prev, lsn_prev,
next, lsn_next)
@@ -934,7 +934,7 @@ __db_relink_log(dbp, txnid, ret_lsnp, flags,
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -1045,16 +1045,16 @@ __db_relink_log(dbp, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __db_relink_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_relink_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_relink_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -1111,19 +1111,19 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __db_relink_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_relink_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_relink_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__db_relink_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -1155,18 +1155,18 @@ __db_relink_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __db_relink_read __P((DB_ENV *, gpointer , __db_relink_args **));
+ * PUBLIC: int __db_relink_read __P((DB_ENV *, void *, __db_relink_args **));
*/
-gint
+int
__db_relink_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__db_relink_args **argpp;
{
__db_relink_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__db_relink_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -1218,11 +1218,11 @@ __db_relink_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __db_debug_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __db_debug_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, const DBT *, int32_t, const DBT *, const DBT *,
* PUBLIC: u_int32_t));
*/
-gint
+int
__db_debug_log(dbenv, txnid, ret_lsnp, flags,
op, fileid, key, data, arg_flags)
DB_ENV *dbenv;
@@ -1240,7 +1240,7 @@ __db_debug_log(dbenv, txnid, ret_lsnp, flags,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
rectype = DB___db_debug;
@@ -1342,19 +1342,19 @@ __db_debug_log(dbenv, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __db_debug_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_debug_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_debug_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -1375,21 +1375,21 @@ __db_debug_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __db_debug_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_debug_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_debug_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__db_debug_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -1430,18 +1430,18 @@ __db_debug_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __db_debug_read __P((DB_ENV *, gpointer , __db_debug_args **));
+ * PUBLIC: int __db_debug_read __P((DB_ENV *, void *, __db_debug_args **));
*/
-gint
+int
__db_debug_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__db_debug_args **argpp;
{
__db_debug_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__db_debug_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -1490,10 +1490,10 @@ __db_debug_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __db_noop_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __db_noop_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_pgno_t, DB_LSN *));
*/
-gint
+int
__db_noop_log(dbp, txnid, ret_lsnp, flags, pgno, prevlsn)
DB *dbp;
DB_TXN *txnid;
@@ -1507,7 +1507,7 @@ __db_noop_log(dbp, txnid, ret_lsnp, flags, pgno, prevlsn)
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -1589,16 +1589,16 @@ __db_noop_log(dbp, txnid, ret_lsnp, flags, pgno, prevlsn)
}
/*
- * PUBLIC: gint __db_noop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_noop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_noop_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -1635,19 +1635,19 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __db_noop_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_noop_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_noop_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__db_noop_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -1672,18 +1672,18 @@ __db_noop_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __db_noop_read __P((DB_ENV *, gpointer , __db_noop_args **));
+ * PUBLIC: int __db_noop_read __P((DB_ENV *, void *, __db_noop_args **));
*/
-gint
+int
__db_noop_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__db_noop_args **argpp;
{
__db_noop_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__db_noop_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -1717,11 +1717,11 @@ __db_noop_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __db_pg_alloc_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __db_pg_alloc_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, u_int32_t,
* PUBLIC: db_pgno_t));
*/
-gint
+int
__db_pg_alloc_log(dbp, txnid, ret_lsnp, flags, meta_lsn, meta_pgno, page_lsn, pgno, ptype,
next)
DB *dbp;
@@ -1740,7 +1740,7 @@ __db_pg_alloc_log(dbp, txnid, ret_lsnp, flags, meta_lsn, meta_pgno, page_lsn, pg
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -1844,16 +1844,16 @@ __db_pg_alloc_log(dbp, txnid, ret_lsnp, flags, meta_lsn, meta_pgno, page_lsn, pg
}
/*
- * PUBLIC: gint __db_pg_alloc_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_pg_alloc_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_pg_alloc_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -1898,19 +1898,19 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __db_pg_alloc_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_pg_alloc_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_pg_alloc_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__db_pg_alloc_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -1940,19 +1940,19 @@ __db_pg_alloc_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __db_pg_alloc_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int __db_pg_alloc_read __P((DB_ENV *, void *,
* PUBLIC: __db_pg_alloc_args **));
*/
-gint
+int
__db_pg_alloc_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__db_pg_alloc_args **argpp;
{
__db_pg_alloc_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__db_pg_alloc_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -2001,11 +2001,11 @@ __db_pg_alloc_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __db_pg_free_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __db_pg_free_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, const DBT *,
* PUBLIC: db_pgno_t));
*/
-gint
+int
__db_pg_free_log(dbp, txnid, ret_lsnp, flags, pgno, meta_lsn, meta_pgno, header, next)
DB *dbp;
DB_TXN *txnid;
@@ -2023,7 +2023,7 @@ __db_pg_free_log(dbp, txnid, ret_lsnp, flags, pgno, meta_lsn, meta_pgno, header,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -2127,16 +2127,16 @@ __db_pg_free_log(dbp, txnid, ret_lsnp, flags, pgno, meta_lsn, meta_pgno, header,
}
/*
- * PUBLIC: gint __db_pg_free_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_pg_free_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_pg_free_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -2181,21 +2181,21 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __db_pg_free_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_pg_free_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_pg_free_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__db_pg_free_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -2228,18 +2228,18 @@ __db_pg_free_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __db_pg_free_read __P((DB_ENV *, gpointer , __db_pg_free_args **));
+ * PUBLIC: int __db_pg_free_read __P((DB_ENV *, void *, __db_pg_free_args **));
*/
-gint
+int
__db_pg_free_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__db_pg_free_args **argpp;
{
__db_pg_free_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__db_pg_free_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -2287,9 +2287,9 @@ __db_pg_free_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __db_cksum_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t));
+ * PUBLIC: int __db_cksum_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t));
*/
-gint
+int
__db_cksum_log(dbenv, txnid, ret_lsnp, flags)
DB_ENV *dbenv;
DB_TXN *txnid;
@@ -2299,7 +2299,7 @@ __db_cksum_log(dbenv, txnid, ret_lsnp, flags)
DBT logrec;
DB_LSN *lsnp, null_lsn;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
rectype = DB___db_cksum;
@@ -2358,19 +2358,19 @@ __db_cksum_log(dbenv, txnid, ret_lsnp, flags)
}
/*
- * PUBLIC: gint __db_cksum_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_cksum_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_cksum_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -2391,19 +2391,19 @@ __db_cksum_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __db_cksum_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __db_cksum_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__db_cksum_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__db_cksum_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -2424,17 +2424,17 @@ __db_cksum_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __db_cksum_read __P((DB_ENV *, gpointer , __db_cksum_args **));
+ * PUBLIC: int __db_cksum_read __P((DB_ENV *, void *, __db_cksum_args **));
*/
-gint
+int
__db_cksum_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__db_cksum_args **argpp;
{
__db_cksum_args *argp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__db_cksum_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -2457,16 +2457,16 @@ __db_cksum_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __db_init_print __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __db_init_print __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__db_init_print(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__db_addrem_print, DB___db_addrem)) != 0)
@@ -2499,16 +2499,16 @@ __db_init_print(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __db_init_getpgnos __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __db_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__db_init_getpgnos(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__db_addrem_getpgnos, DB___db_addrem)) != 0)
@@ -2541,16 +2541,16 @@ __db_init_getpgnos(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __db_init_recover __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __db_init_recover __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__db_init_recover(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__db_addrem_recover, DB___db_addrem)) != 0)
diff --git a/libdb/db/db_cam.c b/libdb/db/db_cam.c
index ecf103b..9807b9d 100644
--- a/libdb/db/db_cam.c
+++ b/libdb/db/db_cam.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -26,11 +26,11 @@ static const gchar revid[] = "$Id$";
#include "dbinc/log.h"
#include "dbinc/qam.h"
-static gint __db_buildpartial __P((DB *, DBT *, DBT *, DBT *));
-static gint __db_c_cleanup __P((DBC *, DBC *, int));
-static gint __db_c_del_secondary __P((DBC *));
-static gint __db_c_pget_recno __P((DBC *, DBT *, DBT *, u_int32_t));
-static gint __db_wrlock_err __P((DB_ENV *));
+static int __db_buildpartial __P((DB *, DBT *, DBT *, DBT *));
+static int __db_c_cleanup __P((DBC *, DBC *, int));
+static int __db_c_del_secondary __P((DBC *));
+static int __db_c_pget_recno __P((DBC *, DBT *, DBT *, u_int32_t));
+static int __db_wrlock_err __P((DB_ENV *));
#define CDB_LOCKING_INIT(dbp, dbc) \
/* \
@@ -72,9 +72,9 @@ static gint __db_wrlock_err __P((DB_ENV *));
* __db_c_close --
* Close the cursor.
*
- * PUBLIC: gint __db_c_close __P((DBC *));
+ * PUBLIC: int __db_c_close __P((DBC *));
*/
-gint
+int
__db_c_close(dbc)
DBC *dbc;
{
@@ -82,7 +82,7 @@ __db_c_close(dbc)
DBC *opd;
DBC_INTERNAL *cp;
DB_ENV *dbenv;
- gint ret, t_ret;
+ int ret, t_ret;
dbp = dbc->dbp;
dbenv = dbp->dbenv;
@@ -179,15 +179,15 @@ __db_c_close(dbc)
* __db_c_destroy --
* Destroy the cursor, called after DBC->c_close.
*
- * PUBLIC: gint __db_c_destroy __P((DBC *));
+ * PUBLIC: int __db_c_destroy __P((DBC *));
*/
-gint
+int
__db_c_destroy(dbc)
DBC *dbc;
{
DB *dbp;
DB_ENV *dbenv;
- gint ret, t_ret;
+ int ret, t_ret;
dbp = dbc->dbp;
dbenv = dbp->dbenv;
@@ -225,16 +225,16 @@ __db_c_destroy(dbc)
* __db_c_count --
* Return a count of duplicate data items.
*
- * PUBLIC: gint __db_c_count __P((DBC *, db_recno_t *, u_int32_t));
+ * PUBLIC: int __db_c_count __P((DBC *, db_recno_t *, u_int32_t));
*/
-gint
+int
__db_c_count(dbc, recnop, flags)
DBC *dbc;
db_recno_t *recnop;
u_int32_t flags;
{
DB *dbp;
- gint ret;
+ int ret;
/*
* Cursor Cleanup Note:
@@ -278,16 +278,16 @@ __db_c_count(dbc, recnop, flags)
* __db_c_del --
* Delete using a cursor.
*
- * PUBLIC: gint __db_c_del __P((DBC *, u_int32_t));
+ * PUBLIC: int __db_c_del __P((DBC *, u_int32_t));
*/
-gint
+int
__db_c_del(dbc, flags)
DBC *dbc;
u_int32_t flags;
{
DB *dbp;
DBC *opd;
- gint ret;
+ int ret;
/*
* Cursor Cleanup Note:
@@ -355,9 +355,9 @@ done: CDB_LOCKING_DONE(dbp, dbc);
* __db_c_dup --
* Duplicate a cursor
*
- * PUBLIC: gint __db_c_dup __P((DBC *, DBC **, u_int32_t));
+ * PUBLIC: int __db_c_dup __P((DBC *, DBC **, u_int32_t));
*/
-gint
+int
__db_c_dup(dbc_orig, dbcp, flags)
DBC *dbc_orig;
DBC **dbcp;
@@ -366,7 +366,7 @@ __db_c_dup(dbc_orig, dbcp, flags)
DB_ENV *dbenv;
DB *dbp;
DBC *dbc_n, *dbc_nopd;
- gint ret;
+ int ret;
dbp = dbc_orig->dbp;
dbenv = dbp->dbenv;
@@ -432,9 +432,9 @@ err: if (dbc_n != NULL)
* __db_c_idup --
* Internal version of __db_c_dup.
*
- * PUBLIC: gint __db_c_idup __P((DBC *, DBC **, u_int32_t));
+ * PUBLIC: int __db_c_idup __P((DBC *, DBC **, u_int32_t));
*/
-gint
+int
__db_c_idup(dbc_orig, dbcp, flags)
DBC *dbc_orig, **dbcp;
u_int32_t flags;
@@ -442,7 +442,7 @@ __db_c_idup(dbc_orig, dbcp, flags)
DB *dbp;
DBC *dbc_n;
DBC_INTERNAL *int_n, *int_orig;
- gint ret;
+ int ret;
dbp = dbc_orig->dbp;
dbc_n = *dbcp;
@@ -502,9 +502,9 @@ err: (void)dbc_n->c_close(dbc_n);
* __db_c_newopd --
* Create a new off-page duplicate cursor.
*
- * PUBLIC: gint __db_c_newopd __P((DBC *, db_pgno_t, DBC *, DBC **));
+ * PUBLIC: int __db_c_newopd __P((DBC *, db_pgno_t, DBC *, DBC **));
*/
-gint
+int
__db_c_newopd(dbc_parent, root, oldopd, dbcp)
DBC *dbc_parent;
db_pgno_t root;
@@ -514,7 +514,7 @@ __db_c_newopd(dbc_parent, root, oldopd, dbcp)
DB *dbp;
DBC *opd;
DBTYPE dbtype;
- gint ret;
+ int ret;
dbp = dbc_parent->dbp;
dbtype = (dbp->dup_compare == NULL) ? DB_RECNO : DB_BTREE;
@@ -564,9 +564,9 @@ __db_c_newopd(dbc_parent, root, oldopd, dbcp)
* __db_c_get --
* Get using a cursor.
*
- * PUBLIC: gint __db_c_get __P((DBC *, DBT *, DBT *, u_int32_t));
+ * PUBLIC: int __db_c_get __P((DBC *, DBT *, DBT *, u_int32_t));
*/
-gint
+int
__db_c_get(dbc_arg, key, data, flags)
DBC *dbc_arg;
DBT *key, *data;
@@ -579,7 +579,7 @@ __db_c_get(dbc_arg, key, data, flags)
db_pgno_t pgno;
u_int32_t multi, tmp_dirty, tmp_flags, tmp_rmw;
u_int8_t type;
- gint ret, t_ret;
+ int ret, t_ret;
/*
* Cursor Cleanup Note:
@@ -885,9 +885,9 @@ err: /* Don't pass DB_DBT_ISSET back to application level, error or no. */
* __db_c_put --
* Put using a cursor.
*
- * PUBLIC: gint __db_c_put __P((DBC *, DBT *, DBT *, u_int32_t));
+ * PUBLIC: int __db_c_put __P((DBC *, DBT *, DBT *, u_int32_t));
*/
-gint
+int
__db_c_put(dbc_arg, key, data, flags)
DBC *dbc_arg;
DBT *key, *data;
@@ -897,7 +897,7 @@ __db_c_put(dbc_arg, key, data, flags)
DBC *dbc_n, *oldopd, *opd, *sdbc, *pdbc;
DBT olddata, oldpkey, oldskey, newdata, pkey, save_skey, skey, temp;
db_pgno_t pgno;
- gint cmp, have_oldrec, ispartial, nodel, re_pad, ret, rmw, t_ret;
+ int cmp, have_oldrec, ispartial, nodel, re_pad, ret, rmw, t_ret;
u_int32_t re_len, size, tmp_flags;
/*
@@ -1472,9 +1472,9 @@ err: /* Cleanup and cursor resolution. */
/*
* __db_duperr()
* Error message: we don't currently support sorted duplicate duplicates.
- * PUBLIC: gint __db_duperr __P((DB *, u_int32_t));
+ * PUBLIC: int __db_duperr __P((DB *, u_int32_t));
*/
-gint
+int
__db_duperr(dbp, flags)
DB *dbp;
u_int32_t flags;
@@ -1505,13 +1505,13 @@ __db_duperr(dbp, flags)
static int
__db_c_cleanup(dbc, dbc_n, failed)
DBC *dbc, *dbc_n;
- gint failed;
+ int failed;
{
DB *dbp;
DBC *opd;
DBC_INTERNAL *internal;
DB_MPOOLFILE *mpf;
- gint ret, t_ret;
+ int ret, t_ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -1599,9 +1599,9 @@ __db_c_cleanup(dbc, dbc_n, failed)
* This wrapper function for DBC->c_pget() is the DBC->c_get() function
* for a secondary index cursor.
*
- * PUBLIC: gint __db_c_secondary_get __P((DBC *, DBT *, DBT *, u_int32_t));
+ * PUBLIC: int __db_c_secondary_get __P((DBC *, DBT *, DBT *, u_int32_t));
*/
-gint
+int
__db_c_secondary_get(dbc, skey, data, flags)
DBC *dbc;
DBT *skey, *data;
@@ -1616,9 +1616,9 @@ __db_c_secondary_get(dbc, skey, data, flags)
* __db_c_pget --
* Get a primary key/data pair through a secondary index.
*
- * PUBLIC: gint __db_c_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
+ * PUBLIC: int __db_c_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
*/
-gint
+int
__db_c_pget(dbc, skey, pkey, data, flags)
DBC *dbc;
DBT *skey, *pkey, *data;
@@ -1627,7 +1627,7 @@ __db_c_pget(dbc, skey, pkey, data, flags)
DB *pdbp, *sdbp;
DBC *pdbc;
DBT *save_rdata, nullpkey;
- gint pkeymalloc, ret, save_pkey_flags, t_ret;
+ int pkeymalloc, ret, save_pkey_flags, t_ret;
sdbp = dbc->dbp;
pdbp = sdbp->s_primary;
@@ -1830,7 +1830,7 @@ __db_c_pget_recno(sdbc, pkey, data, flags)
DBT discardme, primary_key;
db_recno_t oob;
u_int32_t rmw;
- gint ret, t_ret;
+ int ret, t_ret;
sdbp = sdbc->dbp;
pdbp = sdbp->s_primary;
@@ -1933,7 +1933,7 @@ __db_c_del_secondary(dbc)
DB *pdbp;
DBC *pdbc;
DBT skey, pkey;
- gint ret, t_ret;
+ int ret, t_ret;
memset(&skey, 0, sizeof(DBT));
memset(&pkey, 0, sizeof(DBT));
@@ -2002,16 +2002,16 @@ __db_c_del_secondary(dbc)
* database, and delete any secondary keys that point at the current
* record.
*
- * PUBLIC: gint __db_c_del_primary __P((DBC *));
+ * PUBLIC: int __db_c_del_primary __P((DBC *));
*/
-gint
+int
__db_c_del_primary(dbc)
DBC *dbc;
{
DB *dbp, *sdbp;
DBC *sdbc;
DBT data, pkey, skey, temp;
- gint ret, t_ret;
+ int ret, t_ret;
dbp = dbc->dbp;
@@ -2115,14 +2115,14 @@ __db_s_first(pdbp)
* __db_s_next --
* Get the next secondary in the list.
*
- * PUBLIC: gint __db_s_next __P((DB **));
+ * PUBLIC: int __db_s_next __P((DB **));
*/
-gint
+int
__db_s_next(sdbpp)
DB **sdbpp;
{
DB *sdbp, *pdbp, *closeme;
- gint ret;
+ int ret;
/*
* Secondary indices are kept in a linked list, s_secondaries,
@@ -2176,14 +2176,14 @@ __db_s_next(sdbpp)
* Properly decrement the refcount on a secondary database handle we're
* using, without calling __db_s_next.
*
- * PUBLIC: gint __db_s_done __P((DB *));
+ * PUBLIC: int __db_s_done __P((DB *));
*/
-gint
+int
__db_s_done(sdbp)
DB *sdbp;
{
DB *pdbp;
- gint doclose;
+ int doclose;
pdbp = sdbp->s_primary;
doclose = 0;
@@ -2213,7 +2213,7 @@ __db_buildpartial(dbp, oldrec, partial, newrec)
DB *dbp;
DBT *oldrec, *partial, *newrec;
{
- gint ret;
+ int ret;
u_int8_t *buf;
u_int32_t len, nbytes;
diff --git a/libdb/db/db_conv.c b/libdb/db/db_conv.c
index c95d373..de2710d 100644
--- a/libdb/db/db_conv.c
+++ b/libdb/db/db_conv.c
@@ -40,7 +40,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -63,13 +63,13 @@ static const gchar revid[] = "$Id$";
* __db_pgin --
* Primary page-swap routine.
*
- * PUBLIC: gint __db_pgin __P((DB_ENV *, db_pgno_t, gpointer , DBT *));
+ * PUBLIC: int __db_pgin __P((DB_ENV *, db_pgno_t, void *, DBT *));
*/
-gint
+int
__db_pgin(dbenv, pg, pp, cookie)
DB_ENV *dbenv;
db_pgno_t pg;
- gpointer pp;
+ void *pp;
DBT *cookie;
{
DB dummydb, *dbp;
@@ -78,7 +78,7 @@ __db_pgin(dbenv, pg, pp, cookie)
DB_LSN not_used;
PAGE *pagep;
size_t pg_off, pg_len, sum_len;
- gint is_hmac, ret;
+ int is_hmac, ret;
u_int8_t *chksum, *iv;
pginfo = (DB_PGINFO *)cookie->data;
@@ -222,13 +222,13 @@ __db_pgin(dbenv, pg, pp, cookie)
* __db_pgout --
* Primary page-swap routine.
*
- * PUBLIC: gint __db_pgout __P((DB_ENV *, db_pgno_t, gpointer , DBT *));
+ * PUBLIC: int __db_pgout __P((DB_ENV *, db_pgno_t, void *, DBT *));
*/
-gint
+int
__db_pgout(dbenv, pg, pp, cookie)
DB_ENV *dbenv;
db_pgno_t pg;
- gpointer pp;
+ void *pp;
DBT *cookie;
{
DB dummydb, *dbp;
@@ -236,7 +236,7 @@ __db_pgout(dbenv, pg, pp, cookie)
DB_PGINFO *pginfo;
PAGE *pagep;
size_t pg_off, pg_len, sum_len;
- gint ret;
+ int ret;
u_int8_t *chksum, *iv, *key;
pginfo = (DB_PGINFO *)cookie->data;
@@ -368,17 +368,17 @@ __db_metaswap(pg)
* __db_byteswap --
* Byteswap a page.
*
- * PUBLIC: gint __db_byteswap
+ * PUBLIC: int __db_byteswap
* PUBLIC: __P((DB_ENV *, DB *, db_pgno_t, PAGE *, size_t, int));
*/
-gint
+int
__db_byteswap(dbenv, dbp, pg, h, pagesize, pgin)
DB_ENV *dbenv;
DB *dbp;
db_pgno_t pg;
PAGE *h;
size_t pagesize;
- gint pgin;
+ int pgin;
{
BINTERNAL *bi;
BKEYDATA *bk;
diff --git a/libdb/db/db_dispatch.c b/libdb/db/db_dispatch.c
index 40cbebd..37d4b1d 100644
--- a/libdb/db/db_dispatch.c
+++ b/libdb/db/db_dispatch.c
@@ -39,7 +39,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -58,17 +58,17 @@ static const gchar revid[] = "$Id$";
#include "dbinc/rep.h"
#include "dbinc/txn.h"
-static gint __db_limbo_fix __P((DB *,
+static int __db_limbo_fix __P((DB *,
DB_TXN *, DB_TXNLIST *, db_pgno_t *, DBMETA *));
-static gint __db_limbo_bucket __P((DB_ENV *, DB_TXN *, DB_TXNLIST *));
-static gint __db_limbo_move __P((DB_ENV *, DB_TXN *, DB_TXN *, DB_TXNLIST *));
-static gint __db_lock_move __P((DB_ENV *,
+static int __db_limbo_bucket __P((DB_ENV *, DB_TXN *, DB_TXNLIST *));
+static int __db_limbo_move __P((DB_ENV *, DB_TXN *, DB_TXN *, DB_TXNLIST *));
+static int __db_lock_move __P((DB_ENV *,
u_int8_t *, db_pgno_t, db_lockmode_t, DB_TXN *, DB_TXN *));
-static gint __db_default_getpgnos __P((DB_ENV *, DB_LSN *lsnp, gpointer ));
-static gint __db_txnlist_find_internal __P((DB_ENV *, gpointer , db_txnlist_type,
+static int __db_default_getpgnos __P((DB_ENV *, DB_LSN *lsnp, void *));
+static int __db_txnlist_find_internal __P((DB_ENV *, void *, db_txnlist_type,
u_int32_t, u_int8_t [DB_FILE_ID_LEN], DB_TXNLIST **, int));
-static gint __db_txnlist_pgnoadd __P((DB_ENV *, DB_TXNHEAD *,
- int32_t, u_int8_t [DB_FILE_ID_LEN], gchar *, db_pgno_t));
+static int __db_txnlist_pgnoadd __P((DB_ENV *, DB_TXNHEAD *,
+ int32_t, u_int8_t [DB_FILE_ID_LEN], char *, db_pgno_t));
/*
* __db_dispatch --
@@ -79,23 +79,23 @@ static gint __db_txnlist_pgnoadd __P((DB_ENV *, DB_TXNHEAD *,
* scripts in the tools directory). An application using a different
* recovery paradigm will supply a different dispatch function to txn_open.
*
- * PUBLIC: gint __db_dispatch __P((DB_ENV *,
- * PUBLIC: gint (**)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer )),
- * PUBLIC: size_t, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __db_dispatch __P((DB_ENV *,
+ * PUBLIC: int (**)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)),
+ * PUBLIC: size_t, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__db_dispatch(dbenv, dtab, dtabsize, db, lsnp, redo, info)
DB_ENV *dbenv; /* The environment. */
- gint (**dtab)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (**dtab)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t dtabsize; /* Size of the dtab. */
DBT *db; /* The log record upon which to dispatch. */
DB_LSN *lsnp; /* The lsn of the record being dispatched. */
db_recops redo; /* Redo this op (or undo it). */
- gpointer info;
+ void *info;
{
DB_LSN prev_lsn;
u_int32_t rectype, txnid;
- gint make_call, ret;
+ int make_call, ret;
memcpy(&rectype, db->data, sizeof(rectype));
memcpy(&txnid, (u_int8_t *)db->data + sizeof(rectype), sizeof(txnid));
@@ -293,20 +293,20 @@ __db_dispatch(dbenv, dtab, dtabsize, db, lsnp, redo, info)
/*
* __db_add_recovery --
*
- * PUBLIC: gint __db_add_recovery __P((DB_ENV *,
- * PUBLIC: gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *,
- * PUBLIC: gint (*)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), u_int32_t));
+ * PUBLIC: int __db_add_recovery __P((DB_ENV *,
+ * PUBLIC: int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *,
+ * PUBLIC: int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), u_int32_t));
*/
-gint
+int
__db_add_recovery(dbenv, dtab, dtabsize, func, ndx)
DB_ENV *dbenv;
- gint (***dtab) __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtab) __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsize;
- gint (*func) __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (*func) __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
u_int32_t ndx;
{
size_t i, nsize;
- gint ret;
+ int ret;
/* Check if we have to grow the table. */
if (ndx >= *dtabsize) {
@@ -327,19 +327,19 @@ __db_add_recovery(dbenv, dtab, dtabsize, func, ndx)
* __db_txnlist_init --
* Initialize transaction linked list.
*
- * PUBLIC: gint __db_txnlist_init __P((DB_ENV *,
- * PUBLIC: u_int32_t, u_int32_t, DB_LSN *, gpointer ));
+ * PUBLIC: int __db_txnlist_init __P((DB_ENV *,
+ * PUBLIC: u_int32_t, u_int32_t, DB_LSN *, void *));
*/
-gint
+int
__db_txnlist_init(dbenv, low_txn, hi_txn, trunc_lsn, retp)
DB_ENV *dbenv;
u_int32_t low_txn, hi_txn;
DB_LSN *trunc_lsn;
- gpointer retp;
+ void *retp;
{
DB_TXNHEAD *headp;
u_int32_t tmp;
- gint ret, size;
+ int ret, size;
/*
* Size a hash table.
@@ -389,7 +389,7 @@ __db_txnlist_init(dbenv, low_txn, hi_txn, trunc_lsn, retp)
ZERO_LSN(headp->maxlsn);
ZERO_LSN(headp->ckplsn);
- *(gpointer *)retp = headp;
+ *(void **)retp = headp;
return (0);
}
@@ -397,20 +397,20 @@ __db_txnlist_init(dbenv, low_txn, hi_txn, trunc_lsn, retp)
* __db_txnlist_add --
* Add an element to our transaction linked list.
*
- * PUBLIC: gint __db_txnlist_add __P((DB_ENV *,
- * PUBLIC: gpointer , u_int32_t, int32_t, DB_LSN *));
+ * PUBLIC: int __db_txnlist_add __P((DB_ENV *,
+ * PUBLIC: void *, u_int32_t, int32_t, DB_LSN *));
*/
-gint
+int
__db_txnlist_add(dbenv, listp, txnid, status, lsn)
DB_ENV *dbenv;
- gpointer listp;
+ void *listp;
u_int32_t txnid;
int32_t status;
DB_LSN *lsn;
{
DB_TXNHEAD *hp;
DB_TXNLIST *elp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv, sizeof(DB_TXNLIST), &elp)) != 0)
return (ret);
@@ -437,12 +437,12 @@ __db_txnlist_add(dbenv, listp, txnid, status, lsn)
* __db_txnlist_remove --
* Remove an element from our transaction linked list.
*
- * PUBLIC: gint __db_txnlist_remove __P((DB_ENV *, gpointer , u_int32_t));
+ * PUBLIC: int __db_txnlist_remove __P((DB_ENV *, void *, u_int32_t));
*/
-gint
+int
__db_txnlist_remove(dbenv, listp, txnid)
DB_ENV *dbenv;
- gpointer listp;
+ void *listp;
u_int32_t txnid;
{
DB_TXNLIST *entry;
@@ -460,12 +460,12 @@ __db_txnlist_remove(dbenv, listp, txnid)
* recovery, we are going to virtually truncate the log and we need
* to retain the last checkpoint before the truncation point.
*
- * PUBLIC: void __db_txnlist_ckp __P((DB_ENV *, gpointer , DB_LSN *));
+ * PUBLIC: void __db_txnlist_ckp __P((DB_ENV *, void *, DB_LSN *));
*/
void
__db_txnlist_ckp(dbenv, listp, ckp_lsn)
DB_ENV *dbenv;
- gpointer listp;
+ void *listp;
DB_LSN *ckp_lsn;
{
DB_TXNHEAD *hp;
@@ -484,16 +484,16 @@ __db_txnlist_ckp(dbenv, listp, ckp_lsn)
* Discard transaction linked list. Print out any error messages
* for deleted files.
*
- * PUBLIC: void __db_txnlist_end __P((DB_ENV *, gpointer ));
+ * PUBLIC: void __db_txnlist_end __P((DB_ENV *, void *));
*/
void
__db_txnlist_end(dbenv, listp)
DB_ENV *dbenv;
- gpointer listp;
+ void *listp;
{
DB_TXNHEAD *hp;
DB_TXNLIST *p;
- gint i;
+ int i;
if ((hp = (DB_TXNHEAD *)listp) == NULL)
return;
@@ -528,12 +528,12 @@ __db_txnlist_end(dbenv, listp)
* the status of the transaction. A txnid of 0 means the record
* was generated while not in a transaction.
*
- * PUBLIC: gint __db_txnlist_find __P((DB_ENV *, gpointer , u_int32_t));
+ * PUBLIC: int __db_txnlist_find __P((DB_ENV *, void *, u_int32_t));
*/
-gint
+int
__db_txnlist_find(dbenv, listp, txnid)
DB_ENV *dbenv;
- gpointer listp;
+ void *listp;
u_int32_t txnid;
{
DB_TXNLIST *entry;
@@ -549,20 +549,20 @@ __db_txnlist_find(dbenv, listp, txnid)
* Change the status of an existing transaction entry.
* Returns TXN_NOTFOUND if no such entry exists.
*
- * PUBLIC: gint __db_txnlist_update __P((DB_ENV *,
- * PUBLIC: gpointer , u_int32_t, u_int32_t, DB_LSN *));
+ * PUBLIC: int __db_txnlist_update __P((DB_ENV *,
+ * PUBLIC: void *, u_int32_t, u_int32_t, DB_LSN *));
*/
-gint
+int
__db_txnlist_update(dbenv, listp, txnid, status, lsn)
DB_ENV *dbenv;
- gpointer listp;
+ void *listp;
u_int32_t txnid;
u_int32_t status;
DB_LSN *lsn;
{
DB_TXNHEAD *hp;
DB_TXNLIST *elp;
- gint ret;
+ int ret;
if (txnid == 0)
return (TXN_NOTFOUND);
@@ -590,19 +590,19 @@ __db_txnlist_update(dbenv, listp, txnid, status, lsn)
static int
__db_txnlist_find_internal(dbenv, listp, type, txnid, uid, txnlistp, delete)
DB_ENV *dbenv;
- gpointer listp;
+ void *listp;
db_txnlist_type type;
u_int32_t txnid;
u_int8_t uid[DB_FILE_ID_LEN];
DB_TXNLIST **txnlistp;
- gint delete;
+ int delete;
{
DB_TXNHEAD *hp;
DB_TXNLIST *p;
int32_t generation;
u_int32_t hash;
struct __db_headlink *head;
- gint i, ret;
+ int i, ret;
if ((hp = (DB_TXNHEAD *)listp) == NULL)
return (TXN_NOTFOUND);
@@ -674,18 +674,18 @@ __db_txnlist_find_internal(dbenv, listp, type, txnid, uid, txnlistp, delete)
* __db_txnlist_gen --
* Change the current generation number.
*
- * PUBLIC: gint __db_txnlist_gen __P((DB_ENV *,
- * PUBLIC: gpointer , int, u_int32_t, u_int32_t));
+ * PUBLIC: int __db_txnlist_gen __P((DB_ENV *,
+ * PUBLIC: void *, int, u_int32_t, u_int32_t));
*/
-gint
+int
__db_txnlist_gen(dbenv, listp, incr, min, max)
DB_ENV *dbenv;
- gpointer listp;
- gint incr;
+ void *listp;
+ int incr;
u_int32_t min, max;
{
DB_TXNHEAD *hp;
- gint ret;
+ int ret;
/*
* During recovery generation numbers keep track of "restart"
@@ -721,7 +721,7 @@ __db_txnlist_gen(dbenv, listp, incr, min, max)
}
#define TXN_BUBBLE(AP, MAX) { \
- gint __j; \
+ int __j; \
DB_LSN __tmp; \
\
for (__j = 0; __j < MAX - 1; __j++) \
@@ -739,18 +739,18 @@ __db_txnlist_gen(dbenv, listp, incr, min, max)
* subsystem explicitly, and there is only a single TXNLIST_LSN entry on
* the list.
*
- * PUBLIC: gint __db_txnlist_lsnadd __P((DB_ENV *, gpointer , DB_LSN *, u_int32_t));
+ * PUBLIC: int __db_txnlist_lsnadd __P((DB_ENV *, void *, DB_LSN *, u_int32_t));
*/
-gint
+int
__db_txnlist_lsnadd(dbenv, listp, lsnp, flags)
DB_ENV *dbenv;
- gpointer listp;
+ void *listp;
DB_LSN *lsnp;
u_int32_t flags;
{
DB_TXNHEAD *hp;
DB_TXNLIST *elp;
- gint i, ret;
+ int i, ret;
hp = (DB_TXNHEAD *)listp;
@@ -792,16 +792,16 @@ __db_txnlist_lsnadd(dbenv, listp, lsnp, flags)
* __db_txnlist_lsninit --
* Initialize a transaction list with an lsn array entry.
*
- * PUBLIC: gint __db_txnlist_lsninit __P((DB_ENV *, DB_TXNHEAD *, DB_LSN *));
+ * PUBLIC: int __db_txnlist_lsninit __P((DB_ENV *, DB_TXNHEAD *, DB_LSN *));
*/
-gint
+int
__db_txnlist_lsninit(dbenv, hp, lsnp)
DB_ENV *dbenv;
DB_TXNHEAD *hp;
DB_LSN *lsnp;
{
DB_TXNLIST *elp;
- gint ret;
+ int ret;
elp = NULL;
@@ -827,20 +827,20 @@ err: __db_txnlist_end(dbenv, hp);
* __db_add_limbo -- add pages to the limbo list.
* Get the file information and call pgnoadd for each page.
*
- * PUBLIC: gint __db_add_limbo __P((DB_ENV *,
- * PUBLIC: gpointer , int32_t, db_pgno_t, int32_t));
+ * PUBLIC: int __db_add_limbo __P((DB_ENV *,
+ * PUBLIC: void *, int32_t, db_pgno_t, int32_t));
*/
-gint
+int
__db_add_limbo(dbenv, info, fileid, pgno, count)
DB_ENV *dbenv;
- gpointer info;
+ void *info;
int32_t fileid;
db_pgno_t pgno;
int32_t count;
{
DB_LOG *dblp;
FNAME *fnp;
- gint ret;
+ int ret;
dblp = dbenv->lg_handle;
if ((ret = __dbreg_id_to_fname(dblp, fileid, 0, &fnp)) != 0)
@@ -889,17 +889,17 @@ __db_add_limbo(dbenv, info, fileid, pgno, count)
* "create list and write meta-data page" algorithm. Otherwise, we're in
* an abort and doing the "use compensating transaction" algorithm.
*
- * PUBLIC: gint __db_do_the_limbo __P((DB_ENV *,
+ * PUBLIC: int __db_do_the_limbo __P((DB_ENV *,
* PUBLIC: DB_TXN *, DB_TXN *, DB_TXNHEAD *));
*/
-gint
+int
__db_do_the_limbo(dbenv, ptxn, txn, hp)
DB_ENV *dbenv;
DB_TXN *ptxn, *txn;
DB_TXNHEAD *hp;
{
DB_TXNLIST *elp;
- gint h, ret;
+ int h, ret;
ret = 0;
/*
@@ -944,7 +944,7 @@ __db_lock_move(dbenv, fileid, pgno, mode, ptxn, txn)
DB_LOCK lock;
DB_LOCK_ILOCK lock_obj;
DB_LOCKREQ req;
- gint ret;
+ int ret;
lock_obj.pgno = pgno;
memcpy(lock_obj.fileid, fileid, DB_FILE_ID_LEN);
@@ -975,7 +975,7 @@ __db_limbo_move(dbenv, ptxn, txn, elp)
DB_TXN *ptxn, *txn;
DB_TXNLIST *elp;
{
- gint ret;
+ int ret;
for (; elp != NULL; elp = LIST_NEXT(elp, links)) {
if (elp->type != TXNLIST_PGNO || elp->u.p.locked == 1)
@@ -1007,7 +1007,7 @@ __db_limbo_bucket(dbenv, txn, elp)
DBMETA *meta;
DB_TXN *ctxn, *t;
db_pgno_t last_pgno, pgno;
- gint dbp_created, in_retry, ret, t_ret;
+ int dbp_created, in_retry, ret, t_ret;
ctxn = NULL;
in_retry = 0;
@@ -1182,7 +1182,7 @@ __db_limbo_fix(dbp, ctxn, elp, lastp, meta)
DB_MPOOLFILE *mpf;
PAGE *freep, *pagep;
db_pgno_t next, pgno;
- gint i, put_page, ret, t_ret;
+ int i, put_page, ret, t_ret;
/*
* Loop through the entries for this txnlist element and
@@ -1288,12 +1288,12 @@ __db_txnlist_pgnoadd(dbenv, hp, fileid, uid, fname, pgno)
DB_TXNHEAD *hp;
int32_t fileid;
u_int8_t uid[DB_FILE_ID_LEN];
- gchar *fname;
+ char *fname;
db_pgno_t pgno;
{
DB_TXNLIST *elp;
u_int32_t hash;
- gint len, ret;
+ int len, ret;
elp = NULL;
@@ -1345,10 +1345,10 @@ static int
__db_default_getpgnos(dbenv, lsnp, summary)
DB_ENV *dbenv;
DB_LSN *lsnp;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
t = (TXN_RECS *)summary;
@@ -1371,16 +1371,16 @@ __db_default_getpgnos(dbenv, lsnp, summary)
* __db_txnlist_print --
* Print out the transaction list.
*
- * PUBLIC: void __db_txnlist_print __P((gpointer));
+ * PUBLIC: void __db_txnlist_print __P((void *));
*/
void
__db_txnlist_print(listp)
- gpointer listp;
+ void *listp;
{
DB_TXNHEAD *hp;
DB_TXNLIST *p;
- gint i;
- gchar *stats[] = { "ok", "commit", "prepare", "abort", "notfound",
+ int i;
+ char *stats[] = { "ok", "commit", "prepare", "abort", "notfound",
"ignore", "expected", "unexpected" };
hp = (DB_TXNHEAD *)listp;
diff --git a/libdb/db/db_dup.c b/libdb/db/db_dup.c
index aa34fe8..5e12154 100644
--- a/libdb/db/db_dup.c
+++ b/libdb/db/db_dup.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -27,9 +27,9 @@ static const gchar revid[] = "$Id$";
* __db_ditem --
* Remove an item from a page.
*
- * PUBLIC: gint __db_ditem __P((DBC *, PAGE *, u_int32_t, u_int32_t));
+ * PUBLIC: int __db_ditem __P((DBC *, PAGE *, u_int32_t, u_int32_t));
*/
-gint
+int
__db_ditem(dbc, pagep, indx, nbytes)
DBC *dbc;
PAGE *pagep;
@@ -38,7 +38,7 @@ __db_ditem(dbc, pagep, indx, nbytes)
DB *dbp;
DBT ldbt;
db_indx_t cnt, *inp, offset;
- gint ret;
+ int ret;
u_int8_t *from;
dbp = dbc->dbp;
@@ -91,10 +91,10 @@ __db_ditem(dbc, pagep, indx, nbytes)
* __db_pitem --
* Put an item on a page.
*
- * PUBLIC: gint __db_pitem
+ * PUBLIC: int __db_pitem
* PUBLIC: __P((DBC *, PAGE *, u_int32_t, u_int32_t, DBT *, DBT *));
*/
-gint
+int
__db_pitem(dbc, pagep, indx, nbytes, hdr, data)
DBC *dbc;
PAGE *pagep;
@@ -106,7 +106,7 @@ __db_pitem(dbc, pagep, indx, nbytes, hdr, data)
BKEYDATA bk;
DBT thdr;
db_indx_t *inp;
- gint ret;
+ int ret;
u_int8_t *p;
dbp = dbc->dbp;
@@ -169,21 +169,21 @@ __db_pitem(dbc, pagep, indx, nbytes, hdr, data)
* __db_relink --
* Relink around a deleted page.
*
- * PUBLIC: gint __db_relink __P((DBC *, u_int32_t, PAGE *, PAGE **, int));
+ * PUBLIC: int __db_relink __P((DBC *, u_int32_t, PAGE *, PAGE **, int));
*/
-gint
+int
__db_relink(dbc, add_rem, pagep, new_next, needlock)
DBC *dbc;
u_int32_t add_rem;
PAGE *pagep, **new_next;
- gint needlock;
+ int needlock;
{
DB *dbp;
PAGE *np, *pp;
DB_LOCK npl, ppl;
DB_LSN *nlsnp, *plsnp, ret_lsn;
DB_MPOOLFILE *mpf;
- gint ret;
+ int ret;
dbp = dbc->dbp;
np = pp = NULL;
diff --git a/libdb/db/db_iface.c b/libdb/db/db_iface.c
index f86289f..3185e00 100644
--- a/libdb/db/db_iface.c
+++ b/libdb/db/db_iface.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -19,10 +19,10 @@ static const gchar revid[] = "$Id$";
#include "dbinc/db_page.h"
#include "dbinc/db_am.h"
-static gint __db_curinval __P((const DB_ENV *));
-static gint __db_fnl __P((const DB_ENV *, const gchar *));
-static gint __db_rdonly __P((const DB_ENV *, const gchar *));
-static gint __dbt_ferr __P((const DB *, const gchar *, const DBT *, int));
+static int __db_curinval __P((const DB_ENV *));
+static int __db_fnl __P((const DB_ENV *, const char *));
+static int __db_rdonly __P((const DB_ENV *, const char *));
+static int __dbt_ferr __P((const DB *, const char *, const DBT *, int));
/*
* A database should be required to be readonly if it's been explicitly
@@ -38,9 +38,9 @@ static gint __dbt_ferr __P((const DB *, const gchar *, const DBT *, int));
* __db_cursorchk --
* Common cursor argument checking routine.
*
- * PUBLIC: gint __db_cursorchk __P((const DB *, u_int32_t));
+ * PUBLIC: int __db_cursorchk __P((const DB *, u_int32_t));
*/
-gint
+int
__db_cursorchk(dbp, flags)
const DB *dbp;
u_int32_t flags;
@@ -77,13 +77,13 @@ __db_cursorchk(dbp, flags)
* __db_ccountchk --
* Common cursor count argument checking routine.
*
- * PUBLIC: gint __db_ccountchk __P((const DB *, u_int32_t, int));
+ * PUBLIC: int __db_ccountchk __P((const DB *, u_int32_t, int));
*/
-gint
+int
__db_ccountchk(dbp, flags, isvalid)
const DB *dbp;
u_int32_t flags;
- gint isvalid;
+ int isvalid;
{
/* Check for invalid function flags. */
switch (flags) {
@@ -104,13 +104,13 @@ __db_ccountchk(dbp, flags, isvalid)
* __db_cdelchk --
* Common cursor delete argument checking routine.
*
- * PUBLIC: gint __db_cdelchk __P((const DB *, u_int32_t, int));
+ * PUBLIC: int __db_cdelchk __P((const DB *, u_int32_t, int));
*/
-gint
+int
__db_cdelchk(dbp, flags, isvalid)
const DB *dbp;
u_int32_t flags;
- gint isvalid;
+ int isvalid;
{
/* Check for changes to a read-only tree. */
if (IS_READONLY(dbp))
@@ -138,16 +138,16 @@ __db_cdelchk(dbp, flags, isvalid)
* __db_cgetchk --
* Common cursor get argument checking routine.
*
- * PUBLIC: gint __db_cgetchk __P((const DB *, DBT *, DBT *, u_int32_t, int));
+ * PUBLIC: int __db_cgetchk __P((const DB *, DBT *, DBT *, u_int32_t, int));
*/
-gint
+int
__db_cgetchk(dbp, key, data, flags, isvalid)
const DB *dbp;
DBT *key, *data;
u_int32_t flags;
- gint isvalid;
+ int isvalid;
{
- gint dirty, multi, ret;
+ int dirty, multi, ret;
/*
* Check for read-modify-write validity. DB_RMW doesn't make sense
@@ -258,18 +258,18 @@ err: return (__db_ferr(dbp->dbenv, "DBcursor->c_get", 0));
* __db_cputchk --
* Common cursor put argument checking routine.
*
- * PUBLIC: gint __db_cputchk __P((const DB *,
+ * PUBLIC: int __db_cputchk __P((const DB *,
* PUBLIC: const DBT *, DBT *, u_int32_t, int));
*/
-gint
+int
__db_cputchk(dbp, key, data, flags, isvalid)
const DB *dbp;
const DBT *key;
DBT *data;
u_int32_t flags;
- gint isvalid;
+ int isvalid;
{
- gint key_flags, ret;
+ int key_flags, ret;
key_flags = 0;
@@ -351,17 +351,17 @@ err: return (__db_ferr(dbp->dbenv, "DBcursor->c_put", 0));
* __db_pgetchk --
* DB->pget flag check.
*
- * PUBLIC: gint __db_pgetchk __P((const DB *, const DBT *, DBT *, DBT *,
+ * PUBLIC: int __db_pgetchk __P((const DB *, const DBT *, DBT *, DBT *,
* PUBLIC: u_int32_t));
*/
-gint
+int
__db_pgetchk(dbp, skey, pkey, data, flags)
const DB *dbp;
const DBT *skey;
DBT *pkey, *data;
u_int32_t flags;
{
- gint ret;
+ int ret;
u_int32_t save_flags;
save_flags = flags;
@@ -411,17 +411,17 @@ __db_pgetchk(dbp, skey, pkey, data, flags)
* __db_cpgetchk --
* Secondary-index cursor get argument checking routine.
*
- * PUBLIC: gint __db_cpgetchk __P((const DB *,
+ * PUBLIC: int __db_cpgetchk __P((const DB *,
* PUBLIC: DBT *, DBT *, DBT *, u_int32_t, int));
*/
-gint
+int
__db_cpgetchk(dbp, skey, pkey, data, flags, isvalid)
const DB *dbp;
DBT *skey, *pkey, *data;
u_int32_t flags;
- gint isvalid;
+ int isvalid;
{
- gint ret;
+ int ret;
u_int32_t save_flags;
save_flags = flags;
@@ -479,9 +479,9 @@ __db_cpgetchk(dbp, skey, pkey, data, flags, isvalid)
* __db_delchk --
* Common delete argument checking routine.
*
- * PUBLIC: gint __db_delchk __P((const DB *, DBT *, u_int32_t));
+ * PUBLIC: int __db_delchk __P((const DB *, DBT *, u_int32_t));
*/
-gint
+int
__db_delchk(dbp, key, flags)
const DB *dbp;
DBT *key;
@@ -509,16 +509,16 @@ __db_delchk(dbp, key, flags)
* __db_getchk --
* Common get argument checking routine.
*
- * PUBLIC: gint __db_getchk __P((const DB *, const DBT *, DBT *, u_int32_t));
+ * PUBLIC: int __db_getchk __P((const DB *, const DBT *, DBT *, u_int32_t));
*/
-gint
+int
__db_getchk(dbp, key, data, flags)
const DB *dbp;
const DBT *key;
DBT *data;
u_int32_t flags;
{
- gint dirty, multi, ret;
+ int dirty, multi, ret;
/*
* Check for read-modify-write validity. DB_RMW doesn't make sense
@@ -600,16 +600,16 @@ err: return (__db_ferr(dbp->dbenv, "DB->get", 0));
* __db_joinchk --
* Common join argument checking routine.
*
- * PUBLIC: gint __db_joinchk __P((const DB *, DBC * const *, u_int32_t));
+ * PUBLIC: int __db_joinchk __P((const DB *, DBC * const *, u_int32_t));
*/
-gint
+int
__db_joinchk(dbp, curslist, flags)
const DB *dbp;
DBC * const *curslist;
u_int32_t flags;
{
DB_TXN *txn;
- gint i;
+ int i;
switch (flags) {
case 0:
@@ -640,9 +640,9 @@ __db_joinchk(dbp, curslist, flags)
* __db_joingetchk --
* Common join_get argument checking routine.
*
- * PUBLIC: gint __db_joingetchk __P((const DB *, DBT *, u_int32_t));
+ * PUBLIC: int __db_joingetchk __P((const DB *, DBT *, u_int32_t));
*/
-gint
+int
__db_joingetchk(dbp, key, flags)
const DB *dbp;
DBT *key;
@@ -688,18 +688,18 @@ __db_joingetchk(dbp, key, flags)
* __db_putchk --
* Common put argument checking routine.
*
- * PUBLIC: gint __db_putchk
+ * PUBLIC: int __db_putchk
* PUBLIC: __P((const DB *, DBT *, const DBT *, u_int32_t, int));
*/
-gint
+int
__db_putchk(dbp, key, data, flags, isdup)
const DB *dbp;
DBT *key;
const DBT *data;
u_int32_t flags;
- gint isdup;
+ int isdup;
{
- gint ret, returnkey;
+ int ret, returnkey;
returnkey = 0;
@@ -752,9 +752,9 @@ err: return (__db_ferr(dbp->dbenv, "DB->put", 0));
* __db_statchk --
* Common stat argument checking routine.
*
- * PUBLIC: gint __db_statchk __P((const DB *, u_int32_t));
+ * PUBLIC: int __db_statchk __P((const DB *, u_int32_t));
*/
-gint
+int
__db_statchk(dbp, flags)
const DB *dbp;
u_int32_t flags;
@@ -782,9 +782,9 @@ err: return (__db_ferr(dbp->dbenv, "DB->stat", 0));
* __db_syncchk --
* Common sync argument checking routine.
*
- * PUBLIC: gint __db_syncchk __P((const DB *, u_int32_t));
+ * PUBLIC: int __db_syncchk __P((const DB *, u_int32_t));
*/
-gint
+int
__db_syncchk(dbp, flags)
const DB *dbp;
u_int32_t flags;
@@ -807,12 +807,12 @@ __db_syncchk(dbp, flags)
static int
__dbt_ferr(dbp, name, dbt, check_thread)
const DB *dbp;
- const gchar *name;
+ const char *name;
const DBT *dbt;
- gint check_thread;
+ int check_thread;
{
DB_ENV *dbenv;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
@@ -854,7 +854,7 @@ __dbt_ferr(dbp, name, dbt, check_thread)
static int
__db_rdonly(dbenv, name)
const DB_ENV *dbenv;
- const gchar *name;
+ const char *name;
{
__db_err(dbenv, "%s: attempt to modify a read-only tree", name);
return (EACCES);
@@ -867,7 +867,7 @@ __db_rdonly(dbenv, name)
static int
__db_fnl(dbenv, name)
const DB_ENV *dbenv;
- const gchar *name;
+ const char *name;
{
__db_err(dbenv,
"%s: the DB_DIRTY_READ and DB_RMW flags require locking", name);
@@ -892,9 +892,9 @@ __db_curinval(dbenv)
* Report that a secondary index appears corrupt, as it has a record
* that does not correspond to a record in the primary.
*
- * PUBLIC: gint __db_secondary_corrupt __P((DB *));
+ * PUBLIC: int __db_secondary_corrupt __P((DB *));
*/
-gint
+int
__db_secondary_corrupt(dbp)
DB *dbp;
{
@@ -908,13 +908,13 @@ __db_secondary_corrupt(dbp)
* __db_associatechk --
* Argument checking routine for DB->associate().
*
- * PUBLIC: gint __db_associatechk __P((DB *, DB *,
- * PUBLIC: gint (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
+ * PUBLIC: int __db_associatechk __P((DB *, DB *,
+ * PUBLIC: int (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
*/
-gint
+int
__db_associatechk(dbp, sdbp, callback, flags)
DB *dbp, *sdbp;
- gint (*callback) __P((DB *, const DBT *, const DBT *, DBT *));
+ int (*callback) __P((DB *, const DBT *, const DBT *, DBT *));
u_int32_t flags;
{
DB_ENV *dbenv;
@@ -956,9 +956,9 @@ __db_associatechk(dbp, sdbp, callback, flags)
* __db_txn_auto --
* Handle DB_AUTO_COMMIT initialization.
*
- * PUBLIC: gint __db_txn_auto __P((DB *, DB_TXN **));
+ * PUBLIC: int __db_txn_auto __P((DB *, DB_TXN **));
*/
-gint
+int
__db_txn_auto(dbp, txnidp)
DB *dbp;
DB_TXN **txnidp;
diff --git a/libdb/db/db_join.c b/libdb/db/db_join.c
index cb24b1c..c5274e4 100644
--- a/libdb/db/db_join.c
+++ b/libdb/db/db_join.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -23,14 +23,14 @@ static const gchar revid[] = "$Id$";
#include "dbinc/db_join.h"
#include "dbinc/btree.h"
-static gint __db_join_close __P((DBC *));
-static gint __db_join_cmp __P((gconstpointer , gconstpointer ));
-static gint __db_join_del __P((DBC *, u_int32_t));
-static gint __db_join_get __P((DBC *, DBT *, DBT *, u_int32_t));
-static gint __db_join_getnext __P((DBC *, DBT *, DBT *, u_int32_t, u_int32_t));
-static gint __db_join_primget __P((DB *,
+static int __db_join_close __P((DBC *));
+static int __db_join_cmp __P((const void *, const void *));
+static int __db_join_del __P((DBC *, u_int32_t));
+static int __db_join_get __P((DBC *, DBT *, DBT *, u_int32_t));
+static int __db_join_getnext __P((DBC *, DBT *, DBT *, u_int32_t, u_int32_t));
+static int __db_join_primget __P((DB *,
DB_TXN *, u_int32_t, DBT *, DBT *, u_int32_t));
-static gint __db_join_put __P((DBC *, DBT *, DBT *, u_int32_t));
+static int __db_join_put __P((DBC *, DBT *, DBT *, u_int32_t));
/*
* Check to see if the Nth secondary cursor of join cursor jc is pointing
@@ -73,9 +73,9 @@ static gint __db_join_put __P((DBC *, DBT *, DBT *, u_int32_t));
* key and data are returned. When no more items are left in the join
* set, the c_next operation off the join cursor will return DB_NOTFOUND.
*
- * PUBLIC: gint __db_join __P((DB *, DBC **, DBC **, u_int32_t));
+ * PUBLIC: int __db_join __P((DB *, DBC **, DBC **, u_int32_t));
*/
-gint
+int
__db_join(primary, curslist, dbcp, flags)
DB *primary;
DBC **curslist, **dbcp;
@@ -84,7 +84,7 @@ __db_join(primary, curslist, dbcp, flags)
DB_ENV *dbenv;
DBC *dbc;
JOIN_CURSOR *jc;
- gint ret;
+ int ret;
u_int32_t i;
size_t ncurs, nslots;
@@ -283,7 +283,7 @@ __db_join_get(dbc, key_arg, data_arg, flags)
DB *dbp;
DBC *cp;
JOIN_CURSOR *jc;
- gint db_manage_data, ret;
+ int db_manage_data, ret;
u_int32_t i, j, operation, opmods;
dbp = dbc->dbp;
@@ -622,7 +622,7 @@ __db_join_close(dbc)
DB *dbp;
DB_ENV *dbenv;
JOIN_CURSOR *jc;
- gint ret, t_ret;
+ int ret, t_ret;
u_int32_t i;
jc = (JOIN_CURSOR *)dbc->internal;
@@ -695,10 +695,10 @@ __db_join_getnext(dbc, key, data, exhausted, opmods)
DBT *key, *data;
u_int32_t exhausted, opmods;
{
- gint ret, cmp;
+ int ret, cmp;
DB *dbp;
DBT ldata;
- gint (*func) __P((DB *, const DBT *, const DBT *));
+ int (*func) __P((DB *, const DBT *, const DBT *));
dbp = dbc->dbp;
func = (dbp->dup_compare == NULL) ? __bam_defcmp : dbp->dup_compare;
@@ -752,7 +752,7 @@ __db_join_getnext(dbc, key, data, exhausted, opmods)
*/
static int
__db_join_cmp(a, b)
- gconstpointer a, *b;
+ const void *a, *b;
{
DBC *dbca, *dbcb;
db_recno_t counta, countb;
@@ -784,7 +784,7 @@ __db_join_primget(dbp, txn, lockerid, key, data, flags)
u_int32_t flags;
{
DBC *dbc;
- gint dirty, ret, rmw, t_ret;
+ int dirty, ret, rmw, t_ret;
/*
* The only allowable flags here are the two flags copied into
diff --git a/libdb/db/db_meta.c b/libdb/db/db_meta.c
index c463019..9c895ce 100644
--- a/libdb/db/db_meta.c
+++ b/libdb/db/db_meta.c
@@ -43,7 +43,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -58,7 +58,7 @@ static const gchar revid[] = "$Id$";
#include "dbinc/lock.h"
#include "dbinc/db_am.h"
-static void __db_init_meta __P((gpointer , u_int32_t, db_pgno_t, u_int32_t));
+static void __db_init_meta __P((void *, u_int32_t, db_pgno_t, u_int32_t));
/*
* __db_init_meta --
@@ -68,7 +68,7 @@ static void __db_init_meta __P((gpointer , u_int32_t, db_pgno_t, u_int32_t));
*/
static void
__db_init_meta(p, pgsize, pgno, pgtype)
- gpointer p;
+ void *p;
u_int32_t pgsize;
db_pgno_t pgno;
u_int32_t pgtype;
@@ -89,9 +89,9 @@ __db_init_meta(p, pgsize, pgno, pgtype)
* __db_new --
* Get a new page, preferably from the freelist.
*
- * PUBLIC: gint __db_new __P((DBC *, u_int32_t, PAGE **));
+ * PUBLIC: int __db_new __P((DBC *, u_int32_t, PAGE **));
*/
-gint
+int
__db_new(dbc, type, pagepp)
DBC *dbc;
u_int32_t type;
@@ -104,7 +104,7 @@ __db_new(dbc, type, pagepp)
DB_MPOOLFILE *mpf;
PAGE *h;
db_pgno_t pgno, newnext;
- gint meta_flags, extend, ret;
+ int meta_flags, extend, ret;
meta = NULL;
meta_flags = 0;
@@ -212,9 +212,9 @@ err: if (h != NULL)
* __db_free --
* Add a page to the head of the freelist.
*
- * PUBLIC: gint __db_free __P((DBC *, PAGE *));
+ * PUBLIC: int __db_free __P((DBC *, PAGE *));
*/
-gint
+int
__db_free(dbc, h)
DBC *dbc;
PAGE *h;
@@ -226,7 +226,7 @@ __db_free(dbc, h)
DB_MPOOLFILE *mpf;
db_pgno_t pgno;
u_int32_t dirty_flag;
- gint ret, t_ret;
+ int ret, t_ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -292,9 +292,9 @@ err: if ((t_ret = mpf->put(mpf, h, dirty_flag)) != 0 && ret == 0)
* __db_lprint --
* Print out the list of locks currently held by a cursor.
*
- * PUBLIC: gint __db_lprint __P((DBC *));
+ * PUBLIC: int __db_lprint __P((DBC *));
*/
-gint
+int
__db_lprint(dbc)
DBC *dbc;
{
@@ -330,13 +330,13 @@ __db_lprint(dbc)
* __db_lget --
* The standard lock get call.
*
- * PUBLIC: gint __db_lget __P((DBC *,
+ * PUBLIC: int __db_lget __P((DBC *,
* PUBLIC: int, db_pgno_t, db_lockmode_t, u_int32_t, DB_LOCK *));
*/
-gint
+int
__db_lget(dbc, action, pgno, mode, lkflags, lockp)
DBC *dbc;
- gint action;
+ int action;
db_pgno_t pgno;
db_lockmode_t mode;
u_int32_t lkflags;
@@ -346,7 +346,7 @@ __db_lget(dbc, action, pgno, mode, lkflags, lockp)
DB_ENV *dbenv;
DB_LOCKREQ couple[2], *reqp;
DB_TXN *txn;
- gint has_timeout, ret;
+ int has_timeout, ret;
dbp = dbc->dbp;
dbenv = dbp->dbenv;
@@ -424,15 +424,15 @@ lck_couple: couple[0].op = has_timeout? DB_LOCK_GET_TIMEOUT : DB_LOCK_GET;
* __db_lput --
* The standard lock put call.
*
- * PUBLIC: gint __db_lput __P((DBC *, DB_LOCK *));
+ * PUBLIC: int __db_lput __P((DBC *, DB_LOCK *));
*/
-gint
+int
__db_lput(dbc, lockp)
DBC *dbc;
DB_LOCK *lockp;
{
DB_ENV *dbenv;
- gint ret;
+ int ret;
dbenv = dbc->dbp->dbenv;
diff --git a/libdb/db/db_method.c b/libdb/db/db_method.c
index 5cba21e..2cd9003 100644
--- a/libdb/db/db_method.c
+++ b/libdb/db/db_method.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -38,48 +38,48 @@ static const gchar revid[] = "$Id$";
#include "dbinc_auto/rpc_client_ext.h"
#endif
-static gint __db_get_byteswapped __P((DB *, gint *));
-static gint __db_get_type __P((DB *, DBTYPE *dbtype));
-static gint __db_init __P((DB *, u_int32_t));
-static gint __db_key_range
+static int __db_get_byteswapped __P((DB *, int *));
+static int __db_get_type __P((DB *, DBTYPE *dbtype));
+static int __db_init __P((DB *, u_int32_t));
+static int __db_key_range
__P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t));
-static gint __db_set_alloc __P((DB *, gpointer (*)(size_t),
- gpointer (*)(gpointer , size_t), void (*)(gpointer)));
-static gint __db_set_append_recno __P((DB *, gint (*)(DB *, DBT *, db_recno_t)));
-static gint __db_set_cachesize __P((DB *, u_int32_t, u_int32_t, int));
-static gint __db_set_cache_priority __P((DB *, DB_CACHE_PRIORITY));
-static gint __db_set_dup_compare
- __P((DB *, gint (*)(DB *, const DBT *, const DBT *)));
-static gint __db_set_encrypt __P((DB *, const gchar *, u_int32_t));
-static gint __db_set_feedback __P((DB *, void (*)(DB *, int, int)));
-static gint __db_set_flags __P((DB *, u_int32_t));
-static gint __db_set_pagesize __P((DB *, u_int32_t));
-static gint __db_set_paniccall __P((DB *, void (*)(DB_ENV *, int)));
-static void __db_set_errcall __P((DB *, void (*)(const gchar *, gchar *)));
+static int __db_set_alloc __P((DB *, void *(*)(size_t),
+ void *(*)(void *, size_t), void (*)(void *)));
+static int __db_set_append_recno __P((DB *, int (*)(DB *, DBT *, db_recno_t)));
+static int __db_set_cachesize __P((DB *, u_int32_t, u_int32_t, int));
+static int __db_set_cache_priority __P((DB *, DB_CACHE_PRIORITY));
+static int __db_set_dup_compare
+ __P((DB *, int (*)(DB *, const DBT *, const DBT *)));
+static int __db_set_encrypt __P((DB *, const char *, u_int32_t));
+static int __db_set_feedback __P((DB *, void (*)(DB *, int, int)));
+static int __db_set_flags __P((DB *, u_int32_t));
+static int __db_set_pagesize __P((DB *, u_int32_t));
+static int __db_set_paniccall __P((DB *, void (*)(DB_ENV *, int)));
+static void __db_set_errcall __P((DB *, void (*)(const char *, char *)));
static void __db_set_errfile __P((DB *, FILE *));
-static void __db_set_errpfx __P((DB *, const gchar *));
-static gint __db_stat_fail __P((DB *, gpointer , u_int32_t));
-static void __dbh_err __P((DB *, int, const gchar *, ...));
-static void __dbh_errx __P((DB *, const gchar *, ...));
+static void __db_set_errpfx __P((DB *, const char *));
+static int __db_stat_fail __P((DB *, void *, u_int32_t));
+static void __dbh_err __P((DB *, int, const char *, ...));
+static void __dbh_errx __P((DB *, const char *, ...));
#ifdef HAVE_RPC
-static gint __dbcl_init __P((DB *, DB_ENV *, u_int32_t));
+static int __dbcl_init __P((DB *, DB_ENV *, u_int32_t));
#endif
/*
* db_create --
* DB constructor.
*
- * EXTERN: gint db_create __P((DB **, DB_ENV *, u_int32_t));
+ * EXTERN: int db_create __P((DB **, DB_ENV *, u_int32_t));
*/
-gint
+int
db_create(dbpp, dbenv, flags)
DB **dbpp;
DB_ENV *dbenv;
u_int32_t flags;
{
DB *dbp;
- gint ret;
+ int ret;
/* Check for invalid function flags. */
switch (flags) {
@@ -143,7 +143,7 @@ __db_init(dbp, flags)
DB *dbp;
u_int32_t flags;
{
- gint ret;
+ int ret;
dbp->lid = DB_LOCK_INVALIDID;
LOCK_INIT(dbp->handle_lock);
@@ -215,9 +215,9 @@ __db_init(dbp, flags)
* __dbh_am_chk --
* Error if an unreasonable method is called.
*
- * PUBLIC: gint __dbh_am_chk __P((DB *, u_int32_t));
+ * PUBLIC: int __dbh_am_chk __P((DB *, u_int32_t));
*/
-gint
+int
__dbh_am_chk(dbp, flags)
DB *dbp;
u_int32_t flags;
@@ -246,12 +246,12 @@ __dbh_am_chk(dbp, flags)
*/
static void
#ifdef __STDC__
-__dbh_err(DB *dbp, gint error, const gchar *fmt, ...)
+__dbh_err(DB *dbp, int error, const char *fmt, ...)
#else
__dbh_err(dbp, error, fmt, va_alist)
DB *dbp;
- gint error;
- const gchar *fmt;
+ int error;
+ const char *fmt;
va_dcl
#endif
{
@@ -264,11 +264,11 @@ __dbh_err(dbp, error, fmt, va_alist)
*/
static void
#ifdef __STDC__
-__dbh_errx(DB *dbp, const gchar *fmt, ...)
+__dbh_errx(DB *dbp, const char *fmt, ...)
#else
__dbh_errx(dbp, fmt, va_alist)
DB *dbp;
- const gchar *fmt;
+ const char *fmt;
va_dcl
#endif
{
@@ -282,7 +282,7 @@ __dbh_errx(dbp, fmt, va_alist)
static int
__db_get_byteswapped(dbp, isswapped)
DB *dbp;
- gint *isswapped;
+ int *isswapped;
{
DB_ILLEGAL_BEFORE_OPEN(dbp, "get_byteswapped");
@@ -335,7 +335,7 @@ __db_key_range(dbp, txn, key, kr, flags)
static int
__db_set_append_recno(dbp, func)
DB *dbp;
- gint (*func) __P((DB *, DBT *, db_recno_t));
+ int (*func) __P((DB *, DBT *, db_recno_t));
{
DB_ILLEGAL_AFTER_OPEN(dbp, "set_append_recno");
DB_ILLEGAL_METHOD(dbp, DB_OK_QUEUE | DB_OK_RECNO);
@@ -353,7 +353,7 @@ static int
__db_set_cachesize(dbp, cache_gbytes, cache_bytes, ncache)
DB *dbp;
u_int32_t cache_gbytes, cache_bytes;
- gint ncache;
+ int ncache;
{
DB_ILLEGAL_IN_ENV(dbp, "set_cachesize");
DB_ILLEGAL_AFTER_OPEN(dbp, "set_cachesize");
@@ -389,9 +389,9 @@ __db_set_cache_priority(dbp, priority)
static int
__db_set_dup_compare(dbp, func)
DB *dbp;
- gint (*func) __P((DB *, const DBT *, const DBT *));
+ int (*func) __P((DB *, const DBT *, const DBT *));
{
- gint ret;
+ int ret;
DB_ILLEGAL_AFTER_OPEN(dbp, "dup_compare");
DB_ILLEGAL_METHOD(dbp, DB_OK_BTREE | DB_OK_HASH);
@@ -411,11 +411,11 @@ __db_set_dup_compare(dbp, func)
static int
__db_set_encrypt(dbp, passwd, flags)
DB *dbp;
- const gchar *passwd;
+ const char *passwd;
u_int32_t flags;
{
DB_CIPHER *db_cipher;
- gint ret;
+ int ret;
DB_ILLEGAL_IN_ENV(dbp, "set_encrypt");
DB_ILLEGAL_AFTER_OPEN(dbp, "set_encrypt");
@@ -438,7 +438,7 @@ __db_set_encrypt(dbp, passwd, flags)
static void
__db_set_errcall(dbp, errcall)
DB *dbp;
- void (*errcall) __P((const gchar *, gchar *));
+ void (*errcall) __P((const char *, char *));
{
dbp->dbenv->set_errcall(dbp->dbenv, errcall);
}
@@ -454,7 +454,7 @@ __db_set_errfile(dbp, errfile)
static void
__db_set_errpfx(dbp, errpfx)
DB *dbp;
- const gchar *errpfx;
+ const char *errpfx;
{
dbp->dbenv->set_errpfx(dbp->dbenv, errpfx);
}
@@ -473,7 +473,7 @@ __db_set_flags(dbp, flags)
DB *dbp;
u_int32_t flags;
{
- gint ret;
+ int ret;
/*
* !!!
@@ -510,14 +510,14 @@ __db_set_flags(dbp, flags)
* __db_set_lorder --
* Set whether lorder is swapped or not.
*
- * PUBLIC: gint __db_set_lorder __P((DB *, int));
+ * PUBLIC: int __db_set_lorder __P((DB *, int));
*/
-gint
+int
__db_set_lorder(dbp, db_lorder)
DB *dbp;
- gint db_lorder;
+ int db_lorder;
{
- gint ret;
+ int ret;
DB_ILLEGAL_AFTER_OPEN(dbp, "set_lorder");
@@ -539,9 +539,9 @@ __db_set_lorder(dbp, db_lorder)
static int
__db_set_alloc(dbp, mal_func, real_func, free_func)
DB *dbp;
- gpointer (*mal_func) __P((size_t));
- gpointer (*real_func) __P((gpointer , size_t));
- void (*free_func) __P((gpointer));
+ void *(*mal_func) __P((size_t));
+ void *(*real_func) __P((void *, size_t));
+ void (*free_func) __P((void *));
{
DB_ILLEGAL_IN_ENV(dbp, "set_alloc");
DB_ILLEGAL_AFTER_OPEN(dbp, "set_alloc");
@@ -598,7 +598,7 @@ __db_set_paniccall(dbp, paniccall)
static int
__db_stat_fail(dbp, sp, flags)
DB *dbp;
- gpointer sp;
+ void *sp;
u_int32_t flags;
{
COMPQUIET(sp, NULL);
diff --git a/libdb/db/db_open.c b/libdb/db/db_open.c
index 1ad083c..cf3509f 100644
--- a/libdb/db/db_open.c
+++ b/libdb/db/db_open.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -33,27 +33,27 @@ static const gchar revid[] = "$Id$";
#include "dbinc/qam.h"
#include "dbinc/txn.h"
-static gint __db_openchk __P((DB *,
- DB_TXN *, const gchar *, const gchar *, DBTYPE, u_int32_t));
+static int __db_openchk __P((DB *,
+ DB_TXN *, const char *, const char *, DBTYPE, u_int32_t));
/*
* __db_open --
* Main library interface to the DB access methods.
*
- * PUBLIC: gint __db_open __P((DB *, DB_TXN *,
- * PUBLIC: const gchar *, const gchar *, DBTYPE, u_int32_t, int));
+ * PUBLIC: int __db_open __P((DB *, DB_TXN *,
+ * PUBLIC: const char *, const char *, DBTYPE, u_int32_t, int));
*/
-gint
+int
__db_open(dbp, txn, name, subdb, type, flags, mode)
DB *dbp;
DB_TXN *txn;
- const gchar *name, *subdb;
+ const char *name, *subdb;
DBTYPE type;
u_int32_t flags;
- gint mode;
+ int mode;
{
DB_ENV *dbenv;
- gint remove_master, remove_me, ret, t_ret, txn_local;
+ int remove_master, remove_me, ret, t_ret, txn_local;
dbenv = dbp->dbenv;
remove_me = remove_master = txn_local = 0;
@@ -178,20 +178,20 @@ err: /* If we were successful, don't discard the file on close. */
* name will be non-NULL, subname mqy be NULL and meta-pgno will be
* a valid pgno (i.e., not PGNO_BASE_MD).
*
- * PUBLIC: gint __db_dbopen __P((DB *, DB_TXN *,
- * PUBLIC: const gchar *, const gchar *, u_int32_t, int, db_pgno_t));
+ * PUBLIC: int __db_dbopen __P((DB *, DB_TXN *,
+ * PUBLIC: const char *, const char *, u_int32_t, int, db_pgno_t));
*/
-gint
+int
__db_dbopen(dbp, txn, name, subdb, flags, mode, meta_pgno)
DB *dbp;
DB_TXN *txn;
- const gchar *name, *subdb;
+ const char *name, *subdb;
u_int32_t flags;
- gint mode;
+ int mode;
db_pgno_t meta_pgno;
{
DB_ENV *dbenv;
- gint ret;
+ int ret;
u_int32_t id;
dbenv = dbp->dbenv;
@@ -331,16 +331,16 @@ err:
* __db_new_file --
* Create a new database file.
*
- * PUBLIC: gint __db_new_file __P((DB *, DB_TXN *, DB_FH *, const gchar *));
+ * PUBLIC: int __db_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
*/
-gint
+int
__db_new_file(dbp, txn, fhp, name)
DB *dbp;
DB_TXN *txn;
DB_FH *fhp;
- const gchar *name;
+ const char *name;
{
- gint ret;
+ int ret;
switch (dbp->type) {
case DB_BTREE:
@@ -375,17 +375,17 @@ DB_TEST_RECOVERY_LABEL
* __db_init_subdb --
* Initialize the dbp for a subdb.
*
- * PUBLIC: gint __db_init_subdb __P((DB *, DB *, const gchar *, DB_TXN *));
+ * PUBLIC: int __db_init_subdb __P((DB *, DB *, const char *, DB_TXN *));
*/
-gint
+int
__db_init_subdb(mdbp, dbp, name, txn)
DB *mdbp, *dbp;
- const gchar *name;
+ const char *name;
DB_TXN *txn;
{
DBMETA *meta;
DB_MPOOLFILE *mpf;
- gint ret, t_ret;
+ int ret, t_ret;
ret = 0;
if (!F_ISSET(dbp, DB_AM_CREATED)) {
@@ -433,16 +433,16 @@ err: return (ret);
*
* Return 0 on success, >0 (errno) on error, -1 on checksum mismatch.
*
- * PUBLIC: gint __db_chk_meta __P((DB_ENV *, DB *, DBMETA *, int));
+ * PUBLIC: int __db_chk_meta __P((DB_ENV *, DB *, DBMETA *, int));
*/
-gint
+int
__db_chk_meta(dbenv, dbp, meta, do_metachk)
DB_ENV *dbenv;
DB *dbp;
DBMETA *meta;
- gint do_metachk;
+ int do_metachk;
{
- gint is_hmac, ret;
+ int is_hmac, ret;
u_int8_t *chksum;
ret = 0;
@@ -471,20 +471,20 @@ __db_chk_meta(dbenv, dbp, meta, do_metachk)
* Take a buffer containing a meta-data page and figure out if it's
* valid, and if so, initialize the dbp from the meta-data page.
*
- * PUBLIC: gint __db_meta_setup __P((DB_ENV *,
- * PUBLIC: DB *, const gchar *, DBMETA *, u_int32_t, int));
+ * PUBLIC: int __db_meta_setup __P((DB_ENV *,
+ * PUBLIC: DB *, const char *, DBMETA *, u_int32_t, int));
*/
-gint
+int
__db_meta_setup(dbenv, dbp, name, meta, oflags, do_metachk)
DB_ENV *dbenv;
DB *dbp;
- const gchar *name;
+ const char *name;
DBMETA *meta;
u_int32_t oflags;
- gint do_metachk;
+ int do_metachk;
{
u_int32_t flags, magic;
- gint ret;
+ int ret;
ret = 0;
@@ -586,12 +586,12 @@ static int
__db_openchk(dbp, txn, name, subdb, type, flags)
DB *dbp;
DB_TXN *txn;
- const gchar *name, *subdb;
+ const char *name, *subdb;
DBTYPE type;
u_int32_t flags;
{
DB_ENV *dbenv;
- gint ret;
+ int ret;
u_int32_t ok_flags;
dbenv = dbp->dbenv;
diff --git a/libdb/db/db_overflow.c b/libdb/db/db_overflow.c
index d4c8bc5..36b959a 100644
--- a/libdb/db/db_overflow.c
+++ b/libdb/db/db_overflow.c
@@ -43,7 +43,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -70,16 +70,16 @@ static const gchar revid[] = "$Id$";
* __db_goff --
* Get an offpage item.
*
- * PUBLIC: gint __db_goff __P((DB *, DBT *,
- * PUBLIC: u_int32_t, db_pgno_t, gpointer *, u_int32_t *));
+ * PUBLIC: int __db_goff __P((DB *, DBT *,
+ * PUBLIC: u_int32_t, db_pgno_t, void **, u_int32_t *));
*/
-gint
+int
__db_goff(dbp, dbt, tlen, pgno, bpp, bpsz)
DB *dbp;
DBT *dbt;
u_int32_t tlen;
db_pgno_t pgno;
- gpointer *bpp;
+ void **bpp;
u_int32_t *bpsz;
{
DB_ENV *dbenv;
@@ -88,7 +88,7 @@ __db_goff(dbp, dbt, tlen, pgno, bpp, bpsz)
db_indx_t bytes;
u_int32_t curoff, needed, start;
u_int8_t *p, *src;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
mpf = dbp->mpf;
@@ -166,9 +166,9 @@ __db_goff(dbp, dbt, tlen, pgno, bpp, bpsz)
* __db_poff --
* Put an offpage item.
*
- * PUBLIC: gint __db_poff __P((DBC *, const DBT *, db_pgno_t *));
+ * PUBLIC: int __db_poff __P((DBC *, const DBT *, db_pgno_t *));
*/
-gint
+int
__db_poff(dbc, dbt, pgnop)
DBC *dbc;
const DBT *dbt;
@@ -182,7 +182,7 @@ __db_poff(dbc, dbt, pgnop)
db_indx_t pagespace;
u_int32_t sz;
u_int8_t *p;
- gint ret, t_ret;
+ int ret, t_ret;
/*
* Allocate pages and copy the key/data item into them. Calculate the
@@ -265,9 +265,9 @@ __db_poff(dbc, dbt, pgnop)
* __db_ovref --
* Increment/decrement the reference count on an overflow page.
*
- * PUBLIC: gint __db_ovref __P((DBC *, db_pgno_t, int32_t));
+ * PUBLIC: int __db_ovref __P((DBC *, db_pgno_t, int32_t));
*/
-gint
+int
__db_ovref(dbc, pgno, adjust)
DBC *dbc;
db_pgno_t pgno;
@@ -276,7 +276,7 @@ __db_ovref(dbc, pgno, adjust)
DB *dbp;
DB_MPOOLFILE *mpf;
PAGE *h;
- gint ret;
+ int ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -304,9 +304,9 @@ __db_ovref(dbc, pgno, adjust)
* __db_doff --
* Delete an offpage chain of overflow pages.
*
- * PUBLIC: gint __db_doff __P((DBC *, db_pgno_t));
+ * PUBLIC: int __db_doff __P((DBC *, db_pgno_t));
*/
-gint
+int
__db_doff(dbc, pgno)
DBC *dbc;
db_pgno_t pgno;
@@ -316,7 +316,7 @@ __db_doff(dbc, pgno)
DB_LSN null_lsn;
DB_MPOOLFILE *mpf;
DBT tmp_dbt;
- gint ret;
+ int ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -369,24 +369,24 @@ __db_doff(dbc, pgno)
* specified a comparison function. In this case, we need to materialize
* the entire object and call their comparison routine.
*
- * PUBLIC: gint __db_moff __P((DB *, const DBT *, db_pgno_t, u_int32_t,
- * PUBLIC: gint (*)(DB *, const DBT *, const DBT *), gint *));
+ * PUBLIC: int __db_moff __P((DB *, const DBT *, db_pgno_t, u_int32_t,
+ * PUBLIC: int (*)(DB *, const DBT *, const DBT *), int *));
*/
-gint
+int
__db_moff(dbp, dbt, pgno, tlen, cmpfunc, cmpp)
DB *dbp;
const DBT *dbt;
db_pgno_t pgno;
u_int32_t tlen;
- gint (*cmpfunc) __P((DB *, const DBT *, const DBT *)), *cmpp;
+ int (*cmpfunc) __P((DB *, const DBT *, const DBT *)), *cmpp;
{
DBT local_dbt;
DB_MPOOLFILE *mpf;
PAGE *pagep;
- gpointer buf;
+ void *buf;
u_int32_t bufsize, cmp_bytes, key_left;
u_int8_t *p1, *p2;
- gint ret;
+ int ret;
mpf = dbp->mpf;
@@ -443,10 +443,10 @@ __db_moff(dbp, dbt, pgno, tlen, cmpfunc, cmpp)
* __db_vrfy_overflow --
* Verify overflow page.
*
- * PUBLIC: gint __db_vrfy_overflow __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t,
+ * PUBLIC: int __db_vrfy_overflow __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t,
* PUBLIC: u_int32_t));
*/
-gint
+int
__db_vrfy_overflow(dbp, vdp, h, pgno, flags)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -455,7 +455,7 @@ __db_vrfy_overflow(dbp, vdp, h, pgno, flags)
u_int32_t flags;
{
VRFY_PAGEINFO *pip;
- gint isbad, ret, t_ret;
+ int isbad, ret, t_ret;
isbad = 0;
if ((ret = __db_vrfy_getpageinfo(vdp, pgno, &pip)) != 0)
@@ -489,10 +489,10 @@ err: if ((t_ret = __db_vrfy_putpageinfo(dbp->dbenv, vdp, pip)) != 0)
* Walk a list of overflow pages, avoiding cycles and marking
* pages seen.
*
- * PUBLIC: gint __db_vrfy_ovfl_structure
+ * PUBLIC: int __db_vrfy_ovfl_structure
* PUBLIC: __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t, u_int32_t));
*/
-gint
+int
__db_vrfy_ovfl_structure(dbp, vdp, pgno, tlen, flags)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -503,7 +503,7 @@ __db_vrfy_ovfl_structure(dbp, vdp, pgno, tlen, flags)
DB *pgset;
VRFY_PAGEINFO *pip;
db_pgno_t next, prev;
- gint isbad, p, ret, t_ret;
+ int isbad, p, ret, t_ret;
u_int32_t refcount;
pgset = vdp->pgset;
@@ -644,21 +644,21 @@ err: if ((t_ret =
* Get an overflow item, very carefully, from an untrusted database,
* in the context of the salvager.
*
- * PUBLIC: gint __db_safe_goff __P((DB *, VRFY_DBINFO *, db_pgno_t,
- * PUBLIC: DBT *, gpointer *, u_int32_t));
+ * PUBLIC: int __db_safe_goff __P((DB *, VRFY_DBINFO *, db_pgno_t,
+ * PUBLIC: DBT *, void **, u_int32_t));
*/
-gint
+int
__db_safe_goff(dbp, vdp, pgno, dbt, buf, flags)
DB *dbp;
VRFY_DBINFO *vdp;
db_pgno_t pgno;
DBT *dbt;
- gpointer *buf;
+ void **buf;
u_int32_t flags;
{
DB_MPOOLFILE *mpf;
PAGE *h;
- gint ret, t_ret;
+ int ret, t_ret;
u_int32_t bytesgot, bytes;
u_int8_t *src, *dest;
diff --git a/libdb/db/db_pr.c b/libdb/db/db_pr.c
index 4d1a275..4e91dc1 100644
--- a/libdb/db/db_pr.c
+++ b/libdb/db/db_pr.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -32,9 +32,9 @@ static const gchar revid[] = "$Id$";
static int __db_bmeta __P((DB *, FILE *, BTMETA *, u_int32_t));
static int __db_hmeta __P((DB *, FILE *, HMETA *, u_int32_t));
static void __db_meta __P((DB *, DBMETA *, FILE *, FN const *, u_int32_t));
-static const gchar *__db_pagetype_to_string __P((u_int32_t));
+static const char *__db_pagetype_to_string __P((u_int32_t));
static void __db_prdb __P((DB *, FILE *));
-static void __db_proff __P((gpointer , FILE *));
+static void __db_proff __P((void *, FILE *));
static int __db_prtree __P((DB *, FILE *, u_int32_t));
static int __db_qmeta __P((DB *, FILE *, QMETA *, u_int32_t));
@@ -56,16 +56,16 @@ __db_loadme()
* __db_dump --
* Dump the tree to a file.
*
- * PUBLIC: gint __db_dump __P((DB *, gchar *, gchar *));
+ * PUBLIC: int __db_dump __P((DB *, char *, char *));
*/
-gint
+int
__db_dump(dbp, op, name)
DB *dbp;
- gchar *op, *name;
+ char *op, *name;
{
FILE *fp;
u_int32_t flags;
- gint ret;
+ int ret;
for (flags = 0; *op != '\0'; ++op)
switch (*op) {
@@ -106,14 +106,14 @@ __db_dump(dbp, op, name)
* Call a callback for printing or other handling of strings associated
* with whatever in-memory DB structure flags are set.
*
- * PUBLIC: void __db_inmemdbflags __P((u_int32_t, gpointer ,
- * PUBLIC: void (*)(u_int32_t, const FN *, gpointer )));
+ * PUBLIC: void __db_inmemdbflags __P((u_int32_t, void *,
+ * PUBLIC: void (*)(u_int32_t, const FN *, void *)));
*/
void
__db_inmemdbflags(flags, cookie, callback)
u_int32_t flags;
- gpointer cookie;
- void (*callback) __P((u_int32_t, const FN *, gpointer ));
+ void *cookie;
+ void (*callback) __P((u_int32_t, const FN *, void *));
{
static const FN fn[] = {
{ DB_AM_CHKSUM, "checksumming" },
@@ -225,7 +225,7 @@ __db_prtree(dbp, fp, flags)
DB_MPOOLFILE *mpf;
PAGE *h;
db_pgno_t i, last;
- gint ret;
+ int ret;
mpf = dbp->mpf;
@@ -264,8 +264,8 @@ __db_meta(dbp, dbmeta, fp, fn, flags)
PAGE *h;
db_pgno_t pgno;
u_int8_t *p;
- gint cnt, ret;
- const gchar *sep;
+ int cnt, ret;
+ const char *sep;
mpf = dbp->mpf;
@@ -370,7 +370,7 @@ __db_hmeta(dbp, fp, h, flags)
{ DB_HASH_SUBDB, "multiple-databases" },
{ 0, NULL }
};
- gint i;
+ int i;
__db_meta(dbp, (DBMETA *)h, fp, mfn, flags);
@@ -415,9 +415,9 @@ __db_qmeta(dbp, fp, h, flags)
* __db_prnpage
* -- Print out a specific page.
*
- * PUBLIC: gint __db_prnpage __P((DB *, db_pgno_t, FILE *));
+ * PUBLIC: int __db_prnpage __P((DB *, db_pgno_t, FILE *));
*/
-gint
+int
__db_prnpage(dbp, pgno, fp)
DB *dbp;
db_pgno_t pgno;
@@ -425,7 +425,7 @@ __db_prnpage(dbp, pgno, fp)
{
DB_MPOOLFILE *mpf;
PAGE *h;
- gint ret, t_ret;
+ int ret, t_ret;
mpf = dbp->mpf;
@@ -444,9 +444,9 @@ __db_prnpage(dbp, pgno, fp)
* __db_prpage
* -- Print out a page.
*
- * PUBLIC: gint __db_prpage __P((DB *, PAGE *, FILE *, u_int32_t));
+ * PUBLIC: int __db_prpage __P((DB *, PAGE *, FILE *, u_int32_t));
*/
-gint
+int
__db_prpage(dbp, h, fp, flags)
DB *dbp;
PAGE *h;
@@ -463,9 +463,9 @@ __db_prpage(dbp, h, fp, flags)
db_recno_t recno;
u_int32_t pagesize, qlen;
u_int8_t *ep, *hk, *p;
- gint deleted, ret;
- const gchar *s;
- gpointer sp;
+ int deleted, ret;
+ const char *s;
+ void *sp;
/*
* If we're doing recovery testing and this page is P_INVALID,
@@ -701,7 +701,7 @@ __db_pr(p, len, fp)
FILE *fp;
{
u_int lastch;
- gint i;
+ int i;
fprintf(fp, "len: %3lu", (u_long)len);
lastch = '.';
@@ -727,25 +727,25 @@ __db_pr(p, len, fp)
* __db_prdbt --
* Print out a DBT data element.
*
- * PUBLIC: gint __db_prdbt __P((DBT *, int, const gchar *, gpointer ,
- * PUBLIC: gint (*)(gpointer , gconstpointer ), int, VRFY_DBINFO *));
+ * PUBLIC: int __db_prdbt __P((DBT *, int, const char *, void *,
+ * PUBLIC: int (*)(void *, const void *), int, VRFY_DBINFO *));
*/
-gint
+int
__db_prdbt(dbtp, checkprint, prefix, handle, callback, is_recno, vdp)
DBT *dbtp;
- gint checkprint;
- const gchar *prefix;
- gpointer handle;
- gint (*callback) __P((gpointer , gconstpointer ));
- gint is_recno;
+ int checkprint;
+ const char *prefix;
+ void *handle;
+ int (*callback) __P((void *, const void *));
+ int is_recno;
VRFY_DBINFO *vdp;
{
- static const gchar hex[] = "0123456789abcdef";
+ static const char hex[] = "0123456789abcdef";
db_recno_t recno;
u_int32_t len;
- gint ret;
+ int ret;
#define DBTBUFLEN 100
- gchar *p, *hp, buf[DBTBUFLEN], hbuf[DBTBUFLEN];
+ char *p, *hp, buf[DBTBUFLEN], hbuf[DBTBUFLEN];
if (vdp != NULL) {
/*
@@ -835,7 +835,7 @@ __db_prdbt(dbtp, checkprint, prefix, handle, callback, is_recno, vdp)
*/
static void
__db_proff(vp, fp)
- gpointer vp;
+ void *vp;
FILE *fp;
{
BOVERFLOW *bo;
@@ -856,21 +856,21 @@ __db_proff(vp, fp)
* __db_prflags --
* Print out flags values.
*
- * PUBLIC: void __db_prflags __P((u_int32_t, const FN *, gpointer ));
+ * PUBLIC: void __db_prflags __P((u_int32_t, const FN *, void *));
*/
void
__db_prflags(flags, fn, vfp)
u_int32_t flags;
FN const *fn;
- gpointer vfp;
+ void *vfp;
{
FILE *fp;
const FN *fnp;
- gint found;
- const gchar *sep;
+ int found;
+ const char *sep;
/*
- * We pass the FILE * through a gpointer so that we can use
+ * We pass the FILE * through a void * so that we can use
* this function as as a callback.
*/
fp = (FILE *)vfp;
@@ -889,9 +889,9 @@ __db_prflags(flags, fn, vfp)
/*
* __db_dbtype_to_string --
* Return the name of the database type.
- * PUBLIC: const gchar * __db_dbtype_to_string __P((DBTYPE));
+ * PUBLIC: const char * __db_dbtype_to_string __P((DBTYPE));
*/
-const gchar *
+const char *
__db_dbtype_to_string(type)
DBTYPE type;
{
@@ -914,11 +914,11 @@ __db_dbtype_to_string(type)
* __db_pagetype_to_string --
* Return the name of the specified page type.
*/
-static const gchar *
+static const char *
__db_pagetype_to_string(type)
u_int32_t type;
{
- gchar *s;
+ char *s;
s = NULL;
switch (type) {
@@ -969,16 +969,16 @@ __db_pagetype_to_string(type)
* __db_prheader --
* Write out header information in the format expected by db_load.
*
- * PUBLIC: int __db_prheader __P((DB *, gchar *, int, int, gpointer ,
- * PUBLIC: gint (*)(gpointer , gconstpointer ), VRFY_DBINFO *, db_pgno_t));
+ * PUBLIC: int __db_prheader __P((DB *, char *, int, int, void *,
+ * PUBLIC: int (*)(void *, const void *), VRFY_DBINFO *, db_pgno_t));
*/
-gint
+int
__db_prheader(dbp, subname, pflag, keyflag, handle, callback, vdp, meta_pgno)
DB *dbp;
- gchar *subname;
- gint pflag, keyflag;
- gpointer handle;
- gint (*callback) __P((gpointer , gconstpointer ));
+ char *subname;
+ int pflag, keyflag;
+ void *handle;
+ int (*callback) __P((void *, const void *));
VRFY_DBINFO *vdp;
db_pgno_t meta_pgno;
{
@@ -988,8 +988,8 @@ __db_prheader(dbp, subname, pflag, keyflag, handle, callback, vdp, meta_pgno)
DB_QUEUE_STAT *qsp;
DBT dbt;
VRFY_PAGEINFO *pip;
- gchar *buf;
- gint buflen, ret, t_ret;
+ char *buf;
+ int buflen, ret, t_ret;
u_int32_t dbtype;
btsp = NULL;
@@ -1283,12 +1283,12 @@ err: if (pip != NULL &&
* but for consistency's sake we don't want to put its literal contents
* in multiple places.
*
- * PUBLIC: gint __db_prfooter __P((gpointer , gint (*)(gpointer , gconstpointer )));
+ * PUBLIC: int __db_prfooter __P((void *, int (*)(void *, const void *)));
*/
-gint
+int
__db_prfooter(handle, callback)
- gpointer handle;
- gint (*callback) __P((gpointer , gconstpointer ));
+ void *handle;
+ int (*callback) __P((void *, const void *));
{
return (callback(handle, "DATA=END\n"));
}
diff --git a/libdb/db/db_rec.c b/libdb/db/db_rec.c
index e4226d6..470df0f 100644
--- a/libdb/db/db_rec.c
+++ b/libdb/db/db_rec.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -23,19 +23,19 @@ static const gchar revid[] = "$Id$";
#include "dbinc/hash.h"
/*
- * PUBLIC: gint __db_addrem_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __db_addrem_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*
* This log message is generated whenever we add or remove a duplicate
* to/from a duplicate page. On recover, we just do the opposite.
*/
-gint
+int
__db_addrem_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__db_addrem_args *argp;
DB *file_dbp;
@@ -43,7 +43,7 @@ __db_addrem_recover(dbenv, dbtp, lsnp, op, info)
DB_MPOOLFILE *mpf;
PAGE *pagep;
u_int32_t change;
- gint cmp_n, cmp_p, ret;
+ int cmp_n, cmp_p, ret;
pagep = NULL;
COMPQUIET(info, NULL);
@@ -109,16 +109,16 @@ out: if (pagep != NULL)
}
/*
- * PUBLIC: gint __db_big_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __db_big_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__db_big_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__db_big_args *argp;
DB *file_dbp;
@@ -126,7 +126,7 @@ __db_big_recover(dbenv, dbtp, lsnp, op, info)
DB_MPOOLFILE *mpf;
PAGE *pagep;
u_int32_t change;
- gint cmp_n, cmp_p, ret;
+ int cmp_n, cmp_p, ret;
pagep = NULL;
COMPQUIET(info, NULL);
@@ -281,23 +281,23 @@ out: if (pagep != NULL)
* __db_ovref_recover --
* Recovery function for __db_ovref().
*
- * PUBLIC: gint __db_ovref_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __db_ovref_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__db_ovref_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__db_ovref_args *argp;
DB *file_dbp;
DBC *dbc;
DB_MPOOLFILE *mpf;
PAGE *pagep;
- gint cmp, modified, ret;
+ int cmp, modified, ret;
pagep = NULL;
COMPQUIET(info, NULL);
@@ -343,23 +343,23 @@ out: if (pagep != NULL)
* __db_relink_recover --
* Recovery function for relink.
*
- * PUBLIC: gint __db_relink_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __db_relink_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__db_relink_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__db_relink_args *argp;
DB *file_dbp;
DBC *dbc;
DB_MPOOLFILE *mpf;
PAGE *pagep;
- gint cmp_n, cmp_p, modified, ret;
+ int cmp_n, cmp_p, modified, ret;
pagep = NULL;
COMPQUIET(info, NULL);
@@ -480,19 +480,19 @@ out: if (pagep != NULL)
* __db_debug_recover --
* Recovery function for debug.
*
- * PUBLIC: gint __db_debug_recover __P((DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __db_debug_recover __P((DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__db_debug_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__db_debug_args *argp;
- gint ret;
+ int ret;
COMPQUIET(dbenv, NULL);
COMPQUIET(op, DB_TXN_ABORT);
@@ -511,16 +511,16 @@ __db_debug_recover(dbenv, dbtp, lsnp, op, info)
* __db_noop_recover --
* Recovery function for noop.
*
- * PUBLIC: gint __db_noop_recover __P((DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __db_noop_recover __P((DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__db_noop_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__db_noop_args *argp;
DB *file_dbp;
@@ -528,7 +528,7 @@ __db_noop_recover(dbenv, dbtp, lsnp, op, info)
DB_MPOOLFILE *mpf;
PAGE *pagep;
u_int32_t change;
- gint cmp_n, cmp_p, ret;
+ int cmp_n, cmp_p, ret;
pagep = NULL;
COMPQUIET(info, NULL);
@@ -562,16 +562,16 @@ out: if (pagep != NULL)
* __db_pg_alloc_recover --
* Recovery function for pg_alloc.
*
- * PUBLIC: gint __db_pg_alloc_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __db_pg_alloc_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__db_pg_alloc_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__db_pg_alloc_args *argp;
DB *file_dbp;
@@ -580,7 +580,7 @@ __db_pg_alloc_recover(dbenv, dbtp, lsnp, op, info)
DB_MPOOLFILE *mpf;
PAGE *pagep;
db_pgno_t pgno;
- gint cmp_n, cmp_p, created, level, modified, ret;
+ int cmp_n, cmp_p, created, level, modified, ret;
meta = NULL;
pagep = NULL;
@@ -751,16 +751,16 @@ out: if (pagep != NULL)
* __db_pg_free_recover --
* Recovery function for pg_free.
*
- * PUBLIC: gint __db_pg_free_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __db_pg_free_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__db_pg_free_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__db_pg_free_args *argp;
DB *file_dbp;
@@ -770,7 +770,7 @@ __db_pg_free_recover(dbenv, dbtp, lsnp, op, info)
DB_MPOOLFILE *mpf;
PAGE *pagep;
db_pgno_t pgno;
- gint cmp_n, cmp_p, modified, ret;
+ int cmp_n, cmp_p, modified, ret;
COMPQUIET(info, NULL);
meta = NULL;
@@ -856,20 +856,20 @@ out: if (pagep != NULL)
* __db_cksum_recover --
* Recovery function for checksum failure log record.
*
- * PUBLIC: gint __db_cksum_recover __P((DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __db_cksum_recover __P((DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__db_cksum_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__db_cksum_args *argp;
- gint ret;
+ int ret;
COMPQUIET(info, NULL);
COMPQUIET(lsnp, NULL);
diff --git a/libdb/db/db_reclaim.c b/libdb/db/db_reclaim.c
index 817fad5..ef055cd 100644
--- a/libdb/db/db_reclaim.c
+++ b/libdb/db/db_reclaim.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -30,19 +30,19 @@ static const gchar revid[] = "$Id$";
* where did_put is a return value indicating if the page in question has
* already been returned to the mpool.
*
- * PUBLIC: gint __db_traverse_big __P((DB *,
- * PUBLIC: db_pgno_t, gint (*)(DB *, PAGE *, gpointer , gint *), gpointer ));
+ * PUBLIC: int __db_traverse_big __P((DB *,
+ * PUBLIC: db_pgno_t, int (*)(DB *, PAGE *, void *, int *), void *));
*/
-gint
+int
__db_traverse_big(dbp, pgno, callback, cookie)
DB *dbp;
db_pgno_t pgno;
- gint (*callback) __P((DB *, PAGE *, gpointer , gint *));
- gpointer cookie;
+ int (*callback) __P((DB *, PAGE *, void *, int *));
+ void *cookie;
{
DB_MPOOLFILE *mpf;
PAGE *p;
- gint did_put, ret;
+ int did_put, ret;
mpf = dbp->mpf;
@@ -68,16 +68,16 @@ __db_traverse_big(dbp, pgno, callback, cookie)
* actual free. The reason that this is callback is because hash uses
* the same traversal code for statistics gathering.
*
- * PUBLIC: gint __db_reclaim_callback __P((DB *, PAGE *, gpointer , gint *));
+ * PUBLIC: int __db_reclaim_callback __P((DB *, PAGE *, void *, int *));
*/
-gint
+int
__db_reclaim_callback(dbp, p, cookie, putp)
DB *dbp;
PAGE *p;
- gpointer cookie;
- gint *putp;
+ void *cookie;
+ int *putp;
{
- gint ret;
+ int ret;
COMPQUIET(dbp, NULL);
@@ -94,14 +94,14 @@ __db_reclaim_callback(dbp, p, cookie, putp)
* we are traversing a btree or hash table and trying to free all the
* pages.
*
- * PUBLIC: gint __db_truncate_callback __P((DB *, PAGE *, gpointer , gint *));
+ * PUBLIC: int __db_truncate_callback __P((DB *, PAGE *, void *, int *));
*/
-gint
+int
__db_truncate_callback(dbp, p, cookie, putp)
DB *dbp;
PAGE *p;
- gpointer cookie;
- gint *putp;
+ void *cookie;
+ int *putp;
{
DBMETA *meta;
DBT ldbt;
@@ -111,7 +111,7 @@ __db_truncate_callback(dbp, p, cookie, putp)
db_pgno_t pgno;
db_trunc_param *param;
u_int8_t *hk, type;
- gint ret;
+ int ret;
top = NUM_ENT(p);
mpf = dbp->mpf;
diff --git a/libdb/db/db_remove.c b/libdb/db/db_remove.c
index 74b77e5..739571e 100644
--- a/libdb/db/db_remove.c
+++ b/libdb/db/db_remove.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -23,25 +23,25 @@ static const gchar revid[] = "$Id$";
#include "dbinc/db_shash.h"
#include "dbinc/lock.h"
-static gint __db_subdb_remove __P((DB *, DB_TXN *, const gchar *, const gchar *));
-static gint __db_dbtxn_remove __P((DB *, DB_TXN *, const gchar *));
+static int __db_subdb_remove __P((DB *, DB_TXN *, const char *, const char *));
+static int __db_dbtxn_remove __P((DB *, DB_TXN *, const char *));
/*
* __dbenv_dbremove
* Remove method for DB_ENV.
*
- * PUBLIC: gint __dbenv_dbremove __P((DB_ENV *,
- * PUBLIC: DB_TXN *, const gchar *, const gchar *, u_int32_t));
+ * PUBLIC: int __dbenv_dbremove __P((DB_ENV *,
+ * PUBLIC: DB_TXN *, const char *, const char *, u_int32_t));
*/
-gint
+int
__dbenv_dbremove(dbenv, txn, name, subdb, flags)
DB_ENV *dbenv;
DB_TXN *txn;
- const gchar *name, *subdb;
+ const char *name, *subdb;
u_int32_t flags;
{
DB *dbp;
- gint ret, t_ret, txn_local;
+ int ret, t_ret, txn_local;
txn_local = 0;
@@ -99,16 +99,16 @@ __dbenv_dbremove(dbenv, txn, name, subdb, flags)
* __db_remove
* Remove method for DB.
*
- * PUBLIC: gint __db_remove __P((DB *, const gchar *, const gchar *, u_int32_t));
+ * PUBLIC: int __db_remove __P((DB *, const char *, const char *, u_int32_t));
*/
-gint
+int
__db_remove(dbp, name, subdb, flags)
DB *dbp;
- const gchar *name, *subdb;
+ const char *name, *subdb;
u_int32_t flags;
{
DB_ENV *dbenv;
- gint ret, t_ret;
+ int ret, t_ret;
dbenv = dbp->dbenv;
@@ -154,18 +154,18 @@ err: if ((t_ret = dbp->close(dbp, DB_NOSYNC)) != 0 && ret == 0)
* __db_remove_i
* Internal remove method for DB.
*
- * PUBLIC: gint __db_remove_i __P((DB *, DB_TXN *, const gchar *, const gchar *));
+ * PUBLIC: int __db_remove_i __P((DB *, DB_TXN *, const char *, const char *));
*/
-gint
+int
__db_remove_i(dbp, txn, name, subdb)
DB *dbp;
DB_TXN *txn;
- const gchar *name, *subdb;
+ const char *name, *subdb;
{
DB_ENV *dbenv;
DB_LSN newlsn;
- gint ret;
- gchar *real_name;
+ int ret;
+ char *real_name;
dbenv = dbp->dbenv;
real_name = NULL;
@@ -211,10 +211,10 @@ static int
__db_subdb_remove(dbp, txn, name, subdb)
DB *dbp;
DB_TXN *txn;
- const gchar *name, *subdb;
+ const char *name, *subdb;
{
DB *mdbp, *sdbp;
- gint ret, t_ret;
+ int ret, t_ret;
mdbp = sdbp = NULL;
@@ -274,12 +274,12 @@ static int
__db_dbtxn_remove(dbp, txn, name)
DB *dbp;
DB_TXN *txn;
- const gchar *name;
+ const char *name;
{
DB_ENV *dbenv;
DB_LSN newlsn;
- gint ret;
- gchar *tmpname;
+ int ret;
+ char *tmpname;
dbenv = dbp->dbenv;
tmpname = NULL;
diff --git a/libdb/db/db_rename.c b/libdb/db/db_rename.c
index acc9469..ee03938 100644
--- a/libdb/db/db_rename.c
+++ b/libdb/db/db_rename.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,25 +24,25 @@ static const gchar revid[] = "$Id$";
#include "dbinc/lock.h"
#include "dbinc/log.h"
-static gint __db_subdb_rename __P(( DB *, DB_TXN *,
- const gchar *, const gchar *, const gchar *));
+static int __db_subdb_rename __P(( DB *, DB_TXN *,
+ const char *, const char *, const char *));
/*
* __dbenv_dbrename
* Rename method for DB_ENV.
*
- * PUBLIC: gint __dbenv_dbrename __P((DB_ENV *, DB_TXN *,
- * PUBLIC: const gchar *, const gchar *, const gchar *, u_int32_t));
+ * PUBLIC: int __dbenv_dbrename __P((DB_ENV *, DB_TXN *,
+ * PUBLIC: const char *, const char *, const char *, u_int32_t));
*/
-gint
+int
__dbenv_dbrename(dbenv, txn, name, subdb, newname, flags)
DB_ENV *dbenv;
DB_TXN *txn;
- const gchar *name, *subdb, *newname;
+ const char *name, *subdb, *newname;
u_int32_t flags;
{
DB *dbp;
- gint ret, t_ret, txn_local;
+ int ret, t_ret, txn_local;
txn_local = 0;
@@ -101,17 +101,17 @@ __dbenv_dbrename(dbenv, txn, name, subdb, newname, flags)
* __db_rename
* Rename method for DB.
*
- * PUBLIC: gint __db_rename __P((DB *,
- * PUBLIC: const gchar *, const gchar *, const gchar *, u_int32_t));
+ * PUBLIC: int __db_rename __P((DB *,
+ * PUBLIC: const char *, const char *, const char *, u_int32_t));
*/
-gint
+int
__db_rename(dbp, name, subdb, newname, flags)
DB *dbp;
- const gchar *name, *subdb, *newname;
+ const char *name, *subdb, *newname;
u_int32_t flags;
{
DB_ENV *dbenv;
- gint ret, t_ret;
+ int ret, t_ret;
dbenv = dbp->dbenv;
@@ -157,18 +157,18 @@ err: if ((t_ret = dbp->close(dbp, DB_NOSYNC)) != 0 && ret == 0)
* __db_rename_i
* Internal rename method for DB.
*
- * PUBLIC: gint __db_rename_i __P((DB *,
- * PUBLIC: DB_TXN *, const gchar *, const gchar *, const gchar *));
+ * PUBLIC: int __db_rename_i __P((DB *,
+ * PUBLIC: DB_TXN *, const char *, const char *, const char *));
*/
-gint
+int
__db_rename_i(dbp, txn, name, subdb, newname)
DB *dbp;
DB_TXN *txn;
- const gchar *name, *subdb, *newname;
+ const char *name, *subdb, *newname;
{
DB_ENV *dbenv;
- gint ret;
- gchar *real_name;
+ int ret;
+ char *real_name;
dbenv = dbp->dbenv;
real_name = NULL;
@@ -235,12 +235,12 @@ static int
__db_subdb_rename(dbp, txn, name, subdb, newname)
DB *dbp;
DB_TXN *txn;
- const gchar *name, *subdb, *newname;
+ const char *name, *subdb, *newname;
{
DB *mdbp;
DB_ENV *dbenv;
PAGE *meta;
- gint ret, t_ret;
+ int ret, t_ret;
mdbp = NULL;
meta = NULL;
diff --git a/libdb/db/db_ret.c b/libdb/db/db_ret.c
index 50bb658..2e4466e 100644
--- a/libdb/db/db_ret.c
+++ b/libdb/db/db_ret.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,16 +25,16 @@ static const gchar revid[] = "$Id$";
* __db_ret --
* Build return DBT.
*
- * PUBLIC: gint __db_ret __P((DB *,
- * PUBLIC: PAGE *, u_int32_t, DBT *, gpointer *, u_int32_t *));
+ * PUBLIC: int __db_ret __P((DB *,
+ * PUBLIC: PAGE *, u_int32_t, DBT *, void **, u_int32_t *));
*/
-gint
+int
__db_ret(dbp, h, indx, dbt, memp, memsize)
DB *dbp;
PAGE *h;
u_int32_t indx;
DBT *dbt;
- gpointer *memp;
+ void **memp;
u_int32_t *memsize;
{
BKEYDATA *bk;
@@ -42,7 +42,7 @@ __db_ret(dbp, h, indx, dbt, memp, memsize)
BOVERFLOW *bo;
u_int32_t len;
u_int8_t *hk;
- gpointer data;
+ void *data;
switch (TYPE(h)) {
case P_HASH:
@@ -78,19 +78,19 @@ __db_ret(dbp, h, indx, dbt, memp, memsize)
* __db_retcopy --
* Copy the returned data into the user's DBT, handling special flags.
*
- * PUBLIC: gint __db_retcopy __P((DB_ENV *, DBT *,
- * PUBLIC: gpointer , u_int32_t, gpointer *, u_int32_t *));
+ * PUBLIC: int __db_retcopy __P((DB_ENV *, DBT *,
+ * PUBLIC: void *, u_int32_t, void **, u_int32_t *));
*/
-gint
+int
__db_retcopy(dbenv, dbt, data, len, memp, memsize)
DB_ENV *dbenv;
DBT *dbt;
- gpointer data;
+ void *data;
u_int32_t len;
- gpointer *memp;
+ void **memp;
u_int32_t *memsize;
{
- gint ret;
+ int ret;
/* If returning a partial record, reset the length. */
if (F_ISSET(dbt, DB_DBT_PARTIAL)) {
diff --git a/libdb/db/db_truncate.c b/libdb/db/db_truncate.c
index 4b58f38..c71d431 100644
--- a/libdb/db/db_truncate.c
+++ b/libdb/db/db_truncate.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,16 +25,16 @@ static const gchar revid[] = "$Id$";
* __db_truncate
* truncate method for DB.
*
- * PUBLIC: gint __db_truncate __P((DB *, DB_TXN *, u_int32_t *, u_int32_t));
+ * PUBLIC: int __db_truncate __P((DB *, DB_TXN *, u_int32_t *, u_int32_t));
*/
-gint
+int
__db_truncate(dbp, txn, countp, flags)
DB *dbp;
DB_TXN *txn;
u_int32_t *countp, flags;
{
DB_ENV *dbenv;
- gint ret, t_ret, txn_local;
+ int ret, t_ret, txn_local;
dbenv = dbp->dbenv;
ret = txn_local = 0;
diff --git a/libdb/db/db_upg.c b/libdb/db/db_upg.c
index 751b42e..463e67c 100644
--- a/libdb/db/db_upg.c
+++ b/libdb/db/db_upg.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,8 +24,8 @@ static const gchar revid[] = "$Id$";
#include "dbinc/hash.h"
#include "dbinc/qam.h"
-static gint (* const func_31_list[P_PAGETYPE_MAX])
- __P((DB *, gchar *, u_int32_t, DB_FH *, PAGE *, gint *)) = {
+static int (* const func_31_list[P_PAGETYPE_MAX])
+ __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *)) = {
NULL, /* P_INVALID */
NULL, /* __P_DUPLICATE */
__ham_31_hash, /* P_HASH */
@@ -38,27 +38,27 @@ static gint (* const func_31_list[P_PAGETYPE_MAX])
__bam_31_btreemeta, /* P_BTREEMETA */
};
-static gint __db_page_pass __P((DB *, gchar *, u_int32_t, gint (* const [])
- (DB *, gchar *, u_int32_t, DB_FH *, PAGE *, gint *), DB_FH *));
+static int __db_page_pass __P((DB *, char *, u_int32_t, int (* const [])
+ (DB *, char *, u_int32_t, DB_FH *, PAGE *, int *), DB_FH *));
/*
* __db_upgrade --
* Upgrade an existing database.
*
- * PUBLIC: gint __db_upgrade __P((DB *, const gchar *, u_int32_t));
+ * PUBLIC: int __db_upgrade __P((DB *, const char *, u_int32_t));
*/
-gint
+int
__db_upgrade(dbp, fname, flags)
DB *dbp;
- const gchar *fname;
+ const char *fname;
u_int32_t flags;
{
DB_ENV *dbenv;
DB_FH fh;
size_t n;
- gint ret, t_ret;
+ int ret, t_ret;
u_int8_t mbuf[256];
- gchar *real_name;
+ char *real_name;
dbenv = dbp->dbenv;
@@ -252,17 +252,17 @@ err: if ((t_ret = __os_closehandle(dbenv, &fh)) != 0 && ret == 0)
static int
__db_page_pass(dbp, real_name, flags, fl, fhp)
DB *dbp;
- gchar *real_name;
+ char *real_name;
u_int32_t flags;
- gint (* const fl[P_PAGETYPE_MAX])
- __P((DB *, gchar *, u_int32_t, DB_FH *, PAGE *, gint *));
+ int (* const fl[P_PAGETYPE_MAX])
+ __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
DB_FH *fhp;
{
DB_ENV *dbenv;
PAGE *page;
db_pgno_t i, pgno_last;
size_t n;
- gint dirty, ret;
+ int dirty, ret;
dbenv = dbp->dbenv;
@@ -305,19 +305,19 @@ __db_page_pass(dbp, real_name, flags, fl, fhp)
* __db_lastpgno --
* Return the current last page number of the file.
*
- * PUBLIC: gint __db_lastpgno __P((DB *, gchar *, DB_FH *, db_pgno_t *));
+ * PUBLIC: int __db_lastpgno __P((DB *, char *, DB_FH *, db_pgno_t *));
*/
-gint
+int
__db_lastpgno(dbp, real_name, fhp, pgno_lastp)
DB *dbp;
- gchar *real_name;
+ char *real_name;
DB_FH *fhp;
db_pgno_t *pgno_lastp;
{
DB_ENV *dbenv;
db_pgno_t pgno_last;
u_int32_t mbytes, bytes;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
diff --git a/libdb/db/db_upg_opd.c b/libdb/db/db_upg_opd.c
index 536aa6f..aba2028 100644
--- a/libdb/db/db_upg_opd.c
+++ b/libdb/db/db_upg_opd.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -21,9 +21,9 @@ static const gchar revid[] = "$Id$";
#include "dbinc/db_page.h"
#include "dbinc/btree.h"
-static gint __db_build_bi __P((DB *, DB_FH *, PAGE *, PAGE *, u_int32_t, gint *));
-static gint __db_build_ri __P((DB *, DB_FH *, PAGE *, PAGE *, u_int32_t, gint *));
-static gint __db_up_ovref __P((DB *, DB_FH *, db_pgno_t));
+static int __db_build_bi __P((DB *, DB_FH *, PAGE *, PAGE *, u_int32_t, int *));
+static int __db_build_ri __P((DB *, DB_FH *, PAGE *, PAGE *, u_int32_t, int *));
+static int __db_up_ovref __P((DB *, DB_FH *, db_pgno_t));
#define GET_PAGE(dbp, fhp, pgno, page) { \
if ((ret = __os_seek(dbp->dbenv, \
@@ -46,14 +46,14 @@ static gint __db_up_ovref __P((DB *, DB_FH *, db_pgno_t));
* __db_31_offdup --
* Convert 3.0 off-page duplicates to 3.1 off-page duplicates.
*
- * PUBLIC: gint __db_31_offdup __P((DB *, gchar *, DB_FH *, int, db_pgno_t *));
+ * PUBLIC: int __db_31_offdup __P((DB *, char *, DB_FH *, int, db_pgno_t *));
*/
-gint
+int
__db_31_offdup(dbp, real_name, fhp, sorted, pgnop)
DB *dbp;
- gchar *real_name;
+ char *real_name;
DB_FH *fhp;
- gint sorted;
+ int sorted;
db_pgno_t *pgnop;
{
PAGE *ipage, *page;
@@ -62,7 +62,7 @@ __db_31_offdup(dbp, real_name, fhp, sorted, pgnop)
db_pgno_t *pgno_next, pgno_max, *tmp;
db_recno_t nrecs;
size_t n;
- gint level, nomem, ret;
+ int level, nomem, ret;
ipage = page = NULL;
pgno_cur = pgno_next = NULL;
@@ -205,12 +205,12 @@ __db_build_bi(dbp, fhp, ipage, page, indx, nomemp)
DB_FH *fhp;
PAGE *ipage, *page;
u_int32_t indx;
- gint *nomemp;
+ int *nomemp;
{
BINTERNAL bi, *child_bi;
BKEYDATA *child_bk;
u_int8_t *p;
- gint ret;
+ int ret;
db_indx_t *inp;
inp = P_INP(dbp, ipage);
@@ -304,7 +304,7 @@ __db_build_ri(dbp, fhp, ipage, page, indx, nomemp)
DB_FH *fhp;
PAGE *ipage, *page;
u_int32_t indx;
- gint *nomemp;
+ int *nomemp;
{
RINTERNAL ri;
db_indx_t *inp;
@@ -336,7 +336,7 @@ __db_up_ovref(dbp, fhp, pgno)
{
PAGE *page;
size_t n;
- gint ret;
+ int ret;
/* Allocate room to hold a page. */
if ((ret = __os_malloc(dbp->dbenv, dbp->pgsize, &page)) != 0)
diff --git a/libdb/db/db_vrfy.c b/libdb/db/db_vrfy.c
index 1529475..d05556b 100644
--- a/libdb/db/db_vrfy.c
+++ b/libdb/db/db_vrfy.c
@@ -10,7 +10,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -30,35 +30,35 @@ static const gchar revid[] = "$Id$";
#include "dbinc/qam.h"
#include "dbinc/txn.h"
-static gint __db_guesspgsize __P((DB_ENV *, DB_FH *));
-static gint __db_is_valid_magicno __P((u_int32_t, DBTYPE *));
-static gint __db_is_valid_pagetype __P((u_int32_t));
-static gint __db_meta2pgset
+static int __db_guesspgsize __P((DB_ENV *, DB_FH *));
+static int __db_is_valid_magicno __P((u_int32_t, DBTYPE *));
+static int __db_is_valid_pagetype __P((u_int32_t));
+static int __db_meta2pgset
__P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t, DB *));
-static gint __db_salvage __P((DB *, VRFY_DBINFO *, db_pgno_t,
- PAGE *, gpointer , gint (*)(gpointer , gconstpointer ), u_int32_t));
-static gint __db_salvage_subdbpg __P((DB *, VRFY_DBINFO *,
- PAGE *, gpointer , gint (*)(gpointer , gconstpointer ), u_int32_t));
-static gint __db_salvage_subdbs
- __P((DB *, VRFY_DBINFO *, gpointer ,
- int(*)(gpointer , gconstpointer ), u_int32_t, gint *));
-static gint __db_salvage_unknowns
- __P((DB *, VRFY_DBINFO *, gpointer ,
- gint (*)(gpointer , gconstpointer ), u_int32_t));
-static gint __db_vrfy_common
+static int __db_salvage __P((DB *, VRFY_DBINFO *, db_pgno_t,
+ PAGE *, void *, int (*)(void *, const void *), u_int32_t));
+static int __db_salvage_subdbpg __P((DB *, VRFY_DBINFO *,
+ PAGE *, void *, int (*)(void *, const void *), u_int32_t));
+static int __db_salvage_subdbs
+ __P((DB *, VRFY_DBINFO *, void *,
+ int(*)(void *, const void *), u_int32_t, int *));
+static int __db_salvage_unknowns
+ __P((DB *, VRFY_DBINFO *, void *,
+ int (*)(void *, const void *), u_int32_t));
+static int __db_vrfy_common
__P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-static gint __db_vrfy_freelist __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
-static gint __db_vrfy_invalid
+static int __db_vrfy_freelist __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
+static int __db_vrfy_invalid
__P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-static gint __db_vrfy_orderchkonly __P((DB *,
- VRFY_DBINFO *, const gchar *, const gchar *, u_int32_t));
-static gint __db_vrfy_pagezero __P((DB *, VRFY_DBINFO *, DB_FH *, u_int32_t));
-static gint __db_vrfy_subdbs
- __P((DB *, VRFY_DBINFO *, const gchar *, u_int32_t));
-static gint __db_vrfy_structure
- __P((DB *, VRFY_DBINFO *, const gchar *, db_pgno_t, u_int32_t));
-static gint __db_vrfy_walkpages
- __P((DB *, VRFY_DBINFO *, gpointer , gint (*)(gpointer , gconstpointer ),
+static int __db_vrfy_orderchkonly __P((DB *,
+ VRFY_DBINFO *, const char *, const char *, u_int32_t));
+static int __db_vrfy_pagezero __P((DB *, VRFY_DBINFO *, DB_FH *, u_int32_t));
+static int __db_vrfy_subdbs
+ __P((DB *, VRFY_DBINFO *, const char *, u_int32_t));
+static int __db_vrfy_structure
+ __P((DB *, VRFY_DBINFO *, const char *, db_pgno_t, u_int32_t));
+static int __db_vrfy_walkpages
+ __P((DB *, VRFY_DBINFO *, void *, int (*)(void *, const void *),
u_int32_t));
/*
@@ -86,13 +86,13 @@ static gint __db_vrfy_walkpages
* which lets us pass appropriate equivalents to FILE * in from the
* non-C APIs.
*
- * PUBLIC: gint __db_verify
- * PUBLIC: __P((DB *, const gchar *, const gchar *, FILE *, u_int32_t));
+ * PUBLIC: int __db_verify
+ * PUBLIC: __P((DB *, const char *, const char *, FILE *, u_int32_t));
*/
-gint
+int
__db_verify(dbp, file, database, outfile, flags)
DB *dbp;
- const gchar *file, *database;
+ const char *file, *database;
FILE *outfile;
u_int32_t flags;
{
@@ -105,17 +105,17 @@ __db_verify(dbp, file, database, outfile, flags)
* __db_verify_callback --
* Callback function for using pr_* functions from C.
*
- * PUBLIC: gint __db_verify_callback __P((gpointer , gconstpointer ));
+ * PUBLIC: int __db_verify_callback __P((void *, const void *));
*/
-gint
+int
__db_verify_callback(handle, str_arg)
- gpointer handle;
- gconstpointer str_arg;
+ void *handle;
+ const void *str_arg;
{
- gchar *str;
+ char *str;
FILE *f;
- str = (gchar *)str_arg;
+ str = (char *)str_arg;
f = (FILE *)handle;
if (fprintf(f, "%s", str) != (int)strlen(str))
@@ -128,23 +128,23 @@ __db_verify_callback(handle, str_arg)
* __db_verify_internal --
* Inner meat of __db_verify.
*
- * PUBLIC: gint __db_verify_internal __P((DB *, const gchar *,
- * PUBLIC: const gchar *, gpointer , gint (*)(gpointer , gconstpointer ), u_int32_t));
+ * PUBLIC: int __db_verify_internal __P((DB *, const char *,
+ * PUBLIC: const char *, void *, int (*)(void *, const void *), u_int32_t));
*/
-gint
+int
__db_verify_internal(dbp_orig, name, subdb, handle, callback, flags)
DB *dbp_orig;
- const gchar *name, *subdb;
- gpointer handle;
- gint (*callback) __P((gpointer , gconstpointer ));
+ const char *name, *subdb;
+ void *handle;
+ int (*callback) __P((void *, const void *));
u_int32_t flags;
{
DB *dbp;
DB_ENV *dbenv;
DB_FH fh, *fhp;
VRFY_DBINFO *vdp;
- gint has, ret, isbad;
- gchar *real_name;
+ int has, ret, isbad;
+ char *real_name;
dbenv = dbp_orig->dbenv;
vdp = NULL;
@@ -429,7 +429,7 @@ __db_vrfy_pagezero(dbp, vdp, fhp, flags)
VRFY_PAGEINFO *pip;
db_pgno_t freelist;
size_t nr;
- gint isbad, ret, swapped;
+ int isbad, ret, swapped;
u_int8_t mbuf[DBMETASIZE];
isbad = ret = swapped = 0;
@@ -603,15 +603,15 @@ static int
__db_vrfy_walkpages(dbp, vdp, handle, callback, flags)
DB *dbp;
VRFY_DBINFO *vdp;
- gpointer handle;
- gint (*callback) __P((gpointer , gconstpointer ));
+ void *handle;
+ int (*callback) __P((void *, const void *));
u_int32_t flags;
{
DB_ENV *dbenv;
DB_MPOOLFILE *mpf;
PAGE *h;
db_pgno_t i;
- gint ret, t_ret, isbad;
+ int ret, t_ret, isbad;
dbenv = dbp->dbenv;
mpf = dbp->mpf;
@@ -782,7 +782,7 @@ static int
__db_vrfy_structure(dbp, vdp, dbname, meta_pgno, flags)
DB *dbp;
VRFY_DBINFO *vdp;
- const gchar *dbname;
+ const char *dbname;
db_pgno_t meta_pgno;
u_int32_t flags;
{
@@ -790,7 +790,7 @@ __db_vrfy_structure(dbp, vdp, dbname, meta_pgno, flags)
DB_ENV *dbenv;
VRFY_PAGEINFO *pip;
db_pgno_t i;
- gint ret, isbad, hassubs, p;
+ int ret, isbad, hassubs, p;
isbad = 0;
pip = NULL;
@@ -993,7 +993,7 @@ __db_vrfy_common(dbp, vdp, h, pgno, flags)
{
DB_ENV *dbenv;
VRFY_PAGEINFO *pip;
- gint ret, t_ret;
+ int ret, t_ret;
u_int8_t *p;
dbenv = dbp->dbenv;
@@ -1067,7 +1067,7 @@ __db_vrfy_invalid(dbp, vdp, h, pgno, flags)
{
DB_ENV *dbenv;
VRFY_PAGEINFO *pip;
- gint ret, t_ret;
+ int ret, t_ret;
dbenv = dbp->dbenv;
@@ -1097,10 +1097,10 @@ __db_vrfy_invalid(dbp, vdp, h, pgno, flags)
* all-page-type-common elements of pip have been verified and filled
* in.
*
- * PUBLIC: gint __db_vrfy_datapage
+ * PUBLIC: int __db_vrfy_datapage
* PUBLIC: __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
*/
-gint
+int
__db_vrfy_datapage(dbp, vdp, h, pgno, flags)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -1110,7 +1110,7 @@ __db_vrfy_datapage(dbp, vdp, h, pgno, flags)
{
DB_ENV *dbenv;
VRFY_PAGEINFO *pip;
- gint isbad, ret, t_ret;
+ int isbad, ret, t_ret;
dbenv = dbp->dbenv;
@@ -1212,10 +1212,10 @@ __db_vrfy_datapage(dbp, vdp, h, pgno, flags)
* Verify the access-method common parts of a meta page, using
* normal mpool routines.
*
- * PUBLIC: gint __db_vrfy_meta
+ * PUBLIC: int __db_vrfy_meta
* PUBLIC: __P((DB *, VRFY_DBINFO *, DBMETA *, db_pgno_t, u_int32_t));
*/
-gint
+int
__db_vrfy_meta(dbp, vdp, meta, pgno, flags)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -1226,7 +1226,7 @@ __db_vrfy_meta(dbp, vdp, meta, pgno, flags)
DB_ENV *dbenv;
DBTYPE dbtype, magtype;
VRFY_PAGEINFO *pip;
- gint isbad, ret, t_ret;
+ int isbad, ret, t_ret;
isbad = 0;
dbenv = dbp->dbenv;
@@ -1338,7 +1338,7 @@ __db_vrfy_freelist(dbp, vdp, meta, flags)
DB_ENV *dbenv;
VRFY_PAGEINFO *pip;
db_pgno_t cur_pgno, next_pgno;
- gint p, ret, t_ret;
+ int p, ret, t_ret;
pgset = vdp->pgset;
DB_ASSERT(pgset != NULL);
@@ -1398,7 +1398,7 @@ static int
__db_vrfy_subdbs(dbp, vdp, dbname, flags)
DB *dbp;
VRFY_DBINFO *vdp;
- const gchar *dbname;
+ const char *dbname;
u_int32_t flags;
{
DB *mdbp;
@@ -1407,7 +1407,7 @@ __db_vrfy_subdbs(dbp, vdp, dbname, flags)
DB_ENV *dbenv;
VRFY_PAGEINFO *pip;
db_pgno_t meta_pgno;
- gint ret, t_ret, isbad;
+ int ret, t_ret, isbad;
u_int8_t type;
isbad = 0;
@@ -1503,7 +1503,7 @@ __db_vrfy_struct_feedback(dbp, vdp)
DB *dbp;
VRFY_DBINFO *vdp;
{
- gint progress;
+ int progress;
if (dbp->db_feedback == NULL)
return;
@@ -1524,7 +1524,7 @@ static int
__db_vrfy_orderchkonly(dbp, vdp, name, subdb, flags)
DB *dbp;
VRFY_DBINFO *vdp;
- const gchar *name, *subdb;
+ const char *name, *subdb;
u_int32_t flags;
{
BTMETA *btmeta;
@@ -1538,7 +1538,7 @@ __db_vrfy_orderchkonly(dbp, vdp, name, subdb, flags)
PAGE *h, *currpg;
db_pgno_t meta_pgno, p, pgno;
u_int32_t bucket;
- gint t_ret, ret;
+ int t_ret, ret;
pgset = NULL;
pgsc = NULL;
@@ -1555,7 +1555,7 @@ __db_vrfy_orderchkonly(dbp, vdp, name, subdb, flags)
goto err;
memset(&key, 0, sizeof(key));
- key.data = (gpointer)subdb;
+ key.data = (void *)subdb;
key.size = (u_int32_t)strlen(subdb);
memset(&data, 0, sizeof(data));
if ((ret = mdbp->get(mdbp, NULL, &key, &data, 0)) != 0)
@@ -1692,8 +1692,8 @@ __db_salvage(dbp, vdp, pgno, h, handle, callback, flags)
VRFY_DBINFO *vdp;
db_pgno_t pgno;
PAGE *h;
- gpointer handle;
- gint (*callback) __P((gpointer , gconstpointer ));
+ void *handle;
+ int (*callback) __P((void *, const void *));
u_int32_t flags;
{
DB_ASSERT(LF_ISSET(DB_SALVAGE));
@@ -1752,8 +1752,8 @@ static int
__db_salvage_unknowns(dbp, vdp, handle, callback, flags)
DB *dbp;
VRFY_DBINFO *vdp;
- gpointer handle;
- gint (*callback) __P((gpointer , gconstpointer ));
+ void *handle;
+ int (*callback) __P((void *, const void *));
u_int32_t flags;
{
DBT unkdbt, key, *dbt;
@@ -1762,8 +1762,8 @@ __db_salvage_unknowns(dbp, vdp, handle, callback, flags)
PAGE *h;
db_pgno_t pgno;
u_int32_t pgtype;
- gint ret, err_ret;
- gpointer ovflbuf;
+ int ret, err_ret;
+ void *ovflbuf;
dbenv = dbp->dbenv;
mpf = dbp->mpf;
@@ -1854,16 +1854,16 @@ __db_salvage_unknowns(dbp, vdp, handle, callback, flags)
* since verification can't continue from there; returns DB_VERIFY_BAD
* if anything else is wrong.
*
- * PUBLIC: gint __db_vrfy_inpitem __P((DB *, PAGE *,
+ * PUBLIC: int __db_vrfy_inpitem __P((DB *, PAGE *,
* PUBLIC: db_pgno_t, u_int32_t, int, u_int32_t, u_int32_t *, u_int32_t *));
*/
-gint
+int
__db_vrfy_inpitem(dbp, h, pgno, i, is_btree, flags, himarkp, offsetp)
DB *dbp;
PAGE *h;
db_pgno_t pgno;
u_int32_t i;
- gint is_btree;
+ int is_btree;
u_int32_t flags, *himarkp, *offsetp;
{
BKEYDATA *bk;
@@ -1950,10 +1950,10 @@ __db_vrfy_inpitem(dbp, h, pgno, i, is_btree, flags, himarkp, offsetp)
* verify that the dup tree type is correct--i.e., it's a recno
* if DUPSORT is not set and a btree if it is.
*
- * PUBLIC: gint __db_vrfy_duptype
+ * PUBLIC: int __db_vrfy_duptype
* PUBLIC: __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
*/
-gint
+int
__db_vrfy_duptype(dbp, vdp, pgno, flags)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -1962,7 +1962,7 @@ __db_vrfy_duptype(dbp, vdp, pgno, flags)
{
DB_ENV *dbenv;
VRFY_PAGEINFO *pip;
- gint ret, isbad;
+ int ret, isbad;
dbenv = dbp->dbenv;
isbad = 0;
@@ -2030,22 +2030,22 @@ __db_vrfy_duptype(dbp, vdp, pgno, flags)
* done, so each page gets printed exactly once and we don't get caught
* in any cycles.
*
- * PUBLIC: gint __db_salvage_duptree __P((DB *, VRFY_DBINFO *, db_pgno_t,
- * PUBLIC: DBT *, gpointer , gint (*)(gpointer , gconstpointer ), u_int32_t));
+ * PUBLIC: int __db_salvage_duptree __P((DB *, VRFY_DBINFO *, db_pgno_t,
+ * PUBLIC: DBT *, void *, int (*)(void *, const void *), u_int32_t));
*/
-gint
+int
__db_salvage_duptree(dbp, vdp, pgno, key, handle, callback, flags)
DB *dbp;
VRFY_DBINFO *vdp;
db_pgno_t pgno;
DBT *key;
- gpointer handle;
- gint (*callback) __P((gpointer , gconstpointer ));
+ void *handle;
+ int (*callback) __P((void *, const void *));
u_int32_t flags;
{
DB_MPOOLFILE *mpf;
PAGE *h;
- gint ret, t_ret;
+ int ret, t_ret;
mpf = dbp->mpf;
@@ -2098,10 +2098,10 @@ static int
__db_salvage_subdbs(dbp, vdp, handle, callback, flags, hassubsp)
DB *dbp;
VRFY_DBINFO *vdp;
- gpointer handle;
- gint (*callback) __P((gpointer , gconstpointer ));
+ void *handle;
+ int (*callback) __P((void *, const void *));
u_int32_t flags;
- gint *hassubsp;
+ int *hassubsp;
{
BTMETA *btmeta;
DB *pgset;
@@ -2109,7 +2109,7 @@ __db_salvage_subdbs(dbp, vdp, handle, callback, flags, hassubsp)
DB_MPOOLFILE *mpf;
PAGE *h;
db_pgno_t p, meta_pgno;
- gint ret, err_ret;
+ int ret, err_ret;
pgset = NULL;
pgsc = NULL;
@@ -2207,8 +2207,8 @@ __db_salvage_subdbpg(dbp, vdp, master, handle, callback, flags)
DB *dbp;
VRFY_DBINFO *vdp;
PAGE *master;
- gpointer handle;
- gint (*callback) __P((gpointer , gconstpointer ));
+ void *handle;
+ int (*callback) __P((void *, const void *));
u_int32_t flags;
{
BKEYDATA *bkkey, *bkdata;
@@ -2221,8 +2221,8 @@ __db_salvage_subdbpg(dbp, vdp, master, handle, callback, flags)
PAGE *subpg;
db_indx_t i;
db_pgno_t meta_pgno, p;
- gint ret, err_ret, t_ret;
- gchar *subdbname;
+ int ret, err_ret, t_ret;
+ char *subdbname;
dbenv = dbp->dbenv;
mpf = dbp->mpf;
@@ -2248,7 +2248,7 @@ __db_salvage_subdbpg(dbp, vdp, master, handle, callback, flags)
*/
bo = (BOVERFLOW *)bkkey;
if ((ret = __db_safe_goff(dbp, vdp, bo->pgno, &key,
- (gpointer *)&subdbname, flags)) != 0) {
+ (void **)&subdbname, flags)) != 0) {
err_ret = DB_VERIFY_BAD;
continue;
}
@@ -2390,7 +2390,7 @@ __db_meta2pgset(dbp, vdp, pgno, flags, pgset)
{
DB_MPOOLFILE *mpf;
PAGE *h;
- gint ret, t_ret;
+ int ret, t_ret;
mpf = dbp->mpf;
diff --git a/libdb/db/db_vrfyutil.c b/libdb/db/db_vrfyutil.c
index fdb7d3e..e7fc70a 100644
--- a/libdb/db/db_vrfyutil.c
+++ b/libdb/db/db_vrfyutil.c
@@ -10,7 +10,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,17 +24,17 @@ static const gchar revid[] = "$Id$";
#include "dbinc/db_verify.h"
#include "dbinc/db_am.h"
-static gint __db_vrfy_pageinfo_create __P((DB_ENV *, VRFY_PAGEINFO **));
-static gint __db_vrfy_pgset_iinc __P((DB *, db_pgno_t, int));
+static int __db_vrfy_pageinfo_create __P((DB_ENV *, VRFY_PAGEINFO **));
+static int __db_vrfy_pgset_iinc __P((DB *, db_pgno_t, int));
/*
* __db_vrfy_dbinfo_create --
* Allocate and initialize a VRFY_DBINFO structure.
*
- * PUBLIC: gint __db_vrfy_dbinfo_create
+ * PUBLIC: int __db_vrfy_dbinfo_create
* PUBLIC: __P((DB_ENV *, u_int32_t, VRFY_DBINFO **));
*/
-gint
+int
__db_vrfy_dbinfo_create(dbenv, pgsize, vdpp)
DB_ENV *dbenv;
u_int32_t pgsize;
@@ -42,13 +42,13 @@ __db_vrfy_dbinfo_create(dbenv, pgsize, vdpp)
{
DB *cdbp, *pgdbp, *pgset;
VRFY_DBINFO *vdp;
- gint ret;
+ int ret;
vdp = NULL;
cdbp = pgdbp = pgset = NULL;
if ((ret = __os_calloc(NULL,
- 1, sizeof(VRFY_DBINFO), (gpointer *)&vdp)) != 0)
+ 1, sizeof(VRFY_DBINFO), (void **)&vdp)) != 0)
goto err;
if ((ret = db_create(&cdbp, dbenv, 0)) != 0)
@@ -100,15 +100,15 @@ err: if (cdbp != NULL)
* Destructor for VRFY_DBINFO. Destroys VRFY_PAGEINFOs and deallocates
* structure.
*
- * PUBLIC: gint __db_vrfy_dbinfo_destroy __P((DB_ENV *, VRFY_DBINFO *));
+ * PUBLIC: int __db_vrfy_dbinfo_destroy __P((DB_ENV *, VRFY_DBINFO *));
*/
-gint
+int
__db_vrfy_dbinfo_destroy(dbenv, vdp)
DB_ENV *dbenv;
VRFY_DBINFO *vdp;
{
VRFY_CHILDINFO *c, *d;
- gint t_ret, ret;
+ int t_ret, ret;
ret = 0;
@@ -136,10 +136,10 @@ __db_vrfy_dbinfo_destroy(dbenv, vdp)
* __db_vrfy_getpageinfo --
* Get a PAGEINFO structure for a given page, creating it if necessary.
*
- * PUBLIC: gint __db_vrfy_getpageinfo
+ * PUBLIC: int __db_vrfy_getpageinfo
* PUBLIC: __P((VRFY_DBINFO *, db_pgno_t, VRFY_PAGEINFO **));
*/
-gint
+int
__db_vrfy_getpageinfo(vdp, pgno, pipp)
VRFY_DBINFO *vdp;
db_pgno_t pgno;
@@ -148,7 +148,7 @@ __db_vrfy_getpageinfo(vdp, pgno, pipp)
DBT key, data;
DB *pgdbp;
VRFY_PAGEINFO *pip;
- gint ret;
+ int ret;
/*
* We want a page info struct. There are three places to get it from,
@@ -210,10 +210,10 @@ found: pip->pi_refcount++;
* __db_vrfy_putpageinfo --
* Put back a VRFY_PAGEINFO that we're done with.
*
- * PUBLIC: gint __db_vrfy_putpageinfo __P((DB_ENV *,
+ * PUBLIC: int __db_vrfy_putpageinfo __P((DB_ENV *,
* PUBLIC: VRFY_DBINFO *, VRFY_PAGEINFO *));
*/
-gint
+int
__db_vrfy_putpageinfo(dbenv, vdp, pip)
DB_ENV *dbenv;
VRFY_DBINFO *vdp;
@@ -222,9 +222,9 @@ __db_vrfy_putpageinfo(dbenv, vdp, pip)
DBT key, data;
DB *pgdbp;
VRFY_PAGEINFO *p;
- gint ret;
+ int ret;
#ifdef DIAGNOSTIC
- gint found;
+ int found;
found = 0;
#endif
@@ -269,16 +269,16 @@ __db_vrfy_putpageinfo(dbenv, vdp, pip)
* (A mapping from page number to int, used by the *_meta2pgset functions,
* as well as for keeping track of which pages the verifier has seen.)
*
- * PUBLIC: gint __db_vrfy_pgset __P((DB_ENV *, u_int32_t, DB **));
+ * PUBLIC: int __db_vrfy_pgset __P((DB_ENV *, u_int32_t, DB **));
*/
-gint
+int
__db_vrfy_pgset(dbenv, pgsize, dbpp)
DB_ENV *dbenv;
u_int32_t pgsize;
DB **dbpp;
{
DB *dbp;
- gint ret;
+ int ret;
if ((ret = db_create(&dbp, dbenv, 0)) != 0)
return (ret);
@@ -298,16 +298,16 @@ err: (void)dbp->close(dbp, 0);
* Get the value associated in a page set with a given pgno. Return
* a 0 value (and succeed) if we've never heard of this page.
*
- * PUBLIC: gint __db_vrfy_pgset_get __P((DB *, db_pgno_t, gint *));
+ * PUBLIC: int __db_vrfy_pgset_get __P((DB *, db_pgno_t, int *));
*/
-gint
+int
__db_vrfy_pgset_get(dbp, pgno, valp)
DB *dbp;
db_pgno_t pgno;
- gint *valp;
+ int *valp;
{
DBT key, data;
- gint ret, val;
+ int ret, val;
memset(&key, 0, sizeof(DBT));
memset(&data, 0, sizeof(DBT));
@@ -334,9 +334,9 @@ __db_vrfy_pgset_get(dbp, pgno, valp)
* __db_vrfy_pgset_inc --
* Increment the value associated with a pgno by 1.
*
- * PUBLIC: gint __db_vrfy_pgset_inc __P((DB *, db_pgno_t));
+ * PUBLIC: int __db_vrfy_pgset_inc __P((DB *, db_pgno_t));
*/
-gint
+int
__db_vrfy_pgset_inc(dbp, pgno)
DB *dbp;
db_pgno_t pgno;
@@ -349,9 +349,9 @@ __db_vrfy_pgset_inc(dbp, pgno)
* __db_vrfy_pgset_dec --
* Increment the value associated with a pgno by 1.
*
- * PUBLIC: gint __db_vrfy_pgset_dec __P((DB *, db_pgno_t));
+ * PUBLIC: int __db_vrfy_pgset_dec __P((DB *, db_pgno_t));
*/
-gint
+int
__db_vrfy_pgset_dec(dbp, pgno)
DB *dbp;
db_pgno_t pgno;
@@ -369,11 +369,11 @@ static int
__db_vrfy_pgset_iinc(dbp, pgno, i)
DB *dbp;
db_pgno_t pgno;
- gint i;
+ int i;
{
DBT key, data;
- gint ret;
- gint val;
+ int ret;
+ int val;
memset(&key, 0, sizeof(DBT));
memset(&data, 0, sizeof(DBT));
@@ -403,16 +403,16 @@ __db_vrfy_pgset_iinc(dbp, pgno, i)
* Given a cursor open in a pgset database, get the next page in the
* set.
*
- * PUBLIC: gint __db_vrfy_pgset_next __P((DBC *, db_pgno_t *));
+ * PUBLIC: int __db_vrfy_pgset_next __P((DBC *, db_pgno_t *));
*/
-gint
+int
__db_vrfy_pgset_next(dbc, pgnop)
DBC *dbc;
db_pgno_t *pgnop;
{
DBT key, data;
db_pgno_t pgno;
- gint ret;
+ int ret;
memset(&key, 0, sizeof(DBT));
memset(&data, 0, sizeof(DBT));
@@ -436,16 +436,16 @@ __db_vrfy_pgset_next(dbc, pgnop)
* Create a cursor to walk the child list with. Returns with a nonzero
* final argument if the specified page has no children.
*
- * PUBLIC: gint __db_vrfy_childcursor __P((VRFY_DBINFO *, DBC **));
+ * PUBLIC: int __db_vrfy_childcursor __P((VRFY_DBINFO *, DBC **));
*/
-gint
+int
__db_vrfy_childcursor(vdp, dbcp)
VRFY_DBINFO *vdp;
DBC **dbcp;
{
DB *cdbp;
DBC *dbc;
- gint ret;
+ int ret;
cdbp = vdp->cdbp;
@@ -459,10 +459,10 @@ __db_vrfy_childcursor(vdp, dbcp)
* __db_vrfy_childput --
* Add a child structure to the set for a given page.
*
- * PUBLIC: gint __db_vrfy_childput
+ * PUBLIC: int __db_vrfy_childput
* PUBLIC: __P((VRFY_DBINFO *, db_pgno_t, VRFY_CHILDINFO *));
*/
-gint
+int
__db_vrfy_childput(vdp, pgno, cip)
VRFY_DBINFO *vdp;
db_pgno_t pgno;
@@ -472,7 +472,7 @@ __db_vrfy_childput(vdp, pgno, cip)
DBC *cc;
DBT key, data;
VRFY_CHILDINFO *oldcip;
- gint ret;
+ int ret;
cdbp = vdp->cdbp;
memset(&key, 0, sizeof(DBT));
@@ -526,16 +526,16 @@ __db_vrfy_childput(vdp, pgno, cip)
* Sets a cursor created with __db_vrfy_childcursor to the first
* child of the given pgno, and returns it in the third arg.
*
- * PUBLIC: gint __db_vrfy_ccset __P((DBC *, db_pgno_t, VRFY_CHILDINFO **));
+ * PUBLIC: int __db_vrfy_ccset __P((DBC *, db_pgno_t, VRFY_CHILDINFO **));
*/
-gint
+int
__db_vrfy_ccset(dbc, pgno, cipp)
DBC *dbc;
db_pgno_t pgno;
VRFY_CHILDINFO **cipp;
{
DBT key, data;
- gint ret;
+ int ret;
memset(&key, 0, sizeof(DBT));
memset(&data, 0, sizeof(DBT));
@@ -558,15 +558,15 @@ __db_vrfy_ccset(dbc, pgno, cipp)
* __db_vrfy_childcursor, and returns it in the memory provided in the
* second arg.
*
- * PUBLIC: gint __db_vrfy_ccnext __P((DBC *, VRFY_CHILDINFO **));
+ * PUBLIC: int __db_vrfy_ccnext __P((DBC *, VRFY_CHILDINFO **));
*/
-gint
+int
__db_vrfy_ccnext(dbc, cipp)
DBC *dbc;
VRFY_CHILDINFO **cipp;
{
DBT key, data;
- gint ret;
+ int ret;
memset(&key, 0, sizeof(DBT));
memset(&data, 0, sizeof(DBT));
@@ -589,9 +589,9 @@ __db_vrfy_ccnext(dbc, cipp)
* and keep the interfaces the same, and a function call here or there
* seldom hurts anyone.
*
- * PUBLIC: gint __db_vrfy_ccclose __P((DBC *));
+ * PUBLIC: int __db_vrfy_ccclose __P((DBC *));
*/
-gint
+int
__db_vrfy_ccclose(dbc)
DBC *dbc;
{
@@ -609,7 +609,7 @@ __db_vrfy_pageinfo_create(dbenv, pgipp)
VRFY_PAGEINFO **pgipp;
{
VRFY_PAGEINFO *pgip;
- gint ret;
+ int ret;
/*
* pageinfo structs are sometimes allocated here and sometimes
@@ -619,7 +619,7 @@ __db_vrfy_pageinfo_create(dbenv, pgipp)
* with __os_ufree.
*/
if ((ret = __os_umalloc(dbenv,
- sizeof(VRFY_PAGEINFO), (gpointer *)&pgip)) != 0)
+ sizeof(VRFY_PAGEINFO), (void **)&pgip)) != 0)
return (ret);
memset(pgip, 0, sizeof(VRFY_PAGEINFO));
@@ -633,14 +633,14 @@ __db_vrfy_pageinfo_create(dbenv, pgipp)
* __db_salvage_init --
* Set up salvager database.
*
- * PUBLIC: gint __db_salvage_init __P((VRFY_DBINFO *));
+ * PUBLIC: int __db_salvage_init __P((VRFY_DBINFO *));
*/
-gint
+int
__db_salvage_init(vdp)
VRFY_DBINFO *vdp;
{
DB *dbp;
- gint ret;
+ int ret;
if ((ret = db_create(&dbp, NULL, 0)) != 0)
return (ret);
@@ -677,10 +677,10 @@ __db_salvage_destroy(vdp)
* print still. Delete entries for any already-printed pages we encounter
* in this search, as well as the page we're returning.
*
- * PUBLIC: gint __db_salvage_getnext
+ * PUBLIC: int __db_salvage_getnext
* PUBLIC: __P((VRFY_DBINFO *, db_pgno_t *, u_int32_t *));
*/
-gint
+int
__db_salvage_getnext(vdp, pgnop, pgtypep)
VRFY_DBINFO *vdp;
db_pgno_t *pgnop;
@@ -689,7 +689,7 @@ __db_salvage_getnext(vdp, pgnop, pgtypep)
DB *dbp;
DBC *dbc;
DBT key, data;
- gint ret;
+ int ret;
u_int32_t pgtype;
dbp = vdp->salvage_pages;
@@ -732,16 +732,16 @@ err: (void)dbc->c_close(dbc);
* Returns DB_KEYEXIST if it is marked, 0 if not, or another error on
* error.
*
- * PUBLIC: gint __db_salvage_isdone __P((VRFY_DBINFO *, db_pgno_t));
+ * PUBLIC: int __db_salvage_isdone __P((VRFY_DBINFO *, db_pgno_t));
*/
-gint
+int
__db_salvage_isdone(vdp, pgno)
VRFY_DBINFO *vdp;
db_pgno_t pgno;
{
DBT key, data;
DB *dbp;
- gint ret;
+ int ret;
u_int32_t currtype;
dbp = vdp->salvage_pages;
@@ -785,16 +785,16 @@ __db_salvage_isdone(vdp, pgno)
* __db_salvage_markdone --
* Mark as done a given page.
*
- * PUBLIC: gint __db_salvage_markdone __P((VRFY_DBINFO *, db_pgno_t));
+ * PUBLIC: int __db_salvage_markdone __P((VRFY_DBINFO *, db_pgno_t));
*/
-gint
+int
__db_salvage_markdone(vdp, pgno)
VRFY_DBINFO *vdp;
db_pgno_t pgno;
{
DBT key, data;
DB *dbp;
- gint pgtype, ret;
+ int pgtype, ret;
u_int32_t currtype;
pgtype = SALVAGE_IGNORE;
@@ -838,10 +838,10 @@ __db_salvage_markdone(vdp, pgno)
* If it has not yet been printed, make note of the fact that a page
* must be dealt with later.
*
- * PUBLIC: gint __db_salvage_markneeded
+ * PUBLIC: int __db_salvage_markneeded
* PUBLIC: __P((VRFY_DBINFO *, db_pgno_t, u_int32_t));
*/
-gint
+int
__db_salvage_markneeded(vdp, pgno, pgtype)
VRFY_DBINFO *vdp;
db_pgno_t pgno;
@@ -849,7 +849,7 @@ __db_salvage_markneeded(vdp, pgno, pgtype)
{
DB *dbp;
DBT key, data;
- gint ret;
+ int ret;
dbp = vdp->salvage_pages;
diff --git a/libdb/db185/db185.c b/libdb/db185/db185.c
index 231a27d..90358d3 100644
--- a/libdb/db185/db185.c
+++ b/libdb/db185/db185.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -31,7 +31,7 @@ static int db185_del __P((const DB185 *, const DBT185 *, u_int));
static int db185_fd __P((const DB185 *));
static int db185_get __P((const DB185 *, const DBT185 *, DBT185 *, u_int));
static u_int32_t
- db185_hash __P((DB *, gconstpointer , u_int32_t));
+ db185_hash __P((DB *, const void *, u_int32_t));
static void db185_openstderr __P((DB_FH *));
static size_t db185_prefix __P((DB *, const DBT *, const DBT *));
static int db185_put __P((const DB185 *, DBT185 *, const DBT185 *, u_int));
@@ -41,18 +41,18 @@ static int db185_sync __P((const DB185 *, u_int));
/*
* EXTERN: #ifdef _DB185_INT_H_
* EXTERN: DB185 *__db185_open
- * EXTERN: __P((const gchar *, int, int, DBTYPE, gconstpointer ));
+ * EXTERN: __P((const char *, int, int, DBTYPE, const void *));
* EXTERN: #else
* EXTERN: DB *__db185_open
- * EXTERN: __P((const gchar *, int, int, DBTYPE, gconstpointer ));
+ * EXTERN: __P((const char *, int, int, DBTYPE, const void *));
* EXTERN: #endif
*/
DB185 *
__db185_open(file, oflags, mode, type, openinfo)
- const gchar *file;
- gint oflags, mode;
+ const char *file;
+ int oflags, mode;
DBTYPE type;
- gconstpointer openinfo;
+ const void *openinfo;
{
const BTREEINFO *bi;
const HASHINFO *hi;
@@ -61,7 +61,7 @@ __db185_open(file, oflags, mode, type, openinfo)
DB185 *db185p;
DB_FH fh;
size_t nw;
- gint ret;
+ int ret;
dbp = NULL;
db185p = NULL;
@@ -260,7 +260,7 @@ db185_close(db185p)
DB185 *db185p;
{
DB *dbp;
- gint ret;
+ int ret;
dbp = db185p->dbp;
@@ -285,7 +285,7 @@ db185_del(db185p, key185, flags)
{
DB *dbp;
DBT key;
- gint ret;
+ int ret;
dbp = db185p->dbp;
@@ -318,7 +318,7 @@ db185_fd(db185p)
const DB185 *db185p;
{
DB *dbp;
- gint fd, ret;
+ int fd, ret;
dbp = db185p->dbp;
@@ -340,7 +340,7 @@ db185_get(db185p, key185, data185, flags)
{
DB *dbp;
DBT key, data;
- gint ret;
+ int ret;
dbp = db185p->dbp;
@@ -379,7 +379,7 @@ db185_put(db185p, key185, data185, flags)
DB *dbp;
DBC *dbcp_put;
DBT key, data;
- gint ret, t_ret;
+ int ret, t_ret;
dbp = db185p->dbp;
@@ -454,7 +454,7 @@ db185_seq(db185p, key185, data185, flags)
{
DB *dbp;
DBT key, data;
- gint ret;
+ int ret;
dbp = db185p->dbp;
@@ -513,7 +513,7 @@ db185_sync(db185p, flags)
DB *dbp;
DB_FH fh;
size_t nw;
- gint ret;
+ int ret;
dbp = db185p->dbp;
@@ -587,7 +587,7 @@ db185_prefix(dbp, a, b)
static u_int32_t
db185_hash(dbp, key, len)
DB *dbp;
- gconstpointer key;
+ const void *key;
u_int32_t len;
{
return (((DB185 *)dbp->api_internal)->hash(key, (size_t)len));
diff --git a/libdb/db_archive/db_archive.c b/libdb/db_archive/db_archive.c
index 51938c9..6ef6ccf 100644
--- a/libdb/db_archive/db_archive.c
+++ b/libdb/db_archive/db_archive.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -25,22 +25,22 @@ static const gchar revid[] =
#include "db_int.h"
-gint main __P((int, gchar *[]));
-gint usage __P((void));
-gint version_check __P((const gchar *));
+int main __P((int, char *[]));
+int usage __P((void));
+int version_check __P((const char *));
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
- const gchar *progname = "db_archive";
+ extern char *optarg;
+ extern int optind;
+ const char *progname = "db_archive";
DB_ENV *dbenv;
u_int32_t flags;
- gint ch, e_close, exitval, ret, verbose;
- gchar **file, *home, **list, *passwd;
+ int ch, e_close, exitval, ret, verbose;
+ char **file, *home, **list, *passwd;
if ((ret = version_check(progname)) != 0)
return (ret);
@@ -152,7 +152,7 @@ shutdown: exitval = 1;
return (exitval == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
-gint
+int
usage()
{
(void)fprintf(stderr,
@@ -160,11 +160,11 @@ usage()
return (EXIT_FAILURE);
}
-gint
+int
version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/db_checkpoint/db_checkpoint.c b/libdb/db_checkpoint/db_checkpoint.c
index 706d1ea..7ae7d7e 100644
--- a/libdb/db_checkpoint/db_checkpoint.c
+++ b/libdb/db_checkpoint/db_checkpoint.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -39,24 +39,24 @@ static const gchar revid[] =
#include "dbinc/db_page.h"
#include "dbinc/db_am.h"
-int main __P((int, gchar *[]));
+int main __P((int, char *[]));
int usage __P((void));
-int version_check __P((const gchar *));
+int version_check __P((const char *));
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
+ extern char *optarg;
+ extern int optind;
DB_ENV *dbenv;
- const gchar *progname = "db_checkpoint";
+ const char *progname = "db_checkpoint";
time_t now;
long argval;
u_int32_t flags, kbytes, minutes, seconds;
- gint ch, e_close, exitval, once, ret, verbose;
- gchar *home, *logfile, *passwd;
+ int ch, e_close, exitval, once, ret, verbose;
+ char *home, *logfile, *passwd;
if ((ret = version_check(progname)) != 0)
return (ret);
@@ -214,7 +214,7 @@ shutdown: exitval = 1;
return (exitval == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
-gint
+int
usage()
{
(void)fprintf(stderr, "%s\n\t%s\n",
@@ -223,11 +223,11 @@ usage()
return (EXIT_FAILURE);
}
-gint
+int
version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/db_deadlock/db_deadlock.c b/libdb/db_deadlock/db_deadlock.c
index 1fb1a67..71faf14 100644
--- a/libdb/db_deadlock/db_deadlock.c
+++ b/libdb/db_deadlock/db_deadlock.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -37,24 +37,24 @@ static const gchar revid[] =
#include "db_int.h"
-gint main __P((int, gchar *[]));
-gint usage __P((void));
-gint version_check __P((const gchar *));
+int main __P((int, char *[]));
+int usage __P((void));
+int version_check __P((const char *));
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
- const gchar *progname = "db_deadlock";
+ extern char *optarg;
+ extern int optind;
+ const char *progname = "db_deadlock";
DB_ENV *dbenv;
u_int32_t atype;
time_t now;
long secs, usecs;
- gint ch, e_close, exitval, ret, verbose;
- gchar *home, *logfile, *str;
+ int ch, e_close, exitval, ret, verbose;
+ char *home, *logfile, *str;
if ((ret = version_check(progname)) != 0)
return (ret);
@@ -205,7 +205,7 @@ shutdown: exitval = 1;
return (exitval == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
-gint
+int
usage()
{
(void)fprintf(stderr, "%s\n\t%s\n",
@@ -214,11 +214,11 @@ usage()
return (EXIT_FAILURE);
}
-gint
+int
version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/db_dump/db_dump.c b/libdb/db_dump/db_dump.c
index bbafa92..7f0d783 100644
--- a/libdb/db_dump/db_dump.c
+++ b/libdb/db_dump/db_dump.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -27,30 +27,30 @@ static const gchar revid[] =
#include "dbinc/db_page.h"
#include "dbinc/db_am.h"
-int db_init __P((DB_ENV *, gchar *, int, u_int32_t, gint *));
+int db_init __P((DB_ENV *, char *, int, u_int32_t, int *));
int dump __P((DB *, int, int));
-int dump_sub __P((DB_ENV *, DB *, gchar *, int, int));
-int is_sub __P((DB *, gint *));
-int main __P((int, gchar *[]));
+int dump_sub __P((DB_ENV *, DB *, char *, int, int));
+int is_sub __P((DB *, int *));
+int main __P((int, char *[]));
int show_subs __P((DB *));
int usage __P((void));
-int version_check __P((const gchar *));
+int version_check __P((const char *));
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
- const gchar *progname = "db_dump";
+ extern char *optarg;
+ extern int optind;
+ const char *progname = "db_dump";
DB_ENV *dbenv;
DB *dbp;
u_int32_t cache;
- gint ch, d_close;
- gint e_close, exitval, keyflag, lflag, nflag, pflag, private;
- gint ret, Rflag, rflag, resize, subs;
- gchar *dopt, *home, *passwd, *subname;
+ int ch, d_close;
+ int e_close, exitval, keyflag, lflag, nflag, pflag, private;
+ int ret, Rflag, rflag, resize, subs;
+ char *dopt, *home, *passwd, *subname;
if ((ret = version_check(progname)) != 0)
return (ret);
@@ -274,15 +274,15 @@ done: if (d_close && (ret = dbp->close(dbp, 0)) != 0) {
* db_init --
* Initialize the environment.
*/
-gint
+int
db_init(dbenv, home, is_salvage, cache, is_privatep)
DB_ENV *dbenv;
- gchar *home;
- gint is_salvage;
+ char *home;
+ int is_salvage;
u_int32_t cache;
- gint *is_privatep;
+ int *is_privatep;
{
- gint ret;
+ int ret;
/*
* Try and use the underlying environment when opening a database.
@@ -332,14 +332,14 @@ db_init(dbenv, home, is_salvage, cache, is_privatep)
* is_sub --
* Return if the database contains subdatabases.
*/
-gint
+int
is_sub(dbp, yesno)
DB *dbp;
- gint *yesno;
+ int *yesno;
{
DB_BTREE_STAT *btsp;
DB_HASH_STAT *hsp;
- gint ret;
+ int ret;
switch (dbp->type) {
case DB_BTREE:
@@ -372,18 +372,18 @@ is_sub(dbp, yesno)
* dump_sub --
* Dump out the records for a DB containing subdatabases.
*/
-gint
+int
dump_sub(dbenv, parent_dbp, parent_name, pflag, keyflag)
DB_ENV *dbenv;
DB *parent_dbp;
- gchar *parent_name;
- gint pflag, keyflag;
+ char *parent_name;
+ int pflag, keyflag;
{
DB *dbp;
DBC *dbcp;
DBT key, data;
- gint ret;
- gchar *subdb;
+ int ret;
+ char *subdb;
/*
* Get a cursor and step through the database, dumping out each
@@ -442,13 +442,13 @@ dump_sub(dbenv, parent_dbp, parent_name, pflag, keyflag)
* show_subs --
* Display the subdatabases for a database.
*/
-gint
+int
show_subs(dbp)
DB *dbp;
{
DBC *dbcp;
DBT key, data;
- gint ret;
+ int ret;
/*
* Get a cursor and step through the database, printing out the key
@@ -484,17 +484,17 @@ show_subs(dbp)
* dump --
* Dump out the records for a DB.
*/
-gint
+int
dump(dbp, pflag, keyflag)
DB *dbp;
- gint pflag, keyflag;
+ int pflag, keyflag;
{
DBC *dbcp;
DBT key, data;
DBT keyret, dataret;
db_recno_t recno;
- gint is_recno, failed, ret;
- gpointer pointer;
+ int is_recno, failed, ret;
+ void *pointer;
/*
* Get a cursor and step through the database, printing out each
@@ -582,7 +582,7 @@ err: if (data.data != NULL)
* usage --
* Display the usage message.
*/
-gint
+int
usage()
{
(void)fprintf(stderr, "%s\n\t%s\n",
@@ -591,11 +591,11 @@ usage()
return (EXIT_FAILURE);
}
-gint
+int
version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/db_dump185/db_dump185.c b/libdb/db_dump185/db_dump185.c
index fb19861..7ae3288 100644
--- a/libdb/db_dump185/db_dump185.c
+++ b/libdb/db_dump185/db_dump185.c
@@ -6,9 +6,9 @@
*/
#ifndef lint
-static gchar copyright[] =
+static char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static gchar revid[] =
+static char revid[] =
"$Id$";
#endif
@@ -69,7 +69,7 @@ typedef struct hashhdr186 { /* Disk resident portion */
u_int16_t bitmaps[NCACHED];
} HASHHDR186;
typedef struct htab186 { /* Memory resident data structure */
- gpointer unused[2];
+ void *unused[2];
HASHHDR186 hdr; /* Header */
} HTAB186;
@@ -172,19 +172,19 @@ void db_btree __P((DB *, int));
void db_hash __P((DB *, int));
void dbt_dump __P((DBT *));
void dbt_print __P((DBT *));
-int main __P((int, gchar *[]));
+int main __P((int, char *[]));
int usage __P((void));
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
+ extern char *optarg;
+ extern int optind;
DB *dbp;
DBT key, data;
- gint ch, pflag, rval;
+ int ch, pflag, rval;
pflag = 0;
while ((ch = getopt(argc, argv, "f:p")) != EOF)
@@ -250,7 +250,7 @@ main(argc, argv)
void
db_hash(dbp, pflag)
DB *dbp;
- gint pflag;
+ int pflag;
{
HTAB185 *hash185p;
HTAB186 *hash186p;
@@ -282,7 +282,7 @@ db_hash(dbp, pflag)
void
db_btree(dbp, pflag)
DB *dbp;
- gint pflag;
+ int pflag;
{
BTREE *btp;
@@ -302,7 +302,7 @@ db_btree(dbp, pflag)
printf("HEADER=END\n");
}
-static gchar hex[] = "0123456789abcdef";
+static char hex[] = "0123456789abcdef";
/*
* dbt_dump --
@@ -347,7 +347,7 @@ dbt_print(dbtp)
* usage --
* Display the usage message.
*/
-gint
+int
usage()
{
(void)fprintf(stderr, "usage: db_dump185 [-p] [-f file] db_file\n");
diff --git a/libdb/db_load/db_load.c b/libdb/db_load/db_load.c
index 28b4c2c..eaa8845 100644
--- a/libdb/db_load/db_load.c
+++ b/libdb/db_load/db_load.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -29,7 +29,7 @@ static const gchar revid[] =
#include "dbinc/db_am.h"
typedef struct { /* XXX: Globals. */
- const gchar *progname; /* Program name. */
+ const char *progname; /* Program name. */
char *hdrbuf; /* Input file header. */
u_long lineno; /* Input file line number. */
u_long origline; /* Original file line number. */
@@ -44,19 +44,19 @@ typedef struct { /* XXX: Globals. */
void badend __P((DB_ENV *));
void badnum __P((DB_ENV *));
-int configure __P((DB_ENV *, DB *, gchar **, gchar **, gint *));
-int convprintable __P((DB_ENV *, gchar *, gchar **));
-int db_init __P((DB_ENV *, gchar *, u_int32_t, gint *));
+int configure __P((DB_ENV *, DB *, char **, char **, int *));
+int convprintable __P((DB_ENV *, char *, char **));
+int db_init __P((DB_ENV *, char *, u_int32_t, int *));
int dbt_rdump __P((DB_ENV *, DBT *));
int dbt_rprint __P((DB_ENV *, DBT *));
int dbt_rrecno __P((DB_ENV *, DBT *, int));
-int digitize __P((DB_ENV *, int, gint *));
+int digitize __P((DB_ENV *, int, int *));
int env_create __P((DB_ENV **, LDG *));
-int load __P((DB_ENV *, gchar *, DBTYPE, gchar **, u_int, LDG *, gint *));
-int main __P((int, gchar *[]));
-int rheader __P((DB_ENV *, DB *, DBTYPE *, gchar **, gint *, gint *));
+int load __P((DB_ENV *, char *, DBTYPE, char **, u_int, LDG *, int *));
+int main __P((int, char *[]));
+int rheader __P((DB_ENV *, DB *, DBTYPE *, char **, int *, int *));
int usage __P((void));
-int version_check __P((const gchar *));
+int version_check __P((const char *));
#define G(f) ((LDG *)dbenv->app_private)->f
@@ -65,19 +65,19 @@ int version_check __P((const gchar *));
#define LDF_NOOVERWRITE 0x02 /* Don't overwrite existing rows. */
#define LDF_PASSWORD 0x04 /* Encrypt created databases. */
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
+ extern char *optarg;
+ extern int optind;
DBTYPE dbtype;
DB_ENV *dbenv;
LDG ldg;
u_int32_t ldf;
- gint ch, existed, exitval, ret;
- gchar **clist, **clp;
+ int ch, existed, exitval, ret;
+ char **clist, **clp;
ldg.progname = "db_load";
ldg.lineno = 0;
@@ -96,7 +96,7 @@ main(argc, argv)
dbtype = DB_UNKNOWN;
/* Allocate enough room for configuration arguments. */
- if ((clp = clist = (gchar **)calloc(argc + 1, sizeof(gchar *))) == NULL) {
+ if ((clp = clist = (char **)calloc(argc + 1, sizeof(char *))) == NULL) {
fprintf(stderr, "%s: %s\n", ldg.progname, strerror(ENOMEM));
return (EXIT_FAILURE);
}
@@ -205,14 +205,14 @@ shutdown: exitval = 1;
* load --
* Load a database.
*/
-gint
+int
load(dbenv, name, argtype, clist, flags, ldg, existedp)
DB_ENV *dbenv;
- gchar *name, **clist;
+ char *name, **clist;
DBTYPE argtype;
u_int flags;
LDG *ldg;
- gint *existedp;
+ int *existedp;
{
DB *dbp;
DBT key, rkey, data, *readp, *writep;
@@ -220,8 +220,8 @@ load(dbenv, name, argtype, clist, flags, ldg, existedp)
DB_TXN *ctxn, *txn;
db_recno_t recno, datarecno;
u_int32_t put_flags;
- gint ascii_recno, checkprint, hexkeys, keyflag, keys, resize, ret, rval;
- gchar *subdb;
+ int ascii_recno, checkprint, hexkeys, keyflag, keys, resize, ret, rval;
+ char *subdb;
*existedp = 0;
@@ -365,11 +365,11 @@ retry_db:
key.data = &recno;
} else
key_data: if ((readp->data =
- (gpointer)malloc(readp->ulen = 1024)) == NULL) {
+ (void *)malloc(readp->ulen = 1024)) == NULL) {
dbenv->err(dbenv, ENOMEM, NULL);
goto err;
}
- if ((data.data = (gpointer)malloc(data.ulen = 1024)) == NULL) {
+ if ((data.data = (void *)malloc(data.ulen = 1024)) == NULL) {
dbenv->err(dbenv, ENOMEM, NULL);
goto err;
}
@@ -503,15 +503,15 @@ err: rval = 1;
* db_init --
* Initialize the environment.
*/
-gint
+int
db_init(dbenv, home, cache, is_private)
DB_ENV *dbenv;
- gchar *home;
+ char *home;
u_int32_t cache;
- gint *is_private;
+ int *is_private;
{
u_int32_t flags;
- gint ret;
+ int ret;
*is_private = 0;
/* We may be loading into a live environment. Try and join. */
@@ -585,16 +585,16 @@ db_init(dbenv, home, cache, is_private)
* configure --
* Handle command-line configuration options.
*/
-gint
+int
configure(dbenv, dbp, clp, subdbp, keysp)
DB_ENV *dbenv;
DB *dbp;
- gchar **clp, **subdbp;
- gint *keysp;
+ char **clp, **subdbp;
+ int *keysp;
{
long val;
- gint ret, savech;
- gchar *name, *value;
+ int ret, savech;
+ char *name, *value;
for (; (name = *clp) != NULL; *--value = savech, ++clp) {
if ((value = strchr(name, '=')) == NULL) {
@@ -658,17 +658,17 @@ nameerr:
* rheader --
* Read the header message.
*/
-gint
+int
rheader(dbenv, dbp, dbtypep, subdbp, checkprintp, keysp)
DB_ENV *dbenv;
DB *dbp;
DBTYPE *dbtypep;
- gchar **subdbp;
- gint *checkprintp, *keysp;
+ char **subdbp;
+ int *checkprintp, *keysp;
{
long val;
- gint ch, first, hdr, linelen, buflen, ret, start;
- gchar *buf, *name, *p, *value;
+ int ch, first, hdr, linelen, buflen, ret, start;
+ char *buf, *name, *p, *value;
*dbtypep = DB_UNKNOWN;
*checkprintp = 0;
@@ -681,7 +681,7 @@ rheader(dbenv, dbp, dbtypep, subdbp, checkprintp, keysp)
buflen = 4096;
if (G(hdrbuf) == NULL) {
hdr = 0;
- if ((buf = (gchar *)malloc(buflen)) == NULL) {
+ if ((buf = (char *)malloc(buflen)) == NULL) {
memerr: dbp->errx(dbp, "could not allocate buffer %d", buflen);
return (1);
}
@@ -716,7 +716,7 @@ memerr: dbp->errx(dbp, "could not allocate buffer %d", buflen);
/* If the buffer is too small, double it. */
if (linelen + start == buflen) {
- G(hdrbuf) = (gchar *)realloc(G(hdrbuf),
+ G(hdrbuf) = (char *)realloc(G(hdrbuf),
buflen *= 2);
if (G(hdrbuf) == NULL)
goto memerr;
@@ -866,23 +866,23 @@ badfmt:
* allocations that aren't likely to be a problem here), and this has fewer
* special cases to deal with.
*
- * Note that despite the printable encoding, the gchar * interface to this
+ * Note that despite the printable encoding, the char * interface to this
* function (which is, not coincidentally, also used for database naming)
* means that outstr cannot contain any nuls.
*/
-gint
+int
convprintable(dbenv, instr, outstrp)
DB_ENV *dbenv;
- gchar *instr, **outstrp;
+ char *instr, **outstrp;
{
- gchar c, *outstr;
- gint e1, e2;
+ char c, *outstr;
+ int e1, e2;
/*
* Just malloc a string big enough for the whole input string;
* the output string will be smaller (or of equal length).
*/
- if ((outstr = (gchar *)malloc(strlen(instr))) == NULL)
+ if ((outstr = (char *)malloc(strlen(instr))) == NULL)
return (ENOMEM);
*outstrp = outstr;
@@ -914,15 +914,15 @@ convprintable(dbenv, instr, outstrp)
* dbt_rprint --
* Read a printable line into a DBT structure.
*/
-gint
+int
dbt_rprint(dbenv, dbtp)
DB_ENV *dbenv;
DBT *dbtp;
{
u_int32_t len;
u_int8_t *p;
- gint c1, c2, e, escape, first;
- gchar buf[32];
+ int c1, c2, e, escape, first;
+ char buf[32];
++G(lineno);
@@ -974,7 +974,7 @@ dbt_rprint(dbenv, dbtp)
if (len >= dbtp->ulen - 10) {
dbtp->ulen *= 2;
if ((dbtp->data =
- (gpointer)realloc(dbtp->data, dbtp->ulen)) == NULL) {
+ (void *)realloc(dbtp->data, dbtp->ulen)) == NULL) {
dbenv->err(dbenv, ENOMEM, NULL);
return (1);
}
@@ -992,15 +992,15 @@ dbt_rprint(dbenv, dbtp)
* dbt_rdump --
* Read a byte dump line into a DBT structure.
*/
-gint
+int
dbt_rdump(dbenv, dbtp)
DB_ENV *dbenv;
DBT *dbtp;
{
u_int32_t len;
u_int8_t *p;
- gint c1, c2, e, first;
- gchar buf[32];
+ int c1, c2, e, first;
+ char buf[32];
++G(lineno);
@@ -1039,7 +1039,7 @@ dbt_rdump(dbenv, dbtp)
if (len >= dbtp->ulen - 10) {
dbtp->ulen *= 2;
if ((dbtp->data =
- (gpointer)realloc(dbtp->data, dbtp->ulen)) == NULL) {
+ (void *)realloc(dbtp->data, dbtp->ulen)) == NULL) {
dbenv->err(dbenv, ENOMEM, NULL);
return (1);
}
@@ -1059,13 +1059,13 @@ dbt_rdump(dbenv, dbtp)
* dbt_rrecno --
* Read a record number dump line into a DBT structure.
*/
-gint
+int
dbt_rrecno(dbenv, dbtp, ishex)
DB_ENV *dbenv;
DBT *dbtp;
- gint ishex;
+ int ishex;
{
- gchar buf[32], *p, *q;
+ char buf[32], *p, *q;
++G(lineno);
@@ -1118,10 +1118,10 @@ bad: badend(dbenv);
* digitize --
* Convert a character to an integer.
*/
-gint
+int
digitize(dbenv, c, errorp)
DB_ENV *dbenv;
- gint c, *errorp;
+ int c, *errorp;
{
switch (c) { /* Don't depend on ASCII ordering. */
case '0': return (0);
@@ -1175,7 +1175,7 @@ badend(dbenv)
* usage --
* Display the usage message.
*/
-gint
+int
usage()
{
(void)fprintf(stderr, "%s\n\t%s\n",
@@ -1184,11 +1184,11 @@ usage()
return (EXIT_FAILURE);
}
-gint
+int
version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
@@ -1203,13 +1203,13 @@ version_check(progname)
return (0);
}
-gint
+int
env_create(dbenvp, ldg)
DB_ENV **dbenvp;
LDG *ldg;
{
DB_ENV *dbenv;
- gint ret;
+ int ret;
if ((ret = db_env_create(dbenvp, 0)) != 0) {
fprintf(stderr,
diff --git a/libdb/db_printlog/db_printlog.c b/libdb/db_printlog/db_printlog.c
index 6ca5bdd..23d7d38 100644
--- a/libdb/db_printlog/db_printlog.c
+++ b/libdb/db_printlog/db_printlog.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -34,30 +34,30 @@ static const gchar revid[] =
#include "dbinc/rep.h"
#include "dbinc/txn.h"
-gint main __P((int, gchar *[]));
-gint usage __P((void));
-gint version_check __P((const gchar *));
-gint print_app_record __P((DB_ENV *, DBT *, DB_LSN *, db_recops));
-gint open_rep_db __P((DB_ENV *, DB **, DBC **));
+int main __P((int, char *[]));
+int usage __P((void));
+int version_check __P((const char *));
+int print_app_record __P((DB_ENV *, DBT *, DB_LSN *, db_recops));
+int open_rep_db __P((DB_ENV *, DB **, DBC **));
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
- const gchar *progname = "db_printlog";
+ extern char *optarg;
+ extern int optind;
+ const char *progname = "db_printlog";
DB *dbp;
DBC *dbc;
DB_ENV *dbenv;
DB_LOGC *logc;
- gint (**dtab) __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (**dtab) __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t dtabsize;
DBT data, keydbt;
DB_LSN key;
- gint ch, e_close, exitval, nflag, rflag, ret, repflag;
- gchar *home, *passwd;
+ int ch, e_close, exitval, nflag, rflag, ret, repflag;
+ char *home, *passwd;
if ((ret = version_check(progname)) != 0)
return (ret);
@@ -259,7 +259,7 @@ shutdown: exitval = 1;
return (exitval == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
-gint
+int
usage()
{
fprintf(stderr, "%s\n",
@@ -267,11 +267,11 @@ usage()
return (EXIT_FAILURE);
}
-gint
+int
version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
@@ -287,14 +287,14 @@ version_check(progname)
}
/* Print an unknown, application-specific log record as best we can. */
-gint
+int
print_app_record(dbenv, dbt, lsnp, op)
DB_ENV *dbenv;
DBT *dbt;
DB_LSN *lsnp;
db_recops op;
{
- gint ch;
+ int ch;
u_int32_t i, rectype;
DB_ASSERT(op == DB_TXN_PRINT);
@@ -323,13 +323,13 @@ print_app_record(dbenv, dbt, lsnp, op)
return (0);
}
-gint
+int
open_rep_db(dbenv, dbpp, dbcp)
DB_ENV *dbenv;
DB **dbpp;
DBC **dbcp;
{
- gint ret;
+ int ret;
DB *dbp;
*dbpp = NULL;
diff --git a/libdb/db_recover/db_recover.c b/libdb/db_recover/db_recover.c
index dfa6cd6..6432f4e 100644
--- a/libdb/db_recover/db_recover.c
+++ b/libdb/db_recover/db_recover.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -36,25 +36,25 @@ static const gchar revid[] =
#include "db_int.h"
#include "dbinc/txn.h"
-gint main __P((int, gchar *[]));
-gint read_timestamp __P((const gchar *, gchar *, time_t *));
-gint usage __P((void));
-gint version_check __P((const gchar *));
+int main __P((int, char *[]));
+int read_timestamp __P((const char *, char *, time_t *));
+int usage __P((void));
+int version_check __P((const char *));
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
- const gchar *progname = "db_recover";
+ extern char *optarg;
+ extern int optind;
+ const char *progname = "db_recover";
DB_ENV *dbenv;
DB_TXNREGION *region;
time_t now, timestamp;
u_int32_t flags;
- gint ch, exitval, fatal_recover, ret, retain_env, verbose;
- gchar *home, *passwd;
+ int ch, exitval, fatal_recover, ret, retain_env, verbose;
+ char *home, *passwd;
if ((ret = version_check(progname)) != 0)
return (ret);
@@ -215,16 +215,16 @@ shutdown: exitval = 1;
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-gint
+int
read_timestamp(progname, arg, timep)
- const gchar *progname;
- gchar *arg;
+ const char *progname;
+ char *arg;
time_t *timep;
{
struct tm *t;
time_t now;
- gint yearset;
- gchar *p;
+ int yearset;
+ char *p;
/* Start with the current time. */
(void)time(&now);
if ((t = localtime(&now)) == NULL) {
@@ -285,7 +285,7 @@ terr: fprintf(stderr,
return (0);
}
-gint
+int
usage()
{
(void)fprintf(stderr, "%s\n",
@@ -293,11 +293,11 @@ usage()
return (EXIT_FAILURE);
}
-gint
+int
version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/db_stat/db_stat.c b/libdb/db_stat/db_stat.c
index e01da8c..4676e8a 100644
--- a/libdb/db_stat/db_stat.c
+++ b/libdb/db_stat/db_stat.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -44,41 +44,41 @@ static const gchar revid[] =
typedef enum { T_NOTSET,
T_DB, T_ENV, T_LOCK, T_LOG, T_MPOOL, T_REP, T_TXN } test_t;
-int argcheck __P((gchar *, const gchar *));
+int argcheck __P((char *, const char *));
int btree_stats __P((DB_ENV *, DB *, DB_BTREE_STAT *, int));
-int db_init __P((DB_ENV *, gchar *, test_t, u_int32_t, gint *));
-void dl __P((const gchar *, u_long));
-void dl_bytes __P((const gchar *, u_long, u_long, u_long));
+int db_init __P((DB_ENV *, char *, test_t, u_int32_t, int *));
+void dl __P((const char *, u_long));
+void dl_bytes __P((const char *, u_long, u_long, u_long));
int env_stats __P((DB_ENV *, u_int32_t));
int hash_stats __P((DB_ENV *, DB *, int));
-int lock_stats __P((DB_ENV *, gchar *, u_int32_t));
+int lock_stats __P((DB_ENV *, char *, u_int32_t));
int log_stats __P((DB_ENV *, u_int32_t));
-int main __P((int, gchar *[]));
-int mpool_stats __P((DB_ENV *, gchar *, u_int32_t));
+int main __P((int, char *[]));
+int mpool_stats __P((DB_ENV *, char *, u_int32_t));
void prflags __P((u_int32_t, const FN *));
int queue_stats __P((DB_ENV *, DB *, int));
int rep_stats __P((DB_ENV *, u_int32_t));
-int txn_compare __P((gconstpointer , gconstpointer ));
+int txn_compare __P((const void *, const void *));
int txn_stats __P((DB_ENV *, u_int32_t));
int usage __P((void));
-int version_check __P((const gchar *));
+int version_check __P((const char *));
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
- const gchar *progname = "db_stat";
+ extern char *optarg;
+ extern int optind;
+ const char *progname = "db_stat";
DB_ENV *dbenv;
DB_BTREE_STAT *sp;
DB *alt_dbp, *dbp;
test_t ttype;
u_int32_t cache;
- gint ch, checked, d_close, e_close, exitval, fast, flags;
- gint nflag, private, resize, ret;
- gchar *db, *home, *internal, *passwd, *subdb;
+ int ch, checked, d_close, e_close, exitval, fast, flags;
+ int nflag, private, resize, ret;
+ char *db, *home, *internal, *passwd, *subdb;
if ((ret = version_check(progname)) != 0)
return (ret);
@@ -374,15 +374,15 @@ shutdown: exitval = 1;
* env_stats --
* Display environment statistics.
*/
-gint
+int
env_stats(dbenv, flags)
DB_ENV *dbenv;
u_int32_t flags;
{
REGENV renv;
REGION *rp, regs[1024];
- gint n, ret;
- const gchar *lable;
+ int n, ret;
+ const char *lable;
n = sizeof(regs) / sizeof(regs[0]);
if ((ret = __db_e_stat(dbenv, &renv, regs, &n, flags)) != 0) {
@@ -446,12 +446,12 @@ env_stats(dbenv, flags)
* btree_stats --
* Display btree/recno statistics.
*/
-gint
+int
btree_stats(dbenv, dbp, msp, fast)
DB_ENV *dbenv;
DB *dbp;
DB_BTREE_STAT *msp;
- gint fast;
+ int fast;
{
static const FN fn[] = {
{ BTM_DUP, "duplicates" },
@@ -463,7 +463,7 @@ btree_stats(dbenv, dbp, msp, fast)
{ 0, NULL }
};
DB_BTREE_STAT *sp;
- gint ret;
+ int ret;
COMPQUIET(dbenv, NULL);
@@ -534,11 +534,11 @@ btree_stats(dbenv, dbp, msp, fast)
* hash_stats --
* Display hash statistics.
*/
-gint
+int
hash_stats(dbenv, dbp, fast)
DB_ENV *dbenv;
DB *dbp;
- gint fast;
+ int fast;
{
static const FN fn[] = {
{ DB_HASH_DUP, "duplicates" },
@@ -546,7 +546,7 @@ hash_stats(dbenv, dbp, fast)
{ 0, NULL }
};
DB_HASH_STAT *sp;
- gint ret;
+ int ret;
COMPQUIET(dbenv, NULL);
@@ -597,14 +597,14 @@ hash_stats(dbenv, dbp, fast)
* queue_stats --
* Display queue statistics.
*/
-gint
+int
queue_stats(dbenv, dbp, fast)
DB_ENV *dbenv;
DB *dbp;
- gint fast;
+ int fast;
{
DB_QUEUE_STAT *sp;
- gint ret;
+ int ret;
COMPQUIET(dbenv, NULL);
@@ -642,14 +642,14 @@ queue_stats(dbenv, dbp, fast)
* lock_stats --
* Display lock statistics.
*/
-gint
+int
lock_stats(dbenv, internal, flags)
DB_ENV *dbenv;
- gchar *internal;
+ char *internal;
u_int32_t flags;
{
DB_LOCK_STAT *sp;
- gint ret;
+ int ret;
if (internal != NULL) {
if ((ret =
@@ -713,13 +713,13 @@ lock_stats(dbenv, internal, flags)
* log_stats --
* Display log statistics.
*/
-gint
+int
log_stats(dbenv, flags)
DB_ENV *dbenv;
u_int32_t flags;
{
DB_LOG_STAT *sp;
- gint ret;
+ int ret;
if ((ret = dbenv->log_stat(dbenv, &sp, flags)) != 0) {
dbenv->err(dbenv, ret, NULL);
@@ -772,15 +772,15 @@ log_stats(dbenv, flags)
* mpool_stats --
* Display mpool statistics.
*/
-gint
+int
mpool_stats(dbenv, internal, flags)
DB_ENV *dbenv;
- gchar *internal;
+ char *internal;
u_int32_t flags;
{
DB_MPOOL_FSTAT **fsp;
DB_MPOOL_STAT *gsp;
- gint ret;
+ int ret;
if (internal != NULL) {
if ((ret =
@@ -887,14 +887,14 @@ mpool_stats(dbenv, internal, flags)
* rep_stats --
* Display replication statistics.
*/
-gint
+int
rep_stats(dbenv, flags)
DB_ENV *dbenv;
u_int32_t flags;
{
DB_REP_STAT *sp;
- gint is_client, ret;
- const gchar *p;
+ int is_client, ret;
+ const char *p;
if ((ret = dbenv->rep_stat(dbenv, &sp, flags)) != 0) {
dbenv->err(dbenv, ret, NULL);
@@ -1002,15 +1002,15 @@ rep_stats(dbenv, flags)
* txn_stats --
* Display transaction statistics.
*/
-gint
+int
txn_stats(dbenv, flags)
DB_ENV *dbenv;
u_int32_t flags;
{
DB_TXN_STAT *sp;
u_int32_t i;
- gint ret;
- const gchar *p;
+ int ret;
+ const char *p;
if ((ret = dbenv->txn_stat(dbenv, &sp, flags)) != 0) {
dbenv->err(dbenv, ret, NULL);
@@ -1063,9 +1063,9 @@ txn_stats(dbenv, flags)
return (0);
}
-gint
+int
txn_compare(a1, b1)
- gconstpointer a1, *b1;
+ const void *a1, *b1;
{
const DB_TXN_ACTIVE *a, *b;
@@ -1085,7 +1085,7 @@ txn_compare(a1, b1)
*/
void
dl(msg, value)
- const gchar *msg;
+ const char *msg;
u_long value;
{
/*
@@ -1104,10 +1104,10 @@ dl(msg, value)
*/
void
dl_bytes(msg, gbytes, mbytes, bytes)
- const gchar *msg;
+ const char *msg;
u_long gbytes, mbytes, bytes;
{
- const gchar *sep;
+ const char *sep;
/* Normalize the values. */
while (bytes >= MEGABYTE) {
@@ -1148,7 +1148,7 @@ prflags(flags, fnp)
u_int32_t flags;
const FN *fnp;
{
- const gchar *sep;
+ const char *sep;
sep = "\t";
printf("Flags:");
@@ -1164,16 +1164,16 @@ prflags(flags, fnp)
* db_init --
* Initialize the environment.
*/
-gint
+int
db_init(dbenv, home, ttype, cache, is_private)
DB_ENV *dbenv;
- gchar *home;
+ char *home;
test_t ttype;
u_int32_t cache;
- gint *is_private;
+ int *is_private;
{
u_int32_t oflags;
- gint ret;
+ int ret;
/*
* If our environment open fails, and we're trying to look at a
@@ -1227,10 +1227,10 @@ db_init(dbenv, home, ttype, cache, is_private)
* argcheck --
* Return if argument flags are okay.
*/
-gint
+int
argcheck(arg, ok_args)
- gchar *arg;
- const gchar *ok_args;
+ char *arg;
+ const char *ok_args;
{
for (; *arg != '\0'; ++arg)
if (strchr(ok_args, *arg) == NULL)
@@ -1238,7 +1238,7 @@ argcheck(arg, ok_args)
return (1);
}
-gint
+int
usage()
{
fprintf(stderr, "%s\n\t%s\n",
@@ -1247,11 +1247,11 @@ usage()
return (EXIT_FAILURE);
}
-gint
+int
version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/db_upgrade/db_upgrade.c b/libdb/db_upgrade/db_upgrade.c
index 86e6864..c29584f 100644
--- a/libdb/db_upgrade/db_upgrade.c
+++ b/libdb/db_upgrade/db_upgrade.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -25,23 +25,23 @@ static const gchar revid[] =
#include "db_int.h"
-gint main __P((int, gchar *[]));
-gint usage __P((void));
-gint version_check __P((const gchar *));
+int main __P((int, char *[]));
+int usage __P((void));
+int version_check __P((const char *));
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
- const gchar *progname = "db_upgrade";
+ extern char *optarg;
+ extern int optind;
+ const char *progname = "db_upgrade";
DB *dbp;
DB_ENV *dbenv;
u_int32_t flags;
- gint ch, e_close, exitval, nflag, ret, t_ret;
- gchar *home, *passwd;
+ int ch, e_close, exitval, nflag, ret, t_ret;
+ char *home, *passwd;
if ((ret = version_check(progname)) != 0)
return (ret);
@@ -162,7 +162,7 @@ shutdown: exitval = 1;
return (exitval == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
-gint
+int
usage()
{
fprintf(stderr, "%s\n",
@@ -170,11 +170,11 @@ usage()
return (EXIT_FAILURE);
}
-gint
+int
version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/db_verify/db_verify.c b/libdb/db_verify/db_verify.c
index 6871135..bfe56ba 100644
--- a/libdb/db_verify/db_verify.c
+++ b/libdb/db_verify/db_verify.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -25,24 +25,24 @@ static const gchar revid[] =
#include "db_int.h"
-gint main __P((int, gchar *[]));
-gint usage __P((void));
-gint version_check __P((const gchar *));
+int main __P((int, char *[]));
+int usage __P((void));
+int version_check __P((const char *));
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
- const gchar *progname = "db_verify";
+ extern char *optarg;
+ extern int optind;
+ const char *progname = "db_verify";
DB *dbp, *dbp1;
DB_ENV *dbenv;
u_int32_t cache;
- gint ch, d_close, e_close, exitval, nflag, oflag, private;
- gint quiet, resize, ret, t_ret;
- gchar *home, *passwd;
+ int ch, d_close, e_close, exitval, nflag, oflag, private;
+ int quiet, resize, ret, t_ret;
+ char *home, *passwd;
if ((ret = version_check(progname)) != 0)
return (ret);
@@ -220,7 +220,7 @@ shutdown: exitval = 1;
return (exitval == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
-gint
+int
usage()
{
fprintf(stderr, "%s\n",
@@ -228,11 +228,11 @@ usage()
return (EXIT_FAILURE);
}
-gint
+int
version_check(progname)
- const gchar *progname;
+ const char *progname;
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
diff --git a/libdb/dbinc/btree.h b/libdb/dbinc/btree.h
index 17f8d6f..47b9a88 100644
--- a/libdb/dbinc/btree.h
+++ b/libdb/dbinc/btree.h
@@ -263,7 +263,7 @@ struct __btree { /* Btree access method. */
u_int32_t bt_minkey; /* Minimum keys per page. */
/* Btree comparison function. */
- gint (*bt_compare) __P((DB *, const DBT *, const DBT *));
+ int (*bt_compare) __P((DB *, const DBT *, const DBT *));
/* Btree prefix function. */
size_t (*bt_prefix) __P((DB *, const DBT *, const DBT *));
diff --git a/libdb/dbinc/crypto.h b/libdb/dbinc/crypto.h
index 26d53b2..108ac75 100644
--- a/libdb/dbinc/crypto.h
+++ b/libdb/dbinc/crypto.h
@@ -34,9 +34,9 @@
*/
struct __db_cipher {
int (*adj_size) __P((size_t));
- int (*close) __P((DB_ENV *, gpointer ));
- int (*decrypt) __P((DB_ENV *, gpointer , gpointer , u_int8_t *, size_t));
- int (*encrypt) __P((DB_ENV *, gpointer , gpointer , u_int8_t *, size_t));
+ int (*close) __P((DB_ENV *, void *));
+ int (*decrypt) __P((DB_ENV *, void *, void *, u_int8_t *, size_t));
+ int (*encrypt) __P((DB_ENV *, void *, void *, u_int8_t *, size_t));
int (*init) __P((DB_ENV *, DB_CIPHER *));
u_int8_t mac_key[DB_MAC_KEY]; /* MAC key. */
diff --git a/libdb/dbinc/cxx_except.h b/libdb/dbinc/cxx_except.h
index fa1f48e..ee65df4 100644
--- a/libdb/dbinc/cxx_except.h
+++ b/libdb/dbinc/cxx_except.h
@@ -44,19 +44,19 @@ class _exported DbException
{
public:
virtual ~DbException();
- DbException(gint err);
- DbException(const gchar *description);
- DbException(const gchar *prefix, gint err);
- DbException(const gchar *prefix1, const gchar *prefix2, gint err);
- gint get_errno() const;
- virtual const gchar *what() const;
+ DbException(int err);
+ DbException(const char *description);
+ DbException(const char *prefix, int err);
+ DbException(const char *prefix1, const char *prefix2, int err);
+ int get_errno() const;
+ virtual const char *what() const;
DbException(const DbException &);
DbException &operator = (const DbException &);
private:
- gchar *what_;
- gint err_; // errno
+ char *what_;
+ int err_; // errno
};
//
@@ -67,7 +67,7 @@ class _exported DbDeadlockException : public DbException
{
public:
virtual ~DbDeadlockException();
- DbDeadlockException(const gchar *description);
+ DbDeadlockException(const char *description);
DbDeadlockException(const DbDeadlockException &);
DbDeadlockException &operator = (const DbDeadlockException &);
@@ -83,8 +83,8 @@ class _exported DbLockNotGrantedException : public DbException
{
public:
virtual ~DbLockNotGrantedException();
- DbLockNotGrantedException(const gchar *prefix, db_lockop_t op,
- db_lockmode_t mode, const Dbt *obj, const DbLock lock, gint index);
+ DbLockNotGrantedException(const char *prefix, db_lockop_t op,
+ db_lockmode_t mode, const Dbt *obj, const DbLock lock, int index);
DbLockNotGrantedException(const DbLockNotGrantedException &);
DbLockNotGrantedException &operator =
(const DbLockNotGrantedException &);
@@ -93,14 +93,14 @@ public:
db_lockmode_t get_mode() const;
const Dbt* get_obj() const;
DbLock *get_lock() const;
- gint get_index() const;
+ int get_index() const;
private:
db_lockop_t op_;
db_lockmode_t mode_;
const Dbt *obj_;
DbLock *lock_;
- gint index_;
+ int index_;
};
//
@@ -112,9 +112,9 @@ class _exported DbMemoryException : public DbException
public:
virtual ~DbMemoryException();
DbMemoryException(Dbt *dbt);
- DbMemoryException(const gchar *description);
- DbMemoryException(const gchar *prefix, Dbt *dbt);
- DbMemoryException(const gchar *prefix1, const gchar *prefix2, Dbt *dbt);
+ DbMemoryException(const char *description);
+ DbMemoryException(const char *prefix, Dbt *dbt);
+ DbMemoryException(const char *prefix1, const char *prefix2, Dbt *dbt);
Dbt *get_dbt() const;
DbMemoryException(const DbMemoryException &);
@@ -132,7 +132,7 @@ class _exported DbRunRecoveryException : public DbException
{
public:
virtual ~DbRunRecoveryException();
- DbRunRecoveryException(const gchar *description);
+ DbRunRecoveryException(const char *description);
DbRunRecoveryException(const DbRunRecoveryException &);
DbRunRecoveryException &operator = (const DbRunRecoveryException &);
diff --git a/libdb/dbinc/cxx_int.h b/libdb/dbinc/cxx_int.h
index 40143b8..f8169f7 100644
--- a/libdb/dbinc/cxx_int.h
+++ b/libdb/dbinc/cxx_int.h
@@ -15,9 +15,9 @@
//
// Using FooImp classes will allow the implementation to change in the
// future without any modification to user code or even to header files
-// that the user includes. FooImp * is just like gpointer except that it
+// that the user includes. FooImp * is just like void * except that it
// provides a little extra protection, since you cannot randomly assign
-// any old pointer to a FooImp* as you can with gpointer . Currently, a
+// any old pointer to a FooImp* as you can with void *. Currently, a
// pointer to such an opaque class is always just a pointer to the
// appropriate underlying implementation struct. These are converted
// back and forth using the various overloaded wrap()/unwrap() methods.
@@ -33,18 +33,18 @@
inline _WRAPPED_TYPE unwrap(_WRAPPER_CLASS *val) \
{ \
if (!val) return (0); \
- return ((_WRAPPED_TYPE)((gpointer)(val->imp()))); \
+ return ((_WRAPPED_TYPE)((void *)(val->imp()))); \
} \
\
inline const _WRAPPED_TYPE unwrapConst(const _WRAPPER_CLASS *val) \
{ \
if (!val) return (0); \
- return ((const _WRAPPED_TYPE)((gpointer)(val->constimp()))); \
+ return ((const _WRAPPED_TYPE)((void *)(val->constimp()))); \
} \
\
inline _IMP_CLASS *wrap(_WRAPPED_TYPE val) \
{ \
- return ((_IMP_CLASS*)((gpointer)val)); \
+ return ((_IMP_CLASS*)((void *)val)); \
}
WRAPPED_CLASS(DbMpoolFile, DbMpoolFileImp, DB_MPOOLFILE*)
@@ -55,7 +55,7 @@ WRAPPED_CLASS(DbTxn, DbTxnImp, DB_TXN*)
// A tristate integer value used by the DB_ERROR macro below.
// We chose not to make this an enumerated type so it can
// be kept private, even though methods that return the
-// tristate gint can be declared in db_cxx.h .
+// tristate int can be declared in db_cxx.h .
//
#define ON_ERROR_THROW 1
#define ON_ERROR_RETURN 0
diff --git a/libdb/dbinc/db_am.h b/libdb/dbinc/db_am.h
index ad8e5df..12d191d 100644
--- a/libdb/dbinc/db_am.h
+++ b/libdb/dbinc/db_am.h
@@ -51,7 +51,7 @@
}
#define REC_CLOSE { \
- gint __t_ret; \
+ int __t_ret; \
if (argp != NULL) \
__os_free(dbenv, argp); \
if (dbc != NULL && \
@@ -117,7 +117,7 @@
typedef struct {
DBC *dbc;
- gint count;
+ int count;
} db_trunc_param;
#include "dbinc/db_dispatch.h"
diff --git a/libdb/dbinc/db_dispatch.h b/libdb/dbinc/db_dispatch.h
index d33c8d2..d01b607 100644
--- a/libdb/dbinc/db_dispatch.h
+++ b/libdb/dbinc/db_dispatch.h
@@ -64,7 +64,7 @@ struct __db_txnhead {
u_int32_t txn_min;
u_int32_t txn_max;
} *gen_array; /* Array of txnids associted with a gen. */
- gint nslots;
+ int nslots;
LIST_HEAD(__db_headlink, __db_txnlist) head[1];
};
@@ -86,7 +86,7 @@ struct __db_txnlist {
int32_t nentries;
int32_t maxentry;
int32_t locked;
- gchar *fname;
+ char *fname;
int32_t fileid;
db_pgno_t *pgno_array;
u_int8_t uid[DB_FILE_ID_LEN];
diff --git a/libdb/dbinc/db_server_int.h b/libdb/dbinc/db_server_int.h
index 078687f..022a60f 100644
--- a/libdb/dbinc/db_server_int.h
+++ b/libdb/dbinc/db_server_int.h
@@ -40,10 +40,10 @@ DB_SYSTEM_MEM | DB_USE_ENVIRON | DB_USE_ENVIRON_ROOT)
typedef struct home_entry home_entry;
struct home_entry {
LIST_ENTRY(home_entry) entries;
- gchar *home;
- gchar *dir;
- gchar *name;
- gchar *passwd;
+ char *home;
+ char *dir;
+ char *name;
+ char *passwd;
};
/*
@@ -101,7 +101,7 @@ struct ct_entry {
DB *dbp; /* H_DB */
DBC *dbc; /* H_CURSOR */
#endif
- gpointer anyp;
+ void *anyp;
} handle_u;
union { /* Private data per type */
ct_envdata envdp; /* Env info */
@@ -128,7 +128,7 @@ struct ct_entry {
#define ct_envdp private_u.envdp
#define ct_dbdp private_u.dbdp
-extern gint __dbsrv_verbose;
+extern int __dbsrv_verbose;
/*
* Get ctp and activate it.
diff --git a/libdb/dbinc/debug.h b/libdb/dbinc/debug.h
index d7e9540..55a5c5d 100644
--- a/libdb/dbinc/debug.h
+++ b/libdb/dbinc/debug.h
@@ -148,7 +148,7 @@ do { \
#define DB_ENV_TEST_RECOVERY(env, val, ret, name) \
do { \
- gint __ret; \
+ int __ret; \
PANIC_CHECK((env)); \
if ((env)->test_copy == (val)) { \
/* COPY the FILE */ \
@@ -165,7 +165,7 @@ do { \
#define DB_TEST_RECOVERY(dbp, val, ret, name) \
do { \
- gint __ret; \
+ int __ret; \
PANIC_CHECK((dbp)->dbenv); \
if ((dbp)->dbenv->test_copy == (val)) { \
/* Copy the file. */ \
diff --git a/libdb/dbinc/globals.h b/libdb/dbinc/globals.h
index 445d529..4454cab 100644
--- a/libdb/dbinc/globals.h
+++ b/libdb/dbinc/globals.h
@@ -26,24 +26,24 @@ typedef struct __db_globals {
TAILQ_HEAD(__db_envq, __db_env) db_envq;
int (*j_close) __P((int)); /* Underlying OS interface jump table.*/
- void (*j_dirfree) __P((gchar **, int));
- int (*j_dirlist) __P((const gchar *, gchar ***, gint *));
- int (*j_exists) __P((const gchar *, gint *));
- void (*j_free) __P((gpointer));
+ void (*j_dirfree) __P((char **, int));
+ int (*j_dirlist) __P((const char *, char ***, int *));
+ int (*j_exists) __P((const char *, int *));
+ void (*j_free) __P((void *));
int (*j_fsync) __P((int));
- int (*j_ioinfo) __P((const gchar *,
+ int (*j_ioinfo) __P((const char *,
int, u_int32_t *, u_int32_t *, u_int32_t *));
void *(*j_malloc) __P((size_t));
- int (*j_map) __P((gchar *, size_t, int, int, gpointer *));
- int (*j_open) __P((const gchar *, int, ...));
- ssize_t (*j_read) __P((int, gpointer , size_t));
- void *(*j_realloc) __P((gpointer , size_t));
- int (*j_rename) __P((const gchar *, const gchar *));
+ int (*j_map) __P((char *, size_t, int, int, void **));
+ int (*j_open) __P((const char *, int, ...));
+ ssize_t (*j_read) __P((int, void *, size_t));
+ void *(*j_realloc) __P((void *, size_t));
+ int (*j_rename) __P((const char *, const char *));
int (*j_seek) __P((int, size_t, db_pgno_t, u_int32_t, int, int));
int (*j_sleep) __P((u_long, u_long));
- int (*j_unlink) __P((const gchar *));
- int (*j_unmap) __P((gpointer , size_t));
- ssize_t (*j_write) __P((int, gconstpointer , size_t));
+ int (*j_unlink) __P((const char *));
+ int (*j_unmap) __P((void *, size_t));
+ ssize_t (*j_write) __P((int, const void *, size_t));
int (*j_yield) __P((void));
} DB_GLOBALS;
diff --git a/libdb/dbinc/hash.h b/libdb/dbinc/hash.h
index b60122a..218ad13 100644
--- a/libdb/dbinc/hash.h
+++ b/libdb/dbinc/hash.h
@@ -51,7 +51,7 @@ typedef struct hash_t {
u_int32_t h_ffactor; /* Fill factor. */
u_int32_t h_nelem; /* Number of elements. */
/* Hash function. */
- u_int32_t (*h_hash) __P((DB *, gconstpointer , u_int32_t));
+ u_int32_t (*h_hash) __P((DB *, const void *, u_int32_t));
} HASH;
/* Cursor structure definitions. */
diff --git a/libdb/dbinc/lock.h b/libdb/dbinc/lock.h
index 131c003..0027faf 100644
--- a/libdb/dbinc/lock.h
+++ b/libdb/dbinc/lock.h
@@ -92,7 +92,7 @@ typedef struct __sh_dbt {
ssize_t off; /* Region offset. */
} SH_DBT;
-#define SH_DBT_PTR(p) ((gpointer)(((u_int8_t *)(p)) + (p)->off))
+#define SH_DBT_PTR(p) ((void *)(((u_int8_t *)(p)) + (p)->off))
/*
* Object structures; these live in the object hash table.
diff --git a/libdb/dbinc/mp.h b/libdb/dbinc/mp.h
index 0c199b8..f99f735 100644
--- a/libdb/dbinc/mp.h
+++ b/libdb/dbinc/mp.h
@@ -59,8 +59,8 @@ struct __db_mpreg {
int32_t ftype; /* File type. */
/* Pgin, pgout routines. */
- gint (*pgin) __P((DB_ENV *, db_pgno_t, gpointer , DBT *));
- gint (*pgout) __P((DB_ENV *, db_pgno_t, gpointer , DBT *));
+ int (*pgin) __P((DB_ENV *, db_pgno_t, void *, DBT *));
+ int (*pgout) __P((DB_ENV *, db_pgno_t, void *, DBT *));
};
/*
diff --git a/libdb/dbinc/mutex.h b/libdb/dbinc/mutex.h
index 1d88c91..e42662c 100644
--- a/libdb/dbinc/mutex.h
+++ b/libdb/dbinc/mutex.h
@@ -76,7 +76,7 @@
*********************************************************************/
#ifdef HAVE_MUTEX_AIX_CHECK_LOCK
#include <sys/atomic_op.h>
-typedef gint tsl_t;
+typedef int tsl_t;
#define MUTEX_ALIGN sizeof(int)
#ifdef LOAD_ACTUAL_MUTEX_CODE
@@ -209,7 +209,7 @@ typedef lock_t tsl_t;
#ifdef HAVE_MUTEX_VMS
#include <sys/mman.h>;
#include <builtins.h>
-typedef guchar tsl_t;
+typedef unsigned char tsl_t;
#define MUTEX_ALIGN sizeof(unsigned int)
#ifdef LOAD_ACTUAL_MUTEX_CODE
@@ -282,7 +282,7 @@ do { \
* when we initialize the mutex.
*********************************************************************/
#ifdef HAVE_MUTEX_WIN16
-typedef guint tsl_t;
+typedef unsigned int tsl_t;
#define MUTEX_ALIGN sizeof(unsigned int)
#ifdef LOAD_ACTUAL_MUTEX_CODE
@@ -312,7 +312,7 @@ typedef guint tsl_t;
* 68K/gcc assembly.
*********************************************************************/
#ifdef HAVE_MUTEX_68K_GCC_ASSEMBLY
-typedef guchar tsl_t;
+typedef unsigned char tsl_t;
#ifdef LOAD_ACTUAL_MUTEX_CODE
/*
@@ -320,7 +320,7 @@ typedef guchar tsl_t;
*/
#define MUTEX_SET(tsl) ({ \
register tsl_t *__l = (tsl); \
- gint __r; \
+ int __r; \
asm volatile("tas %1; \n \
seq %0" \
: "=dm" (__r), "=m" (*__l) \
@@ -390,16 +390,16 @@ MUTEX_UNSET(tsl_t *tsl) {
* ARM/gcc assembly.
*********************************************************************/
#ifdef HAVE_MUTEX_ARM_GCC_ASSEMBLY
-typedef guchar tsl_t;
+typedef unsigned char tsl_t;
#ifdef LOAD_ACTUAL_MUTEX_CODE
/*
* For arm/gcc, 0 is clear, 1 is set.
*/
#define MUTEX_SET(tsl) ({ \
- gint __r; \
+ int __r; \
asm volatile("swpb %0, %1, [%2]" \
- : "=r" (__r) \
+ : "=r" (__r) \
: "0" (1), "r" (tsl) \
: "memory" \
); \
@@ -426,7 +426,7 @@ typedef u_int32_t tsl_t;
*/
#define MUTEX_SET(tsl) ({ \
register tsl_t *__l = (tsl); \
- gint __r; \
+ int __r; \
asm volatile("ldcws 0(%1),%0" : "=r" (__r) : "r" (__l)); \
__r & 1; \
})
@@ -440,7 +440,7 @@ typedef u_int32_t tsl_t;
* IA64/gcc assembly.
*********************************************************************/
#ifdef HAVE_MUTEX_IA64_GCC_ASSEMBLY
-typedef guchar tsl_t;
+typedef unsigned char tsl_t;
#ifdef LOAD_ACTUAL_MUTEX_CODE
/*
@@ -457,7 +457,7 @@ typedef guchar tsl_t;
* Store through a "volatile" pointer so we get a store with "release"
* semantics.
*/
-#define MUTEX_UNSET(tsl) (*(volatile guchar *)(tsl) = 0)
+#define MUTEX_UNSET(tsl) (*(volatile unsigned char *)(tsl) = 0)
#define MUTEX_INIT(tsl) MUTEX_UNSET(tsl)
#endif
#endif
@@ -508,32 +508,32 @@ typedef u_int32_t tsl_t;
* ___db_mutex_set label is used as a function name.
*/
#ifdef HAVE_MUTEX_PPC_APPLE_GCC_ASSEMBLY
-extern gint __db_mutex_set __P((volatile tsl_t *));
+extern int __db_mutex_set __P((volatile tsl_t *));
void
__db_mutex_tas_dummy()
{
__asm__ __volatile__(" \n\
- .globl ___db_mutex_set \n\
+ .globl ___db_mutex_set \n\
___db_mutex_set: \n\
lwarx r5,0,r3 \n\
- cmpwi r5,0 \n\
- bne fail \n\
- addi r5,r5,1 \n\
- stwcx. r5,0,r3 \n\
- beq success \n\
+ cmpwi r5,0 \n\
+ bne fail \n\
+ addi r5,r5,1 \n\
+ stwcx. r5,0,r3 \n\
+ beq success \n\
fail: \n\
- li r3,0 \n\
- blr \n\
+ li r3,0 \n\
+ blr \n\
success: \n\
- li r3,1 \n\
+ li r3,1 \n\
blr");
}
#define MUTEX_SET(tsl) __db_mutex_set(tsl)
#endif
#ifdef HAVE_MUTEX_PPC_GENERIC_GCC_ASSEMBLY
#define MUTEX_SET(tsl) ({ \
- gint __one = 1; \
- gint __r; \
+ int __one = 1; \
+ int __r; \
tsl_t *__l = (tsl); \
asm volatile (" \
0: \
@@ -561,7 +561,7 @@ success: \n\
* S/390 32-bit assembly.
*********************************************************************/
#ifdef HAVE_MUTEX_S390_GCC_ASSEMBLY
-typedef gint tsl_t;
+typedef int tsl_t;
#ifdef LOAD_ACTUAL_MUTEX_CODE
/*
@@ -570,7 +570,7 @@ typedef gint tsl_t;
static inline int
MUTEX_SET(tsl_t *tsl) { \
register tsl_t *__l = (tsl); \
- gint __r; \
+ int __r; \
asm volatile( \
" la 1,%1\n" \
" lhi 0,1\n" \
@@ -591,7 +591,7 @@ MUTEX_SET(tsl_t *tsl) { \
* SCO/cc assembly.
*********************************************************************/
#ifdef HAVE_MUTEX_SCO_X86_CC_ASSEMBLY
-typedef guchar tsl_t;
+typedef unsigned char tsl_t;
#ifdef LOAD_ACTUAL_MUTEX_CODE
/*
@@ -602,7 +602,7 @@ typedef guchar tsl_t;
#if defined(__USLC__)
asm int
-_tsl_set(gpointer tsl)
+_tsl_set(void *tsl)
{
%mem tsl
movl tsl, %ecx
@@ -623,7 +623,7 @@ _tsl_set(gpointer tsl)
* Sparc/gcc assembly.
*********************************************************************/
#ifdef HAVE_MUTEX_SPARC_GCC_ASSEMBLY
-typedef guchar tsl_t;
+typedef unsigned char tsl_t;
#ifdef LOAD_ACTUAL_MUTEX_CODE
/*
@@ -659,7 +659,7 @@ typedef guchar tsl_t;
* UTS/cc assembly.
*********************************************************************/
#ifdef HAVE_MUTEX_UTS_CC_ASSEMBLY
-typedef gint tsl_t;
+typedef int tsl_t;
#define MUTEX_ALIGN sizeof(int)
#ifdef LOAD_ACTUAL_MUTEX_CODE
@@ -673,7 +673,7 @@ typedef gint tsl_t;
* MIPS/gcc assembly.
*********************************************************************/
#ifdef HAVE_MUTEX_MIPS_GCC_ASSEMBLY
-typedef guint tsl_t;
+typedef unsigned int tsl_t;
#define MUTEX_ALIGN sizeof(unsigned int)
#ifdef LOAD_ACTUAL_MUTEX_CODE
@@ -707,7 +707,7 @@ typedef guint tsl_t;
* x86/gcc assembly.
*********************************************************************/
#ifdef HAVE_MUTEX_X86_GCC_ASSEMBLY
-typedef guchar tsl_t;
+typedef unsigned char tsl_t;
#ifdef LOAD_ACTUAL_MUTEX_CODE
/*
@@ -715,7 +715,7 @@ typedef guchar tsl_t;
*/
#define MUTEX_SET(tsl) ({ \
register tsl_t *__l = (tsl); \
- gint __r; \
+ int __r; \
asm volatile("movl $1,%%eax; lock; xchgb %1,%%al; xorl $1,%%eax"\
: "=&a" (__r), "=m" (*__l) \
: "1" (*__l) \
@@ -732,7 +732,7 @@ typedef guchar tsl_t;
* x86_64/gcc assembly.
*********************************************************************/
#ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
-typedef guchar tsl_t;
+typedef unsigned char tsl_t;
#ifdef LOAD_ACTUAL_MUTEX_CODE
/*
@@ -740,7 +740,7 @@ typedef guchar tsl_t;
*/
#define MUTEX_SET(tsl) ({ \
register tsl_t *__l = (tsl); \
- gint __r; \
+ int __r; \
asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
: "=&a" (__r), "=m" (*__l) \
: "1" (*__l) \
@@ -757,7 +757,7 @@ typedef guchar tsl_t;
* alphalinux/gcc assembly.
*********************************************************************/
#ifdef HAVE_MUTEX_ALPHA_LINUX_ASSEMBLY
-typedef unsigned long gint tsl_t;
+typedef unsigned long int tsl_t;
#define MUTEX_ALIGN 8
#endif
@@ -766,21 +766,21 @@ typedef unsigned long gint tsl_t;
* sparc32linux/gcc assembly.
*********************************************************************/
#ifdef HAVE_MUTEX_SPARC32_LINUX_ASSEMBLY
-typedef guchar tsl_t;
+typedef unsigned char tsl_t;
#endif
/*********************************************************************
* sparc64linux/gcc assembly.
*********************************************************************/
#ifdef HAVE_MUTEX_SPARC64_LINUX_ASSEMBLY
-typedef guchar tsl_t;
+typedef unsigned char tsl_t;
#endif
/*********************************************************************
* s390linux/gcc assembly.
*********************************************************************/
#ifdef HAVE_MUTEX_S390_LINUX_ASSEMBLY
-typedef volatile gint tsl_t;
+typedef volatile int tsl_t;
#endif
/*
diff --git a/libdb/dbinc/qam.h b/libdb/dbinc/qam.h
index 945ba16..a16fffc 100644
--- a/libdb/dbinc/qam.h
+++ b/libdb/dbinc/qam.h
@@ -40,7 +40,7 @@ typedef struct __mpfarray {
u_int32_t low_extent; /* First extent open. */
u_int32_t hi_extent; /* Last extent open. */
struct __qmpf {
- gint pinref;
+ int pinref;
DB_MPOOLFILE *mpf;
} *mpfarray; /* Array of open extents. */
} MPFARRAY;
@@ -62,10 +62,10 @@ struct __queue {
DBT pgcookie; /* Initialized pgcookie. */
DB_PGINFO pginfo; /* Initialized pginfo struct. */
- gchar *path; /* Space allocated to file pathname. */
- gchar *name; /* The name of the file. */
- gchar *dir; /* The dir of the file. */
- gint mode; /* Mode to open extents. */
+ char *path; /* Space allocated to file pathname. */
+ char *name; /* The name of the file. */
+ char *dir; /* The dir of the file. */
+ int mode; /* Mode to open extents. */
};
/* Format for queue extent names. */
diff --git a/libdb/dbinc/queue.h b/libdb/dbinc/queue.h
index 3b7451d..8d4a771 100644
--- a/libdb/dbinc/queue.h
+++ b/libdb/dbinc/queue.h
@@ -257,14 +257,14 @@ struct { \
* Circular queue functions.
*/
#define CIRCLEQ_INIT(head) do { \
- (head)->cqh_first = (gpointer)(head); \
- (head)->cqh_last = (gpointer)(head); \
+ (head)->cqh_first = (void *)(head); \
+ (head)->cqh_last = (void *)(head); \
} while (0)
#define CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do { \
(elm)->field.cqe_next = (listelm)->field.cqe_next; \
(elm)->field.cqe_prev = (listelm); \
- if ((listelm)->field.cqe_next == (gpointer)(head)) \
+ if ((listelm)->field.cqe_next == (void *)(head)) \
(head)->cqh_last = (elm); \
else \
(listelm)->field.cqe_next->field.cqe_prev = (elm); \
@@ -274,7 +274,7 @@ struct { \
#define CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do { \
(elm)->field.cqe_next = (listelm); \
(elm)->field.cqe_prev = (listelm)->field.cqe_prev; \
- if ((listelm)->field.cqe_prev == (gpointer)(head)) \
+ if ((listelm)->field.cqe_prev == (void *)(head)) \
(head)->cqh_first = (elm); \
else \
(listelm)->field.cqe_prev->field.cqe_next = (elm); \
@@ -283,8 +283,8 @@ struct { \
#define CIRCLEQ_INSERT_HEAD(head, elm, field) do { \
(elm)->field.cqe_next = (head)->cqh_first; \
- (elm)->field.cqe_prev = (gpointer)(head); \
- if ((head)->cqh_last == (gpointer)(head)) \
+ (elm)->field.cqe_prev = (void *)(head); \
+ if ((head)->cqh_last == (void *)(head)) \
(head)->cqh_last = (elm); \
else \
(head)->cqh_first->field.cqe_prev = (elm); \
@@ -292,9 +292,9 @@ struct { \
} while (0)
#define CIRCLEQ_INSERT_TAIL(head, elm, field) do { \
- (elm)->field.cqe_next = (gpointer)(head); \
+ (elm)->field.cqe_next = (void *)(head); \
(elm)->field.cqe_prev = (head)->cqh_last; \
- if ((head)->cqh_first == (gpointer)(head)) \
+ if ((head)->cqh_first == (void *)(head)) \
(head)->cqh_first = (elm); \
else \
(head)->cqh_last->field.cqe_next = (elm); \
@@ -302,12 +302,12 @@ struct { \
} while (0)
#define CIRCLEQ_REMOVE(head, elm, field) do { \
- if ((elm)->field.cqe_next == (gpointer)(head)) \
+ if ((elm)->field.cqe_next == (void *)(head)) \
(head)->cqh_last = (elm)->field.cqe_prev; \
else \
(elm)->field.cqe_next->field.cqe_prev = \
(elm)->field.cqe_prev; \
- if ((elm)->field.cqe_prev == (gpointer)(head)) \
+ if ((elm)->field.cqe_prev == (void *)(head)) \
(head)->cqh_first = (elm)->field.cqe_next; \
else \
(elm)->field.cqe_prev->field.cqe_next = \
diff --git a/libdb/dbinc/region.h b/libdb/dbinc/region.h
index 7403e9d..1b76e2d 100644
--- a/libdb/dbinc/region.h
+++ b/libdb/dbinc/region.h
@@ -262,7 +262,7 @@ typedef struct __db_regmaint_t {
* portable. We use u_int32_t, which restricts regions to 4Gb in size.
*/
#define R_ADDR(base, offset) \
- ((gpointer)((u_int8_t *)((base)->addr) + offset))
+ ((void *)((u_int8_t *)((base)->addr) + offset))
#define R_OFFSET(base, p) \
((u_int32_t)((u_int8_t *)(p) - (u_int8_t *)(base)->addr))
diff --git a/libdb/dbinc/rep.h b/libdb/dbinc/rep.h
index 0f1ee7e..1e31549 100644
--- a/libdb/dbinc/rep.h
+++ b/libdb/dbinc/rep.h
@@ -164,8 +164,8 @@ typedef struct __txn_recs {
} TXN_RECS;
typedef struct __lsn_collection {
- gint nlsns;
- gint nalloc;
+ int nlsns;
+ int nalloc;
DB_LSN *array;
} LSN_COLLECTION;
diff --git a/libdb/dbinc/shqueue.h b/libdb/dbinc/shqueue.h
index d1db32c..af69025 100644
--- a/libdb/dbinc/shqueue.h
+++ b/libdb/dbinc/shqueue.h
@@ -239,27 +239,27 @@ struct { \
#define SH_CIRCLEQ_FIRST(head, type) \
((head)->scqh_first == -1 ? \
- (gpointer)head : SH_CIRCLEQ_FIRSTP(head, type))
+ (void *)head : SH_CIRCLEQ_FIRSTP(head, type))
#define SH_CIRCLEQ_LASTP(head, type) \
((struct type *)(((u_int8_t *)(head)) + (head)->scqh_last))
#define SH_CIRCLEQ_LAST(head, type) \
- ((head)->scqh_last == -1 ? (gpointer)head : SH_CIRCLEQ_LASTP(head, type))
+ ((head)->scqh_last == -1 ? (void *)head : SH_CIRCLEQ_LASTP(head, type))
#define SH_CIRCLEQ_NEXTP(elm, field, type) \
((struct type *)(((u_int8_t *)(elm)) + (elm)->field.scqe_next))
#define SH_CIRCLEQ_NEXT(head, elm, field, type) \
((elm)->field.scqe_next == SH_PTR_TO_OFF(elm, head) ? \
- (gpointer)head : SH_CIRCLEQ_NEXTP(elm, field, type))
+ (void *)head : SH_CIRCLEQ_NEXTP(elm, field, type))
#define SH_CIRCLEQ_PREVP(elm, field, type) \
((struct type *)(((u_int8_t *)(elm)) + (elm)->field.scqe_prev))
#define SH_CIRCLEQ_PREV(head, elm, field, type) \
((elm)->field.scqe_prev == SH_PTR_TO_OFF(elm, head) ? \
- (gpointer)head : SH_CIRCLEQ_PREVP(elm, field, type))
+ (void *)head : SH_CIRCLEQ_PREVP(elm, field, type))
#define SH_CIRCLEQ_INIT(head) { \
(head)->scqh_first = 0; \
@@ -270,7 +270,7 @@ struct { \
(elm)->field.scqe_prev = SH_PTR_TO_OFF(elm, listelm); \
(elm)->field.scqe_next = (listelm)->field.scqe_next + \
(elm)->field.scqe_prev; \
- if (SH_CIRCLEQ_NEXTP(listelm, field, type) == (gpointer)head) \
+ if (SH_CIRCLEQ_NEXTP(listelm, field, type) == (void *)head) \
(head)->scqh_last = SH_PTR_TO_OFF(head, elm); \
else \
SH_CIRCLEQ_NEXTP(listelm, \
@@ -284,7 +284,7 @@ struct { \
(elm)->field.scqe_next = SH_PTR_TO_OFF(elm, listelm); \
(elm)->field.scqe_prev = (elm)->field.scqe_next - \
SH_CIRCLEQ_PREVP(listelm, field, type)->field.scqe_next;\
- if (SH_CIRCLEQ_PREVP(listelm, field, type) == (gpointer)(head)) \
+ if (SH_CIRCLEQ_PREVP(listelm, field, type) == (void *)(head)) \
(head)->scqh_first = SH_PTR_TO_OFF(head, elm); \
else \
SH_CIRCLEQ_PREVP(listelm, \
@@ -319,12 +319,12 @@ struct { \
} while (0)
#define SH_CIRCLEQ_REMOVE(head, elm, field, type) do { \
- if (SH_CIRCLEQ_NEXTP(elm, field, type) == (gpointer)(head)) \
+ if (SH_CIRCLEQ_NEXTP(elm, field, type) == (void *)(head)) \
(head)->scqh_last += (elm)->field.scqe_prev; \
else \
SH_CIRCLEQ_NEXTP(elm, field, type)->field.scqe_prev += \
(elm)->field.scqe_prev; \
- if (SH_CIRCLEQ_PREVP(elm, field, type) == (gpointer)(head)) \
+ if (SH_CIRCLEQ_PREVP(elm, field, type) == (void *)(head)) \
(head)->scqh_first += (elm)->field.scqe_next; \
else \
SH_CIRCLEQ_PREVP(elm, field, type)->field.scqe_next += \
diff --git a/libdb/dbinc/tcl_db.h b/libdb/dbinc/tcl_db.h
index 42d0086..2ec368b 100644
--- a/libdb/dbinc/tcl_db.h
+++ b/libdb/dbinc/tcl_db.h
@@ -34,7 +34,7 @@ typedef struct _mutex_entry {
* real_val might push it over the 32 byte boundary. The best
* we can do is use a 48 byte boundary.
*/
- gchar c[48];
+ char c[48];
} u;
} _MUTEX_ENTRY;
@@ -80,11 +80,11 @@ typedef struct _mutex_data {
typedef struct dbtcl_info {
LIST_ENTRY(dbtcl_info) entries;
Tcl_Interp *i_interp;
- gchar *i_name;
+ char *i_name;
enum INFOTYPE i_type;
union infop {
DB_ENV *envp;
- gpointer anyp;
+ void *anyp;
DB *dbp;
DBC *dbcp;
DB_TXN *txnp;
@@ -94,17 +94,17 @@ typedef struct dbtcl_info {
DB_LOGC *logc;
} un;
union data {
- gint anydata;
+ int anydata;
db_pgno_t pgno;
u_int32_t lockid;
} und;
union data2 {
- gint anydata;
+ int anydata;
size_t pagesz;
} und2;
DBT i_lockobj;
FILE *i_err;
- gchar *i_errpfx;
+ char *i_errpfx;
/* Callbacks--Tcl_Objs containing proc names */
Tcl_Obj *i_btcompare;
@@ -147,7 +147,7 @@ typedef struct dbtcl_info {
#define i_dbdbcid i_otherid[0]
-extern gint __debug_on, __debug_print, __debug_stop, __debug_test;
+extern int __debug_on, __debug_print, __debug_stop, __debug_test;
typedef struct dbtcl_global {
LIST_HEAD(infohead, dbtcl_info) g_infohead;
diff --git a/libdb/dbinc/xa.h b/libdb/dbinc/xa.h
index a8e1b1c..9786e29 100644
--- a/libdb/dbinc/xa.h
+++ b/libdb/dbinc/xa.h
@@ -25,7 +25,7 @@ struct xid_t {
long formatID; /* format identifier */
long gtrid_length; /* value from 1 through 64 */
long bqual_length; /* value from 1 through 64 */
- gchar data[XIDDATASIZE];
+ char data[XIDDATASIZE];
};
typedef struct xid_t XID;
/*
@@ -35,8 +35,8 @@ typedef struct xid_t XID;
/*
* Declarations of routines by which RMs call TMs:
*/
-extern gint ax_reg __P((int, XID *, long));
-extern gint ax_unreg __P((int, long));
+extern int ax_reg __P((int, XID *, long));
+extern int ax_unreg __P((int, long));
/*
* XA Switch Data Structure
@@ -47,29 +47,29 @@ extern gint ax_unreg __P((int, long));
/* strings, including the null
terminator */
struct xa_switch_t {
- gchar name[RMNAMESZ]; /* name of resource manager */
+ char name[RMNAMESZ]; /* name of resource manager */
long flags; /* resource manager specific options */
long version; /* must be 0 */
- gint (*xa_open_entry) /* xa_open function pointer */
- __P((gchar *, int, long));
- gint (*xa_close_entry) /* xa_close function pointer */
- __P((gchar *, int, long));
- gint (*xa_start_entry) /* xa_start function pointer */
+ int (*xa_open_entry) /* xa_open function pointer */
+ __P((char *, int, long));
+ int (*xa_close_entry) /* xa_close function pointer */
+ __P((char *, int, long));
+ int (*xa_start_entry) /* xa_start function pointer */
__P((XID *, int, long));
- gint (*xa_end_entry) /* xa_end function pointer */
+ int (*xa_end_entry) /* xa_end function pointer */
__P((XID *, int, long));
- gint (*xa_rollback_entry) /* xa_rollback function pointer */
+ int (*xa_rollback_entry) /* xa_rollback function pointer */
__P((XID *, int, long));
- gint (*xa_prepare_entry) /* xa_prepare function pointer */
+ int (*xa_prepare_entry) /* xa_prepare function pointer */
__P((XID *, int, long));
- gint (*xa_commit_entry) /* xa_commit function pointer */
+ int (*xa_commit_entry) /* xa_commit function pointer */
__P((XID *, int, long));
- gint (*xa_recover_entry) /* xa_recover function pointer */
+ int (*xa_recover_entry) /* xa_recover function pointer */
__P((XID *, long, int, long));
- gint (*xa_forget_entry) /* xa_forget function pointer */
+ int (*xa_forget_entry) /* xa_forget function pointer */
__P((XID *, int, long));
- gint (*xa_complete_entry) /* xa_complete function pointer */
- __P((gint *, gint *, int, long));
+ int (*xa_complete_entry) /* xa_complete function pointer */
+ __P((int *, int *, int, long));
};
/*
diff --git a/libdb/dbinc_auto/btree_ext.h b/libdb/dbinc_auto/btree_ext.h
index 46d4302..ec5468a 100644
--- a/libdb/dbinc_auto/btree_ext.h
+++ b/libdb/dbinc_auto/btree_ext.h
@@ -6,125 +6,125 @@
extern "C" {
#endif
-gint __bam_cmp __P((DB *, const DBT *, PAGE *, u_int32_t, gint (*)(DB *, const DBT *, const DBT *), gint *));
-gint __bam_defcmp __P((DB *, const DBT *, const DBT *));
+int __bam_cmp __P((DB *, const DBT *, PAGE *, u_int32_t, int (*)(DB *, const DBT *, const DBT *), int *));
+int __bam_defcmp __P((DB *, const DBT *, const DBT *));
size_t __bam_defpfx __P((DB *, const DBT *, const DBT *));
-gint __bam_pgin __P((DB_ENV *, DB *, db_pgno_t, gpointer , DBT *));
-gint __bam_pgout __P((DB_ENV *, DB *, db_pgno_t, gpointer , DBT *));
-gint __bam_mswap __P((PAGE *));
+int __bam_pgin __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
+int __bam_pgout __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
+int __bam_mswap __P((PAGE *));
void __bam_cprint __P((DBC *));
-gint __bam_ca_delete __P((DB *, db_pgno_t, u_int32_t, int));
-gint __ram_ca_delete __P((DB *, db_pgno_t));
-gint __bam_ca_di __P((DBC *, db_pgno_t, u_int32_t, int));
-gint __bam_ca_dup __P((DBC *, u_int32_t, db_pgno_t, u_int32_t, db_pgno_t, u_int32_t));
-gint __bam_ca_undodup __P((DB *, u_int32_t, db_pgno_t, u_int32_t, u_int32_t));
-gint __bam_ca_rsplit __P((DBC *, db_pgno_t, db_pgno_t));
-gint __bam_ca_split __P((DBC *, db_pgno_t, db_pgno_t, db_pgno_t, u_int32_t, int));
+int __bam_ca_delete __P((DB *, db_pgno_t, u_int32_t, int));
+int __ram_ca_delete __P((DB *, db_pgno_t));
+int __bam_ca_di __P((DBC *, db_pgno_t, u_int32_t, int));
+int __bam_ca_dup __P((DBC *, u_int32_t, db_pgno_t, u_int32_t, db_pgno_t, u_int32_t));
+int __bam_ca_undodup __P((DB *, u_int32_t, db_pgno_t, u_int32_t, u_int32_t));
+int __bam_ca_rsplit __P((DBC *, db_pgno_t, db_pgno_t));
+int __bam_ca_split __P((DBC *, db_pgno_t, db_pgno_t, db_pgno_t, u_int32_t, int));
void __bam_ca_undosplit __P((DB *, db_pgno_t, db_pgno_t, db_pgno_t, u_int32_t));
-gint __bam_c_init __P((DBC *, DBTYPE));
-gint __bam_c_refresh __P((DBC *));
-gint __bam_c_count __P((DBC *, db_recno_t *));
-gint __bam_c_dup __P((DBC *, DBC *));
-gint __bam_bulk_overflow __P((DBC *, u_int32_t, db_pgno_t, u_int8_t *));
-gint __bam_bulk_duplicates __P((DBC *, db_pgno_t, u_int8_t *, int32_t *, int32_t **, u_int8_t **, u_int32_t *, int));
-gint __bam_c_rget __P((DBC *, DBT *));
-gint __bam_ditem __P((DBC *, PAGE *, u_int32_t));
-gint __bam_adjindx __P((DBC *, PAGE *, u_int32_t, u_int32_t, int));
-gint __bam_dpages __P((DBC *, EPG *));
-gint __bam_db_create __P((DB *));
-gint __bam_db_close __P((DB *));
-gint __bam_set_flags __P((DB *, u_int32_t *flagsp));
-gint __ram_set_flags __P((DB *, u_int32_t *flagsp));
-gint __bam_open __P((DB *, DB_TXN *, const gchar *, db_pgno_t, u_int32_t));
-gint __bam_metachk __P((DB *, const gchar *, BTMETA *));
-gint __bam_read_root __P((DB *, DB_TXN *, db_pgno_t, u_int32_t));
-gint __bam_new_file __P((DB *, DB_TXN *, DB_FH *, const gchar *));
-gint __bam_new_subdb __P((DB *, DB *, DB_TXN *));
-gint __bam_iitem __P((DBC *, DBT *, DBT *, u_int32_t, u_int32_t));
-gint __bam_ritem __P((DBC *, PAGE *, u_int32_t, DBT *));
-gint __bam_split_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_rsplit_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_adj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_cadjust_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_cdel_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_repl_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_root_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_curadj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_rcuradj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_reclaim __P((DB *, DB_TXN *));
-gint __bam_truncate __P((DB *, DB_TXN *, u_int32_t *));
-gint __ram_open __P((DB *, DB_TXN *, const gchar *, db_pgno_t, u_int32_t));
-gint __ram_append __P((DBC *, DBT *, DBT *));
-gint __ram_c_del __P((DBC *));
-gint __ram_c_get __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
-gint __ram_c_put __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
-gint __ram_ca __P((DBC *, ca_recno_arg));
-gint __ram_getno __P((DBC *, const DBT *, db_recno_t *, int));
-gint __ram_writeback __P((DB *));
-gint __bam_rsearch __P((DBC *, db_recno_t *, u_int32_t, int, gint *));
-gint __bam_adjust __P((DBC *, int32_t));
-gint __bam_nrecs __P((DBC *, db_recno_t *));
+int __bam_c_init __P((DBC *, DBTYPE));
+int __bam_c_refresh __P((DBC *));
+int __bam_c_count __P((DBC *, db_recno_t *));
+int __bam_c_dup __P((DBC *, DBC *));
+int __bam_bulk_overflow __P((DBC *, u_int32_t, db_pgno_t, u_int8_t *));
+int __bam_bulk_duplicates __P((DBC *, db_pgno_t, u_int8_t *, int32_t *, int32_t **, u_int8_t **, u_int32_t *, int));
+int __bam_c_rget __P((DBC *, DBT *));
+int __bam_ditem __P((DBC *, PAGE *, u_int32_t));
+int __bam_adjindx __P((DBC *, PAGE *, u_int32_t, u_int32_t, int));
+int __bam_dpages __P((DBC *, EPG *));
+int __bam_db_create __P((DB *));
+int __bam_db_close __P((DB *));
+int __bam_set_flags __P((DB *, u_int32_t *flagsp));
+int __ram_set_flags __P((DB *, u_int32_t *flagsp));
+int __bam_open __P((DB *, DB_TXN *, const char *, db_pgno_t, u_int32_t));
+int __bam_metachk __P((DB *, const char *, BTMETA *));
+int __bam_read_root __P((DB *, DB_TXN *, db_pgno_t, u_int32_t));
+int __bam_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
+int __bam_new_subdb __P((DB *, DB *, DB_TXN *));
+int __bam_iitem __P((DBC *, DBT *, DBT *, u_int32_t, u_int32_t));
+int __bam_ritem __P((DBC *, PAGE *, u_int32_t, DBT *));
+int __bam_split_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_rsplit_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_adj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_cadjust_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_cdel_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_repl_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_root_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_curadj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_rcuradj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_reclaim __P((DB *, DB_TXN *));
+int __bam_truncate __P((DB *, DB_TXN *, u_int32_t *));
+int __ram_open __P((DB *, DB_TXN *, const char *, db_pgno_t, u_int32_t));
+int __ram_append __P((DBC *, DBT *, DBT *));
+int __ram_c_del __P((DBC *));
+int __ram_c_get __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
+int __ram_c_put __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
+int __ram_ca __P((DBC *, ca_recno_arg));
+int __ram_getno __P((DBC *, const DBT *, db_recno_t *, int));
+int __ram_writeback __P((DB *));
+int __bam_rsearch __P((DBC *, db_recno_t *, u_int32_t, int, int *));
+int __bam_adjust __P((DBC *, int32_t));
+int __bam_nrecs __P((DBC *, db_recno_t *));
db_recno_t __bam_total __P((DB *, PAGE *));
-gint __bam_search __P((DBC *, db_pgno_t, const DBT *, u_int32_t, int, db_recno_t *, gint *));
-gint __bam_stkrel __P((DBC *, u_int32_t));
-gint __bam_stkgrow __P((DB_ENV *, BTREE_CURSOR *));
-gint __bam_split __P((DBC *, gpointer , db_pgno_t *));
-gint __bam_copy __P((DB *, PAGE *, PAGE *, u_int32_t, u_int32_t));
-gint __bam_stat __P((DB *, gpointer , u_int32_t));
-gint __bam_traverse __P((DBC *, db_lockmode_t, db_pgno_t, gint (*)(DB *, PAGE *, gpointer , gint *), gpointer ));
-gint __bam_stat_callback __P((DB *, PAGE *, gpointer , gint *));
-gint __bam_key_range __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t));
-gint __bam_30_btreemeta __P((DB *, gchar *, u_int8_t *));
-gint __bam_31_btreemeta __P((DB *, gchar *, u_int32_t, DB_FH *, PAGE *, gint *));
-gint __bam_31_lbtree __P((DB *, gchar *, u_int32_t, DB_FH *, PAGE *, gint *));
-gint __bam_vrfy_meta __P((DB *, VRFY_DBINFO *, BTMETA *, db_pgno_t, u_int32_t));
-gint __ram_vrfy_leaf __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-gint __bam_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-gint __bam_vrfy_itemorder __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t, int, int, u_int32_t));
-gint __bam_vrfy_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
-gint __bam_vrfy_subtree __P((DB *, VRFY_DBINFO *, db_pgno_t, gpointer , gpointer , u_int32_t, u_int32_t *, u_int32_t *, u_int32_t *));
-gint __bam_salvage __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t, PAGE *, gpointer , gint (*)(gpointer , gconstpointer ), DBT *, u_int32_t));
-gint __bam_salvage_walkdupint __P((DB *, VRFY_DBINFO *, PAGE *, DBT *, gpointer , gint (*)(gpointer , gconstpointer ), u_int32_t));
-gint __bam_meta2pgset __P((DB *, VRFY_DBINFO *, BTMETA *, u_int32_t, DB *));
-gint __bam_split_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, const DBT *, u_int32_t));
-gint __bam_split_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_split_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_split_read __P((DB_ENV *, gpointer , __bam_split_args **));
-gint __bam_rsplit_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, const DBT *, db_pgno_t, db_pgno_t, const DBT *, DB_LSN *));
-gint __bam_rsplit_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_rsplit_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_rsplit_read __P((DB_ENV *, gpointer , __bam_rsplit_args **));
-gint __bam_adj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t, u_int32_t, u_int32_t));
-gint __bam_adj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_adj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_adj_read __P((DB_ENV *, gpointer , __bam_adj_args **));
-gint __bam_cadjust_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t, int32_t, u_int32_t));
-gint __bam_cadjust_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_cadjust_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_cadjust_read __P((DB_ENV *, gpointer , __bam_cadjust_args **));
-gint __bam_cdel_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t));
-gint __bam_cdel_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_cdel_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_cdel_read __P((DB_ENV *, gpointer , __bam_cdel_args **));
-gint __bam_repl_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t, u_int32_t, const DBT *, const DBT *, u_int32_t, u_int32_t));
-gint __bam_repl_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_repl_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_repl_read __P((DB_ENV *, gpointer , __bam_repl_args **));
-gint __bam_root_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, db_pgno_t, DB_LSN *));
-gint __bam_root_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_root_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_root_read __P((DB_ENV *, gpointer , __bam_root_args **));
-gint __bam_curadj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_ca_mode, db_pgno_t, db_pgno_t, db_pgno_t, u_int32_t, u_int32_t, u_int32_t));
-gint __bam_curadj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_curadj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_curadj_read __P((DB_ENV *, gpointer , __bam_curadj_args **));
-gint __bam_rcuradj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, ca_recno_arg, db_pgno_t, db_recno_t, u_int32_t));
-gint __bam_rcuradj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_rcuradj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __bam_rcuradj_read __P((DB_ENV *, gpointer , __bam_rcuradj_args **));
-gint __bam_init_print __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __bam_init_getpgnos __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __bam_init_recover __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+int __bam_search __P((DBC *, db_pgno_t, const DBT *, u_int32_t, int, db_recno_t *, int *));
+int __bam_stkrel __P((DBC *, u_int32_t));
+int __bam_stkgrow __P((DB_ENV *, BTREE_CURSOR *));
+int __bam_split __P((DBC *, void *, db_pgno_t *));
+int __bam_copy __P((DB *, PAGE *, PAGE *, u_int32_t, u_int32_t));
+int __bam_stat __P((DB *, void *, u_int32_t));
+int __bam_traverse __P((DBC *, db_lockmode_t, db_pgno_t, int (*)(DB *, PAGE *, void *, int *), void *));
+int __bam_stat_callback __P((DB *, PAGE *, void *, int *));
+int __bam_key_range __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t));
+int __bam_30_btreemeta __P((DB *, char *, u_int8_t *));
+int __bam_31_btreemeta __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
+int __bam_31_lbtree __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
+int __bam_vrfy_meta __P((DB *, VRFY_DBINFO *, BTMETA *, db_pgno_t, u_int32_t));
+int __ram_vrfy_leaf __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
+int __bam_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
+int __bam_vrfy_itemorder __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t, int, int, u_int32_t));
+int __bam_vrfy_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
+int __bam_vrfy_subtree __P((DB *, VRFY_DBINFO *, db_pgno_t, void *, void *, u_int32_t, u_int32_t *, u_int32_t *, u_int32_t *));
+int __bam_salvage __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t, PAGE *, void *, int (*)(void *, const void *), DBT *, u_int32_t));
+int __bam_salvage_walkdupint __P((DB *, VRFY_DBINFO *, PAGE *, DBT *, void *, int (*)(void *, const void *), u_int32_t));
+int __bam_meta2pgset __P((DB *, VRFY_DBINFO *, BTMETA *, u_int32_t, DB *));
+int __bam_split_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, const DBT *, u_int32_t));
+int __bam_split_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_split_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_split_read __P((DB_ENV *, void *, __bam_split_args **));
+int __bam_rsplit_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, const DBT *, db_pgno_t, db_pgno_t, const DBT *, DB_LSN *));
+int __bam_rsplit_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_rsplit_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_rsplit_read __P((DB_ENV *, void *, __bam_rsplit_args **));
+int __bam_adj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t, u_int32_t, u_int32_t));
+int __bam_adj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_adj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_adj_read __P((DB_ENV *, void *, __bam_adj_args **));
+int __bam_cadjust_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t, int32_t, u_int32_t));
+int __bam_cadjust_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_cadjust_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_cadjust_read __P((DB_ENV *, void *, __bam_cadjust_args **));
+int __bam_cdel_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t));
+int __bam_cdel_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_cdel_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_cdel_read __P((DB_ENV *, void *, __bam_cdel_args **));
+int __bam_repl_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t, u_int32_t, const DBT *, const DBT *, u_int32_t, u_int32_t));
+int __bam_repl_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_repl_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_repl_read __P((DB_ENV *, void *, __bam_repl_args **));
+int __bam_root_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, db_pgno_t, DB_LSN *));
+int __bam_root_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_root_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_root_read __P((DB_ENV *, void *, __bam_root_args **));
+int __bam_curadj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_ca_mode, db_pgno_t, db_pgno_t, db_pgno_t, u_int32_t, u_int32_t, u_int32_t));
+int __bam_curadj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_curadj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_curadj_read __P((DB_ENV *, void *, __bam_curadj_args **));
+int __bam_rcuradj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, ca_recno_arg, db_pgno_t, db_recno_t, u_int32_t));
+int __bam_rcuradj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_rcuradj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __bam_rcuradj_read __P((DB_ENV *, void *, __bam_rcuradj_args **));
+int __bam_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __bam_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __bam_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/clib_ext.h b/libdb/dbinc_auto/clib_ext.h
index 7e2b42d..7e2817d 100644
--- a/libdb/dbinc_auto/clib_ext.h
+++ b/libdb/dbinc_auto/clib_ext.h
@@ -7,40 +7,40 @@ extern "C" {
#endif
#ifndef HAVE_GETCWD
-gchar *getcwd __P((gchar *, size_t));
+char *getcwd __P((char *, size_t));
#endif
#ifndef HAVE_GETOPT
-gint getopt __P((int, gchar * const *, const gchar *));
+int getopt __P((int, char * const *, const char *));
#endif
#ifndef HAVE_MEMCMP
-gint memcmp __P((gconstpointer , gconstpointer , size_t));
+int memcmp __P((const void *, const void *, size_t));
#endif
#ifndef HAVE_MEMCPY
-gpointer memcpy __P((gpointer , gconstpointer , size_t));
+void *memcpy __P((void *, const void *, size_t));
#endif
#ifndef HAVE_MEMMOVE
-gpointer memmove __P((gpointer , gconstpointer , size_t));
+void *memmove __P((void *, const void *, size_t));
#endif
#ifndef HAVE_RAISE
-gint raise __P((int));
+int raise __P((int));
#endif
#ifndef HAVE_SNPRINTF
-gint snprintf __P((gchar *, size_t, const gchar *, ...));
+int snprintf __P((char *, size_t, const char *, ...));
#endif
#ifndef HAVE_STRCASECMP
-gint strcasecmp __P((const gchar *, const gchar *));
+int strcasecmp __P((const char *, const char *));
#endif
#ifndef HAVE_STRCASECMP
-gint strncasecmp __P((const gchar *, const gchar *, size_t));
+int strncasecmp __P((const char *, const char *, size_t));
#endif
#ifndef HAVE_STRDUP
-gchar *strdup __P((const gchar *));
+char *strdup __P((const char *));
#endif
#ifndef HAVE_STRERROR
-gchar *strerror __P((int));
+char *strerror __P((int));
#endif
#ifndef HAVE_VSNPRINTF
-gint vsnprintf __P((gchar *, size_t, const gchar *, va_list));
+int vsnprintf __P((char *, size_t, const char *, va_list));
#endif
#if defined(__cplusplus)
diff --git a/libdb/dbinc_auto/common_ext.h b/libdb/dbinc_auto/common_ext.h
index a7e9604..7744982 100644
--- a/libdb/dbinc_auto/common_ext.h
+++ b/libdb/dbinc_auto/common_ext.h
@@ -6,36 +6,36 @@
extern "C" {
#endif
-gint __db_isbigendian __P((void));
-gint __db_byteorder __P((DB_ENV *, int));
-gint __db_fchk __P((DB_ENV *, const gchar *, u_int32_t, u_int32_t));
-gint __db_fcchk __P((DB_ENV *, const gchar *, u_int32_t, u_int32_t, u_int32_t));
-gint __db_ferr __P((const DB_ENV *, const gchar *, int));
+int __db_isbigendian __P((void));
+int __db_byteorder __P((DB_ENV *, int));
+int __db_fchk __P((DB_ENV *, const char *, u_int32_t, u_int32_t));
+int __db_fcchk __P((DB_ENV *, const char *, u_int32_t, u_int32_t, u_int32_t));
+int __db_ferr __P((const DB_ENV *, const char *, int));
void __db_pgerr __P((DB *, db_pgno_t, int));
-gint __db_pgfmt __P((DB_ENV *, db_pgno_t));
-gint __db_eopnotsup __P((const DB_ENV *));
+int __db_pgfmt __P((DB_ENV *, db_pgno_t));
+int __db_eopnotsup __P((const DB_ENV *));
#ifdef DIAGNOSTIC
-void __db_assert __P((const gchar *, const gchar *, int));
+void __db_assert __P((const char *, const char *, int));
#endif
-gint __db_panic_msg __P((DB_ENV *));
-gint __db_panic __P((DB_ENV *, int));
-void __db_err __P((const DB_ENV *, const gchar *, ...));
-void __db_errcall __P((const DB_ENV *, int, int, const gchar *, va_list));
-void __db_errfile __P((const DB_ENV *, int, int, const gchar *, va_list));
-void __db_logmsg __P((const DB_ENV *, DB_TXN *, const gchar *, u_int32_t, const gchar *, ...));
-gint __db_unknown_flag __P((DB_ENV *, gchar *, u_int32_t));
-gint __db_unknown_type __P((DB_ENV *, gchar *, DBTYPE));
-gint __db_check_txn __P((DB *, DB_TXN *, u_int32_t, int));
-gint __db_not_txn_env __P((DB_ENV *));
-gint __db_getlong __P((DB *, const gchar *, gchar *, long, long, long *));
-gint __db_getulong __P((DB *, const gchar *, gchar *, u_long, u_long, u_long *));
+int __db_panic_msg __P((DB_ENV *));
+int __db_panic __P((DB_ENV *, int));
+void __db_err __P((const DB_ENV *, const char *, ...));
+void __db_errcall __P((const DB_ENV *, int, int, const char *, va_list));
+void __db_errfile __P((const DB_ENV *, int, int, const char *, va_list));
+void __db_logmsg __P((const DB_ENV *, DB_TXN *, const char *, u_int32_t, const char *, ...));
+int __db_unknown_flag __P((DB_ENV *, char *, u_int32_t));
+int __db_unknown_type __P((DB_ENV *, char *, DBTYPE));
+int __db_check_txn __P((DB *, DB_TXN *, u_int32_t, int));
+int __db_not_txn_env __P((DB_ENV *));
+int __db_getlong __P((DB *, const char *, char *, long, long, long *));
+int __db_getulong __P((DB *, const char *, char *, u_long, u_long, u_long *));
void __db_idspace __P((u_int32_t *, int, u_int32_t *, u_int32_t *));
u_int32_t __db_log2 __P((u_int32_t));
-gint __db_util_arg __P((gchar *, gchar *, gint *, gchar ***));
-gint __db_util_cache __P((DB_ENV *, DB *, u_int32_t *, gint *));
-gint __db_util_logset __P((const gchar *, gchar *));
+int __db_util_arg __P((char *, char *, int *, char ***));
+int __db_util_cache __P((DB_ENV *, DB *, u_int32_t *, int *));
+int __db_util_logset __P((const char *, char *));
void __db_util_siginit __P((void));
-gint __db_util_interrupted __P((void));
+int __db_util_interrupted __P((void));
void __db_util_sigresend __P((void));
#if defined(__cplusplus)
diff --git a/libdb/dbinc_auto/crypto_ext.h b/libdb/dbinc_auto/crypto_ext.h
index 7f06f53..e37a895 100644
--- a/libdb/dbinc_auto/crypto_ext.h
+++ b/libdb/dbinc_auto/crypto_ext.h
@@ -6,30 +6,30 @@
extern "C" {
#endif
-gint __aes_setup __P((DB_ENV *, DB_CIPHER *));
-gint __aes_adj_size __P((size_t));
-gint __aes_close __P((DB_ENV *, gpointer ));
-gint __aes_decrypt __P((DB_ENV *, gpointer , gpointer , u_int8_t *, size_t));
-gint __aes_encrypt __P((DB_ENV *, gpointer , gpointer , u_int8_t *, size_t));
-gint __aes_init __P((DB_ENV *, DB_CIPHER *));
-gint __crypto_region_init __P((DB_ENV *));
-gint __crypto_dbenv_close __P((DB_ENV *));
-gint __crypto_algsetup __P((DB_ENV *, DB_CIPHER *, u_int32_t, int));
-gint __crypto_decrypt_meta __P((DB_ENV *, DB *, u_int8_t *, int));
-gint __db_generate_iv __P((DB_ENV *, u_int32_t *));
-gint __db_rijndaelKeySetupEnc __P((u32 *, const u8 *, int));
-gint __db_rijndaelKeySetupDec __P((u32 *, const u8 *, int));
+int __aes_setup __P((DB_ENV *, DB_CIPHER *));
+int __aes_adj_size __P((size_t));
+int __aes_close __P((DB_ENV *, void *));
+int __aes_decrypt __P((DB_ENV *, void *, void *, u_int8_t *, size_t));
+int __aes_encrypt __P((DB_ENV *, void *, void *, u_int8_t *, size_t));
+int __aes_init __P((DB_ENV *, DB_CIPHER *));
+int __crypto_region_init __P((DB_ENV *));
+int __crypto_dbenv_close __P((DB_ENV *));
+int __crypto_algsetup __P((DB_ENV *, DB_CIPHER *, u_int32_t, int));
+int __crypto_decrypt_meta __P((DB_ENV *, DB *, u_int8_t *, int));
+int __db_generate_iv __P((DB_ENV *, u_int32_t *));
+int __db_rijndaelKeySetupEnc __P((u32 *, const u8 *, int));
+int __db_rijndaelKeySetupDec __P((u32 *, const u8 *, int));
void __db_rijndaelEncrypt __P((u32 *, int, const u8 *, u8 *));
void __db_rijndaelDecrypt __P((u32 *, int, const u8 *, u8 *));
void __db_rijndaelEncryptRound __P((const u32 *, int, u8 *, int));
void __db_rijndaelDecryptRound __P((const u32 *, int, u8 *, int));
-gint __db_makeKey __P((keyInstance *, int, int, gchar *));
-gint __db_cipherInit __P((cipherInstance *, int, gchar *));
-gint __db_blockEncrypt __P((cipherInstance *, keyInstance *, BYTE *, size_t, BYTE *));
-gint __db_padEncrypt __P((cipherInstance *, keyInstance *, BYTE *, int, BYTE *));
-gint __db_blockDecrypt __P((cipherInstance *, keyInstance *, BYTE *, size_t, BYTE *));
-gint __db_padDecrypt __P((cipherInstance *, keyInstance *, BYTE *, int, BYTE *));
-gint __db_cipherUpdateRounds __P((cipherInstance *, keyInstance *, BYTE *, int, BYTE *, int));
+int __db_makeKey __P((keyInstance *, int, int, char *));
+int __db_cipherInit __P((cipherInstance *, int, char *));
+int __db_blockEncrypt __P((cipherInstance *, keyInstance *, BYTE *, size_t, BYTE *));
+int __db_padEncrypt __P((cipherInstance *, keyInstance *, BYTE *, int, BYTE *));
+int __db_blockDecrypt __P((cipherInstance *, keyInstance *, BYTE *, size_t, BYTE *));
+int __db_padDecrypt __P((cipherInstance *, keyInstance *, BYTE *, int, BYTE *));
+int __db_cipherUpdateRounds __P((cipherInstance *, keyInstance *, BYTE *, int, BYTE *, int));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/db_ext.h b/libdb/dbinc_auto/db_ext.h
index a6e0a80..24a1397 100644
--- a/libdb/dbinc_auto/db_ext.h
+++ b/libdb/dbinc_auto/db_ext.h
@@ -6,217 +6,217 @@
extern "C" {
#endif
-gint __crdel_metasub_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, const DBT *, DB_LSN *));
-gint __crdel_metasub_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __crdel_metasub_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __crdel_metasub_read __P((DB_ENV *, gpointer , __crdel_metasub_args **));
-gint __crdel_init_print __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __crdel_init_getpgnos __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __crdel_init_recover __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __crdel_metasub_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_master_open __P((DB *, DB_TXN *, const gchar *, u_int32_t, int, DB **));
-gint __db_master_update __P((DB *, DB *, DB_TXN *, const gchar *, DBTYPE, mu_action, const gchar *, u_int32_t));
-gint __db_dbenv_setup __P((DB *, DB_TXN *, const gchar *, u_int32_t, u_int32_t));
-gint __db_close __P((DB *, u_int32_t));
-gint __db_close_i __P((DB *, DB_TXN *, u_int32_t));
-gint __db_refresh __P((DB *, DB_TXN *, u_int32_t));
-gint __db_log_page __P((DB *, DB_TXN *, DB_LSN *, db_pgno_t, PAGE *));
-gint __db_backup_name __P((DB_ENV *, const gchar *, DB_TXN *, gchar **));
+int __crdel_metasub_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, const DBT *, DB_LSN *));
+int __crdel_metasub_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __crdel_metasub_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __crdel_metasub_read __P((DB_ENV *, void *, __crdel_metasub_args **));
+int __crdel_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __crdel_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __crdel_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __crdel_metasub_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_master_open __P((DB *, DB_TXN *, const char *, u_int32_t, int, DB **));
+int __db_master_update __P((DB *, DB *, DB_TXN *, const char *, DBTYPE, mu_action, const char *, u_int32_t));
+int __db_dbenv_setup __P((DB *, DB_TXN *, const char *, u_int32_t, u_int32_t));
+int __db_close __P((DB *, u_int32_t));
+int __db_close_i __P((DB *, DB_TXN *, u_int32_t));
+int __db_refresh __P((DB *, DB_TXN *, u_int32_t));
+int __db_log_page __P((DB *, DB_TXN *, DB_LSN *, db_pgno_t, PAGE *));
+int __db_backup_name __P((DB_ENV *, const char *, DB_TXN *, char **));
DB *__dblist_get __P((DB_ENV *, u_int32_t));
#if CONFIG_TEST
-gint __db_testcopy __P((DB_ENV *, DB *, const gchar *));
+int __db_testcopy __P((DB_ENV *, DB *, const char *));
#endif
-gint __db_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
-gint __db_icursor __P((DB *, DB_TXN *, DBTYPE, db_pgno_t, int, u_int32_t, DBC **));
-gint __db_cprint __P((DB *));
-gint __db_fd __P((DB *, gint *));
-gint __db_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-gint __db_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-gint __db_delete __P((DB *, DB_TXN *, DBT *, u_int32_t));
-gint __db_sync __P((DB *, u_int32_t));
-gint __db_associate __P((DB *, DB_TXN *, DB *, gint (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
-gint __db_pget __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
-gint __db_addrem_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, u_int32_t, u_int32_t, const DBT *, const DBT *, DB_LSN *));
-gint __db_addrem_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_addrem_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_addrem_read __P((DB_ENV *, gpointer , __db_addrem_args **));
-gint __db_big_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, db_pgno_t, db_pgno_t, const DBT *, DB_LSN *, DB_LSN *, DB_LSN *));
-gint __db_big_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_big_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_big_read __P((DB_ENV *, gpointer , __db_big_args **));
-gint __db_ovref_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, int32_t, DB_LSN *));
-gint __db_ovref_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_ovref_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_ovref_read __P((DB_ENV *, gpointer , __db_ovref_args **));
-gint __db_relink_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *));
-gint __db_relink_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_relink_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_relink_read __P((DB_ENV *, gpointer , __db_relink_args **));
-gint __db_debug_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, int32_t, const DBT *, const DBT *, u_int32_t));
-gint __db_debug_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_debug_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_debug_read __P((DB_ENV *, gpointer , __db_debug_args **));
-gint __db_noop_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *));
-gint __db_noop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_noop_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_noop_read __P((DB_ENV *, gpointer , __db_noop_args **));
-gint __db_pg_alloc_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, u_int32_t, db_pgno_t));
-gint __db_pg_alloc_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_pg_alloc_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_pg_alloc_read __P((DB_ENV *, gpointer , __db_pg_alloc_args **));
-gint __db_pg_free_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, const DBT *, db_pgno_t));
-gint __db_pg_free_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_pg_free_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_pg_free_read __P((DB_ENV *, gpointer , __db_pg_free_args **));
-gint __db_cksum_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t));
-gint __db_cksum_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_cksum_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_cksum_read __P((DB_ENV *, gpointer , __db_cksum_args **));
-gint __db_init_print __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __db_init_getpgnos __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __db_init_recover __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __db_c_close __P((DBC *));
-gint __db_c_destroy __P((DBC *));
-gint __db_c_count __P((DBC *, db_recno_t *, u_int32_t));
-gint __db_c_del __P((DBC *, u_int32_t));
-gint __db_c_dup __P((DBC *, DBC **, u_int32_t));
-gint __db_c_idup __P((DBC *, DBC **, u_int32_t));
-gint __db_c_newopd __P((DBC *, db_pgno_t, DBC *, DBC **));
-gint __db_c_get __P((DBC *, DBT *, DBT *, u_int32_t));
-gint __db_c_put __P((DBC *, DBT *, DBT *, u_int32_t));
-gint __db_duperr __P((DB *, u_int32_t));
-gint __db_c_secondary_get __P((DBC *, DBT *, DBT *, u_int32_t));
-gint __db_c_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
-gint __db_c_del_primary __P((DBC *));
+int __db_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
+int __db_icursor __P((DB *, DB_TXN *, DBTYPE, db_pgno_t, int, u_int32_t, DBC **));
+int __db_cprint __P((DB *));
+int __db_fd __P((DB *, int *));
+int __db_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+int __db_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+int __db_delete __P((DB *, DB_TXN *, DBT *, u_int32_t));
+int __db_sync __P((DB *, u_int32_t));
+int __db_associate __P((DB *, DB_TXN *, DB *, int (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
+int __db_pget __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
+int __db_addrem_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, u_int32_t, u_int32_t, const DBT *, const DBT *, DB_LSN *));
+int __db_addrem_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_addrem_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_addrem_read __P((DB_ENV *, void *, __db_addrem_args **));
+int __db_big_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, db_pgno_t, db_pgno_t, const DBT *, DB_LSN *, DB_LSN *, DB_LSN *));
+int __db_big_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_big_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_big_read __P((DB_ENV *, void *, __db_big_args **));
+int __db_ovref_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, int32_t, DB_LSN *));
+int __db_ovref_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_ovref_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_ovref_read __P((DB_ENV *, void *, __db_ovref_args **));
+int __db_relink_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *));
+int __db_relink_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_relink_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_relink_read __P((DB_ENV *, void *, __db_relink_args **));
+int __db_debug_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, int32_t, const DBT *, const DBT *, u_int32_t));
+int __db_debug_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_debug_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_debug_read __P((DB_ENV *, void *, __db_debug_args **));
+int __db_noop_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *));
+int __db_noop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_noop_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_noop_read __P((DB_ENV *, void *, __db_noop_args **));
+int __db_pg_alloc_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, u_int32_t, db_pgno_t));
+int __db_pg_alloc_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_pg_alloc_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_pg_alloc_read __P((DB_ENV *, void *, __db_pg_alloc_args **));
+int __db_pg_free_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, const DBT *, db_pgno_t));
+int __db_pg_free_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_pg_free_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_pg_free_read __P((DB_ENV *, void *, __db_pg_free_args **));
+int __db_cksum_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t));
+int __db_cksum_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_cksum_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_cksum_read __P((DB_ENV *, void *, __db_cksum_args **));
+int __db_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __db_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __db_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __db_c_close __P((DBC *));
+int __db_c_destroy __P((DBC *));
+int __db_c_count __P((DBC *, db_recno_t *, u_int32_t));
+int __db_c_del __P((DBC *, u_int32_t));
+int __db_c_dup __P((DBC *, DBC **, u_int32_t));
+int __db_c_idup __P((DBC *, DBC **, u_int32_t));
+int __db_c_newopd __P((DBC *, db_pgno_t, DBC *, DBC **));
+int __db_c_get __P((DBC *, DBT *, DBT *, u_int32_t));
+int __db_c_put __P((DBC *, DBT *, DBT *, u_int32_t));
+int __db_duperr __P((DB *, u_int32_t));
+int __db_c_secondary_get __P((DBC *, DBT *, DBT *, u_int32_t));
+int __db_c_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
+int __db_c_del_primary __P((DBC *));
DB *__db_s_first __P((DB *));
-gint __db_s_next __P((DB **));
-gint __db_s_done __P((DB *));
+int __db_s_next __P((DB **));
+int __db_s_done __P((DB *));
u_int32_t __db_partsize __P((u_int32_t, DBT *));
-gint __db_pgin __P((DB_ENV *, db_pgno_t, gpointer , DBT *));
-gint __db_pgout __P((DB_ENV *, db_pgno_t, gpointer , DBT *));
+int __db_pgin __P((DB_ENV *, db_pgno_t, void *, DBT *));
+int __db_pgout __P((DB_ENV *, db_pgno_t, void *, DBT *));
void __db_metaswap __P((PAGE *));
-gint __db_byteswap __P((DB_ENV *, DB *, db_pgno_t, PAGE *, size_t, int));
-gint __db_dispatch __P((DB_ENV *, gint (**)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer )), size_t, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_add_recovery __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *, gint (*)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), u_int32_t));
-gint __db_txnlist_init __P((DB_ENV *, u_int32_t, u_int32_t, DB_LSN *, gpointer ));
-gint __db_txnlist_add __P((DB_ENV *, gpointer , u_int32_t, int32_t, DB_LSN *));
-gint __db_txnlist_remove __P((DB_ENV *, gpointer , u_int32_t));
-void __db_txnlist_ckp __P((DB_ENV *, gpointer , DB_LSN *));
-void __db_txnlist_end __P((DB_ENV *, gpointer ));
-gint __db_txnlist_find __P((DB_ENV *, gpointer , u_int32_t));
-gint __db_txnlist_update __P((DB_ENV *, gpointer , u_int32_t, u_int32_t, DB_LSN *));
-gint __db_txnlist_gen __P((DB_ENV *, gpointer , int, u_int32_t, u_int32_t));
-gint __db_txnlist_lsnadd __P((DB_ENV *, gpointer , DB_LSN *, u_int32_t));
-gint __db_txnlist_lsninit __P((DB_ENV *, DB_TXNHEAD *, DB_LSN *));
-gint __db_add_limbo __P((DB_ENV *, gpointer , int32_t, db_pgno_t, int32_t));
-gint __db_do_the_limbo __P((DB_ENV *, DB_TXN *, DB_TXN *, DB_TXNHEAD *));
-void __db_txnlist_print __P((gpointer));
-gint __db_ditem __P((DBC *, PAGE *, u_int32_t, u_int32_t));
-gint __db_pitem __P((DBC *, PAGE *, u_int32_t, u_int32_t, DBT *, DBT *));
-gint __db_relink __P((DBC *, u_int32_t, PAGE *, PAGE **, int));
-gint __db_cursorchk __P((const DB *, u_int32_t));
-gint __db_ccountchk __P((const DB *, u_int32_t, int));
-gint __db_cdelchk __P((const DB *, u_int32_t, int));
-gint __db_cgetchk __P((const DB *, DBT *, DBT *, u_int32_t, int));
-gint __db_cputchk __P((const DB *, const DBT *, DBT *, u_int32_t, int));
-gint __db_pgetchk __P((const DB *, const DBT *, DBT *, DBT *, u_int32_t));
-gint __db_cpgetchk __P((const DB *, DBT *, DBT *, DBT *, u_int32_t, int));
-gint __db_delchk __P((const DB *, DBT *, u_int32_t));
-gint __db_getchk __P((const DB *, const DBT *, DBT *, u_int32_t));
-gint __db_joinchk __P((const DB *, DBC * const *, u_int32_t));
-gint __db_joingetchk __P((const DB *, DBT *, u_int32_t));
-gint __db_putchk __P((const DB *, DBT *, const DBT *, u_int32_t, int));
-gint __db_statchk __P((const DB *, u_int32_t));
-gint __db_syncchk __P((const DB *, u_int32_t));
-gint __db_secondary_corrupt __P((DB *));
-gint __db_associatechk __P((DB *, DB *, gint (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
-gint __db_txn_auto __P((DB *, DB_TXN **));
-gint __db_join __P((DB *, DBC **, DBC **, u_int32_t));
-gint __db_new __P((DBC *, u_int32_t, PAGE **));
-gint __db_free __P((DBC *, PAGE *));
-gint __db_lprint __P((DBC *));
-gint __db_lget __P((DBC *, int, db_pgno_t, db_lockmode_t, u_int32_t, DB_LOCK *));
-gint __db_lput __P((DBC *, DB_LOCK *));
-gint __dbh_am_chk __P((DB *, u_int32_t));
-gint __db_set_lorder __P((DB *, int));
-gint __db_open __P((DB *, DB_TXN *, const gchar *, const gchar *, DBTYPE, u_int32_t, int));
-gint __db_dbopen __P((DB *, DB_TXN *, const gchar *, const gchar *, u_int32_t, int, db_pgno_t));
-gint __db_new_file __P((DB *, DB_TXN *, DB_FH *, const gchar *));
-gint __db_init_subdb __P((DB *, DB *, const gchar *, DB_TXN *));
-gint __db_chk_meta __P((DB_ENV *, DB *, DBMETA *, int));
-gint __db_meta_setup __P((DB_ENV *, DB *, const gchar *, DBMETA *, u_int32_t, int));
-gint __db_goff __P((DB *, DBT *, u_int32_t, db_pgno_t, gpointer *, u_int32_t *));
-gint __db_poff __P((DBC *, const DBT *, db_pgno_t *));
-gint __db_ovref __P((DBC *, db_pgno_t, int32_t));
-gint __db_doff __P((DBC *, db_pgno_t));
-gint __db_moff __P((DB *, const DBT *, db_pgno_t, u_int32_t, gint (*)(DB *, const DBT *, const DBT *), gint *));
-gint __db_vrfy_overflow __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-gint __db_vrfy_ovfl_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t, u_int32_t));
-gint __db_safe_goff __P((DB *, VRFY_DBINFO *, db_pgno_t, DBT *, gpointer *, u_int32_t));
+int __db_byteswap __P((DB_ENV *, DB *, db_pgno_t, PAGE *, size_t, int));
+int __db_dispatch __P((DB_ENV *, int (**)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)), size_t, DBT *, DB_LSN *, db_recops, void *));
+int __db_add_recovery __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *, int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), u_int32_t));
+int __db_txnlist_init __P((DB_ENV *, u_int32_t, u_int32_t, DB_LSN *, void *));
+int __db_txnlist_add __P((DB_ENV *, void *, u_int32_t, int32_t, DB_LSN *));
+int __db_txnlist_remove __P((DB_ENV *, void *, u_int32_t));
+void __db_txnlist_ckp __P((DB_ENV *, void *, DB_LSN *));
+void __db_txnlist_end __P((DB_ENV *, void *));
+int __db_txnlist_find __P((DB_ENV *, void *, u_int32_t));
+int __db_txnlist_update __P((DB_ENV *, void *, u_int32_t, u_int32_t, DB_LSN *));
+int __db_txnlist_gen __P((DB_ENV *, void *, int, u_int32_t, u_int32_t));
+int __db_txnlist_lsnadd __P((DB_ENV *, void *, DB_LSN *, u_int32_t));
+int __db_txnlist_lsninit __P((DB_ENV *, DB_TXNHEAD *, DB_LSN *));
+int __db_add_limbo __P((DB_ENV *, void *, int32_t, db_pgno_t, int32_t));
+int __db_do_the_limbo __P((DB_ENV *, DB_TXN *, DB_TXN *, DB_TXNHEAD *));
+void __db_txnlist_print __P((void *));
+int __db_ditem __P((DBC *, PAGE *, u_int32_t, u_int32_t));
+int __db_pitem __P((DBC *, PAGE *, u_int32_t, u_int32_t, DBT *, DBT *));
+int __db_relink __P((DBC *, u_int32_t, PAGE *, PAGE **, int));
+int __db_cursorchk __P((const DB *, u_int32_t));
+int __db_ccountchk __P((const DB *, u_int32_t, int));
+int __db_cdelchk __P((const DB *, u_int32_t, int));
+int __db_cgetchk __P((const DB *, DBT *, DBT *, u_int32_t, int));
+int __db_cputchk __P((const DB *, const DBT *, DBT *, u_int32_t, int));
+int __db_pgetchk __P((const DB *, const DBT *, DBT *, DBT *, u_int32_t));
+int __db_cpgetchk __P((const DB *, DBT *, DBT *, DBT *, u_int32_t, int));
+int __db_delchk __P((const DB *, DBT *, u_int32_t));
+int __db_getchk __P((const DB *, const DBT *, DBT *, u_int32_t));
+int __db_joinchk __P((const DB *, DBC * const *, u_int32_t));
+int __db_joingetchk __P((const DB *, DBT *, u_int32_t));
+int __db_putchk __P((const DB *, DBT *, const DBT *, u_int32_t, int));
+int __db_statchk __P((const DB *, u_int32_t));
+int __db_syncchk __P((const DB *, u_int32_t));
+int __db_secondary_corrupt __P((DB *));
+int __db_associatechk __P((DB *, DB *, int (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
+int __db_txn_auto __P((DB *, DB_TXN **));
+int __db_join __P((DB *, DBC **, DBC **, u_int32_t));
+int __db_new __P((DBC *, u_int32_t, PAGE **));
+int __db_free __P((DBC *, PAGE *));
+int __db_lprint __P((DBC *));
+int __db_lget __P((DBC *, int, db_pgno_t, db_lockmode_t, u_int32_t, DB_LOCK *));
+int __db_lput __P((DBC *, DB_LOCK *));
+int __dbh_am_chk __P((DB *, u_int32_t));
+int __db_set_lorder __P((DB *, int));
+int __db_open __P((DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int));
+int __db_dbopen __P((DB *, DB_TXN *, const char *, const char *, u_int32_t, int, db_pgno_t));
+int __db_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
+int __db_init_subdb __P((DB *, DB *, const char *, DB_TXN *));
+int __db_chk_meta __P((DB_ENV *, DB *, DBMETA *, int));
+int __db_meta_setup __P((DB_ENV *, DB *, const char *, DBMETA *, u_int32_t, int));
+int __db_goff __P((DB *, DBT *, u_int32_t, db_pgno_t, void **, u_int32_t *));
+int __db_poff __P((DBC *, const DBT *, db_pgno_t *));
+int __db_ovref __P((DBC *, db_pgno_t, int32_t));
+int __db_doff __P((DBC *, db_pgno_t));
+int __db_moff __P((DB *, const DBT *, db_pgno_t, u_int32_t, int (*)(DB *, const DBT *, const DBT *), int *));
+int __db_vrfy_overflow __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
+int __db_vrfy_ovfl_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t, u_int32_t));
+int __db_safe_goff __P((DB *, VRFY_DBINFO *, db_pgno_t, DBT *, void **, u_int32_t));
void __db_loadme __P((void));
-gint __db_dump __P((DB *, gchar *, gchar *));
-void __db_inmemdbflags __P((u_int32_t, gpointer , void (*)(u_int32_t, const FN *, gpointer )));
-gint __db_prnpage __P((DB *, db_pgno_t, FILE *));
-gint __db_prpage __P((DB *, PAGE *, FILE *, u_int32_t));
+int __db_dump __P((DB *, char *, char *));
+void __db_inmemdbflags __P((u_int32_t, void *, void (*)(u_int32_t, const FN *, void *)));
+int __db_prnpage __P((DB *, db_pgno_t, FILE *));
+int __db_prpage __P((DB *, PAGE *, FILE *, u_int32_t));
void __db_pr __P((u_int8_t *, u_int32_t, FILE *));
-gint __db_prdbt __P((DBT *, int, const gchar *, gpointer , gint (*)(gpointer , gconstpointer ), int, VRFY_DBINFO *));
-void __db_prflags __P((u_int32_t, const FN *, gpointer ));
-const gchar * __db_dbtype_to_string __P((DBTYPE));
-int __db_prheader __P((DB *, gchar *, int, int, gpointer , gint (*)(gpointer , gconstpointer ), VRFY_DBINFO *, db_pgno_t));
-gint __db_prfooter __P((gpointer , gint (*)(gpointer , gconstpointer )));
-gint __db_addrem_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_big_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_ovref_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_relink_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_debug_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_noop_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_pg_alloc_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_pg_free_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_cksum_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __db_traverse_big __P((DB *, db_pgno_t, gint (*)(DB *, PAGE *, gpointer , gint *), gpointer ));
-gint __db_reclaim_callback __P((DB *, PAGE *, gpointer , gint *));
-gint __db_truncate_callback __P((DB *, PAGE *, gpointer , gint *));
-gint __dbenv_dbremove __P((DB_ENV *, DB_TXN *, const gchar *, const gchar *, u_int32_t));
-gint __db_remove __P((DB *, const gchar *, const gchar *, u_int32_t));
-gint __db_remove_i __P((DB *, DB_TXN *, const gchar *, const gchar *));
-gint __dbenv_dbrename __P((DB_ENV *, DB_TXN *, const gchar *, const gchar *, const gchar *, u_int32_t));
-gint __db_rename __P((DB *, const gchar *, const gchar *, const gchar *, u_int32_t));
-gint __db_rename_i __P((DB *, DB_TXN *, const gchar *, const gchar *, const gchar *));
-gint __db_ret __P((DB *, PAGE *, u_int32_t, DBT *, gpointer *, u_int32_t *));
-gint __db_retcopy __P((DB_ENV *, DBT *, gpointer , u_int32_t, gpointer *, u_int32_t *));
-gint __db_truncate __P((DB *, DB_TXN *, u_int32_t *, u_int32_t));
-gint __db_upgrade __P((DB *, const gchar *, u_int32_t));
-gint __db_lastpgno __P((DB *, gchar *, DB_FH *, db_pgno_t *));
-gint __db_31_offdup __P((DB *, gchar *, DB_FH *, int, db_pgno_t *));
-gint __db_verify __P((DB *, const gchar *, const gchar *, FILE *, u_int32_t));
-gint __db_verify_callback __P((gpointer , gconstpointer ));
-gint __db_verify_internal __P((DB *, const gchar *, const gchar *, gpointer , gint (*)(gpointer , gconstpointer ), u_int32_t));
-gint __db_vrfy_datapage __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-gint __db_vrfy_meta __P((DB *, VRFY_DBINFO *, DBMETA *, db_pgno_t, u_int32_t));
+int __db_prdbt __P((DBT *, int, const char *, void *, int (*)(void *, const void *), int, VRFY_DBINFO *));
+void __db_prflags __P((u_int32_t, const FN *, void *));
+const char * __db_dbtype_to_string __P((DBTYPE));
+int __db_prheader __P((DB *, char *, int, int, void *, int (*)(void *, const void *), VRFY_DBINFO *, db_pgno_t));
+int __db_prfooter __P((void *, int (*)(void *, const void *)));
+int __db_addrem_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_big_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_ovref_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_relink_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_debug_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_noop_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_pg_alloc_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_pg_free_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_cksum_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __db_traverse_big __P((DB *, db_pgno_t, int (*)(DB *, PAGE *, void *, int *), void *));
+int __db_reclaim_callback __P((DB *, PAGE *, void *, int *));
+int __db_truncate_callback __P((DB *, PAGE *, void *, int *));
+int __dbenv_dbremove __P((DB_ENV *, DB_TXN *, const char *, const char *, u_int32_t));
+int __db_remove __P((DB *, const char *, const char *, u_int32_t));
+int __db_remove_i __P((DB *, DB_TXN *, const char *, const char *));
+int __dbenv_dbrename __P((DB_ENV *, DB_TXN *, const char *, const char *, const char *, u_int32_t));
+int __db_rename __P((DB *, const char *, const char *, const char *, u_int32_t));
+int __db_rename_i __P((DB *, DB_TXN *, const char *, const char *, const char *));
+int __db_ret __P((DB *, PAGE *, u_int32_t, DBT *, void **, u_int32_t *));
+int __db_retcopy __P((DB_ENV *, DBT *, void *, u_int32_t, void **, u_int32_t *));
+int __db_truncate __P((DB *, DB_TXN *, u_int32_t *, u_int32_t));
+int __db_upgrade __P((DB *, const char *, u_int32_t));
+int __db_lastpgno __P((DB *, char *, DB_FH *, db_pgno_t *));
+int __db_31_offdup __P((DB *, char *, DB_FH *, int, db_pgno_t *));
+int __db_verify __P((DB *, const char *, const char *, FILE *, u_int32_t));
+int __db_verify_callback __P((void *, const void *));
+int __db_verify_internal __P((DB *, const char *, const char *, void *, int (*)(void *, const void *), u_int32_t));
+int __db_vrfy_datapage __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
+int __db_vrfy_meta __P((DB *, VRFY_DBINFO *, DBMETA *, db_pgno_t, u_int32_t));
void __db_vrfy_struct_feedback __P((DB *, VRFY_DBINFO *));
-gint __db_vrfy_inpitem __P((DB *, PAGE *, db_pgno_t, u_int32_t, int, u_int32_t, u_int32_t *, u_int32_t *));
-gint __db_vrfy_duptype __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
-gint __db_salvage_duptree __P((DB *, VRFY_DBINFO *, db_pgno_t, DBT *, gpointer , gint (*)(gpointer , gconstpointer ), u_int32_t));
-gint __db_vrfy_dbinfo_create __P((DB_ENV *, u_int32_t, VRFY_DBINFO **));
-gint __db_vrfy_dbinfo_destroy __P((DB_ENV *, VRFY_DBINFO *));
-gint __db_vrfy_getpageinfo __P((VRFY_DBINFO *, db_pgno_t, VRFY_PAGEINFO **));
-gint __db_vrfy_putpageinfo __P((DB_ENV *, VRFY_DBINFO *, VRFY_PAGEINFO *));
-gint __db_vrfy_pgset __P((DB_ENV *, u_int32_t, DB **));
-gint __db_vrfy_pgset_get __P((DB *, db_pgno_t, gint *));
-gint __db_vrfy_pgset_inc __P((DB *, db_pgno_t));
-gint __db_vrfy_pgset_dec __P((DB *, db_pgno_t));
-gint __db_vrfy_pgset_next __P((DBC *, db_pgno_t *));
-gint __db_vrfy_childcursor __P((VRFY_DBINFO *, DBC **));
-gint __db_vrfy_childput __P((VRFY_DBINFO *, db_pgno_t, VRFY_CHILDINFO *));
-gint __db_vrfy_ccset __P((DBC *, db_pgno_t, VRFY_CHILDINFO **));
-gint __db_vrfy_ccnext __P((DBC *, VRFY_CHILDINFO **));
-gint __db_vrfy_ccclose __P((DBC *));
-gint __db_salvage_init __P((VRFY_DBINFO *));
+int __db_vrfy_inpitem __P((DB *, PAGE *, db_pgno_t, u_int32_t, int, u_int32_t, u_int32_t *, u_int32_t *));
+int __db_vrfy_duptype __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
+int __db_salvage_duptree __P((DB *, VRFY_DBINFO *, db_pgno_t, DBT *, void *, int (*)(void *, const void *), u_int32_t));
+int __db_vrfy_dbinfo_create __P((DB_ENV *, u_int32_t, VRFY_DBINFO **));
+int __db_vrfy_dbinfo_destroy __P((DB_ENV *, VRFY_DBINFO *));
+int __db_vrfy_getpageinfo __P((VRFY_DBINFO *, db_pgno_t, VRFY_PAGEINFO **));
+int __db_vrfy_putpageinfo __P((DB_ENV *, VRFY_DBINFO *, VRFY_PAGEINFO *));
+int __db_vrfy_pgset __P((DB_ENV *, u_int32_t, DB **));
+int __db_vrfy_pgset_get __P((DB *, db_pgno_t, int *));
+int __db_vrfy_pgset_inc __P((DB *, db_pgno_t));
+int __db_vrfy_pgset_dec __P((DB *, db_pgno_t));
+int __db_vrfy_pgset_next __P((DBC *, db_pgno_t *));
+int __db_vrfy_childcursor __P((VRFY_DBINFO *, DBC **));
+int __db_vrfy_childput __P((VRFY_DBINFO *, db_pgno_t, VRFY_CHILDINFO *));
+int __db_vrfy_ccset __P((DBC *, db_pgno_t, VRFY_CHILDINFO **));
+int __db_vrfy_ccnext __P((DBC *, VRFY_CHILDINFO **));
+int __db_vrfy_ccclose __P((DBC *));
+int __db_salvage_init __P((VRFY_DBINFO *));
void __db_salvage_destroy __P((VRFY_DBINFO *));
-gint __db_salvage_getnext __P((VRFY_DBINFO *, db_pgno_t *, u_int32_t *));
-gint __db_salvage_isdone __P((VRFY_DBINFO *, db_pgno_t));
-gint __db_salvage_markdone __P((VRFY_DBINFO *, db_pgno_t));
-gint __db_salvage_markneeded __P((VRFY_DBINFO *, db_pgno_t, u_int32_t));
+int __db_salvage_getnext __P((VRFY_DBINFO *, db_pgno_t *, u_int32_t *));
+int __db_salvage_isdone __P((VRFY_DBINFO *, db_pgno_t));
+int __db_salvage_markdone __P((VRFY_DBINFO *, db_pgno_t));
+int __db_salvage_markneeded __P((VRFY_DBINFO *, db_pgno_t, u_int32_t));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/db_server.h b/libdb/dbinc_auto/db_server.h
index 45f6e6d..3409eed 100644
--- a/libdb/dbinc_auto/db_server.h
+++ b/libdb/dbinc_auto/db_server.h
@@ -16,7 +16,7 @@ struct __env_cachesize_msg {
typedef struct __env_cachesize_msg __env_cachesize_msg;
struct __env_cachesize_reply {
- gint status;
+ int status;
};
typedef struct __env_cachesize_reply __env_cachesize_reply;
@@ -27,7 +27,7 @@ struct __env_close_msg {
typedef struct __env_close_msg __env_close_msg;
struct __env_close_reply {
- gint status;
+ int status;
};
typedef struct __env_close_reply __env_close_reply;
@@ -37,7 +37,7 @@ struct __env_create_msg {
typedef struct __env_create_msg __env_create_msg;
struct __env_create_reply {
- gint status;
+ int status;
u_int envcl_id;
};
typedef struct __env_create_reply __env_create_reply;
@@ -45,41 +45,41 @@ typedef struct __env_create_reply __env_create_reply;
struct __env_dbremove_msg {
u_int dbenvcl_id;
u_int txnpcl_id;
- gchar *name;
- gchar *subdb;
+ char *name;
+ char *subdb;
u_int flags;
};
typedef struct __env_dbremove_msg __env_dbremove_msg;
struct __env_dbremove_reply {
- gint status;
+ int status;
};
typedef struct __env_dbremove_reply __env_dbremove_reply;
struct __env_dbrename_msg {
u_int dbenvcl_id;
u_int txnpcl_id;
- gchar *name;
- gchar *subdb;
- gchar *newname;
+ char *name;
+ char *subdb;
+ char *newname;
u_int flags;
};
typedef struct __env_dbrename_msg __env_dbrename_msg;
struct __env_dbrename_reply {
- gint status;
+ int status;
};
typedef struct __env_dbrename_reply __env_dbrename_reply;
struct __env_encrypt_msg {
u_int dbenvcl_id;
- gchar *passwd;
+ char *passwd;
u_int flags;
};
typedef struct __env_encrypt_msg __env_encrypt_msg;
struct __env_encrypt_reply {
- gint status;
+ int status;
};
typedef struct __env_encrypt_reply __env_encrypt_reply;
@@ -91,33 +91,33 @@ struct __env_flags_msg {
typedef struct __env_flags_msg __env_flags_msg;
struct __env_flags_reply {
- gint status;
+ int status;
};
typedef struct __env_flags_reply __env_flags_reply;
struct __env_open_msg {
u_int dbenvcl_id;
- gchar *home;
+ char *home;
u_int flags;
u_int mode;
};
typedef struct __env_open_msg __env_open_msg;
struct __env_open_reply {
- gint status;
+ int status;
u_int envcl_id;
};
typedef struct __env_open_reply __env_open_reply;
struct __env_remove_msg {
u_int dbenvcl_id;
- gchar *home;
+ char *home;
u_int flags;
};
typedef struct __env_remove_msg __env_remove_msg;
struct __env_remove_reply {
- gint status;
+ int status;
};
typedef struct __env_remove_reply __env_remove_reply;
@@ -127,7 +127,7 @@ struct __txn_abort_msg {
typedef struct __txn_abort_msg __txn_abort_msg;
struct __txn_abort_reply {
- gint status;
+ int status;
};
typedef struct __txn_abort_reply __txn_abort_reply;
@@ -139,7 +139,7 @@ struct __txn_begin_msg {
typedef struct __txn_begin_msg __txn_begin_msg;
struct __txn_begin_reply {
- gint status;
+ int status;
u_int txnidcl_id;
};
typedef struct __txn_begin_reply __txn_begin_reply;
@@ -151,7 +151,7 @@ struct __txn_commit_msg {
typedef struct __txn_commit_msg __txn_commit_msg;
struct __txn_commit_reply {
- gint status;
+ int status;
};
typedef struct __txn_commit_reply __txn_commit_reply;
@@ -162,18 +162,18 @@ struct __txn_discard_msg {
typedef struct __txn_discard_msg __txn_discard_msg;
struct __txn_discard_reply {
- gint status;
+ int status;
};
typedef struct __txn_discard_reply __txn_discard_reply;
struct __txn_prepare_msg {
u_int txnpcl_id;
- gchar gid[128];
+ char gid[128];
};
typedef struct __txn_prepare_msg __txn_prepare_msg;
struct __txn_prepare_reply {
- gint status;
+ int status;
};
typedef struct __txn_prepare_reply __txn_prepare_reply;
@@ -185,14 +185,14 @@ struct __txn_recover_msg {
typedef struct __txn_recover_msg __txn_recover_msg;
struct __txn_recover_reply {
- gint status;
+ int status;
struct {
u_int txn_len;
u_int *txn_val;
} txn;
struct {
u_int gid_len;
- gchar *gid_val;
+ char *gid_val;
} gid;
u_int retcount;
};
@@ -207,7 +207,7 @@ struct __db_associate_msg {
typedef struct __db_associate_msg __db_associate_msg;
struct __db_associate_reply {
- gint status;
+ int status;
};
typedef struct __db_associate_reply __db_associate_reply;
@@ -218,7 +218,7 @@ struct __db_bt_maxkey_msg {
typedef struct __db_bt_maxkey_msg __db_bt_maxkey_msg;
struct __db_bt_maxkey_reply {
- gint status;
+ int status;
};
typedef struct __db_bt_maxkey_reply __db_bt_maxkey_reply;
@@ -229,7 +229,7 @@ struct __db_bt_minkey_msg {
typedef struct __db_bt_minkey_msg __db_bt_minkey_msg;
struct __db_bt_minkey_reply {
- gint status;
+ int status;
};
typedef struct __db_bt_minkey_reply __db_bt_minkey_reply;
@@ -240,7 +240,7 @@ struct __db_close_msg {
typedef struct __db_close_msg __db_close_msg;
struct __db_close_reply {
- gint status;
+ int status;
};
typedef struct __db_close_reply __db_close_reply;
@@ -251,7 +251,7 @@ struct __db_create_msg {
typedef struct __db_create_msg __db_create_msg;
struct __db_create_reply {
- gint status;
+ int status;
u_int dbcl_id;
};
typedef struct __db_create_reply __db_create_reply;
@@ -265,26 +265,26 @@ struct __db_del_msg {
u_int keyflags;
struct {
u_int keydata_len;
- gchar *keydata_val;
+ char *keydata_val;
} keydata;
u_int flags;
};
typedef struct __db_del_msg __db_del_msg;
struct __db_del_reply {
- gint status;
+ int status;
};
typedef struct __db_del_reply __db_del_reply;
struct __db_encrypt_msg {
u_int dbpcl_id;
- gchar *passwd;
+ char *passwd;
u_int flags;
};
typedef struct __db_encrypt_msg __db_encrypt_msg;
struct __db_encrypt_reply {
- gint status;
+ int status;
};
typedef struct __db_encrypt_reply __db_encrypt_reply;
@@ -295,7 +295,7 @@ struct __db_extentsize_msg {
typedef struct __db_extentsize_msg __db_extentsize_msg;
struct __db_extentsize_reply {
- gint status;
+ int status;
};
typedef struct __db_extentsize_reply __db_extentsize_reply;
@@ -306,7 +306,7 @@ struct __db_flags_msg {
typedef struct __db_flags_msg __db_flags_msg;
struct __db_flags_reply {
- gint status;
+ int status;
};
typedef struct __db_flags_reply __db_flags_reply;
@@ -319,7 +319,7 @@ struct __db_get_msg {
u_int keyflags;
struct {
u_int keydata_len;
- gchar *keydata_val;
+ char *keydata_val;
} keydata;
u_int datadlen;
u_int datadoff;
@@ -327,21 +327,21 @@ struct __db_get_msg {
u_int dataflags;
struct {
u_int datadata_len;
- gchar *datadata_val;
+ char *datadata_val;
} datadata;
u_int flags;
};
typedef struct __db_get_msg __db_get_msg;
struct __db_get_reply {
- gint status;
+ int status;
struct {
u_int keydata_len;
- gchar *keydata_val;
+ char *keydata_val;
} keydata;
struct {
u_int datadata_len;
- gchar *datadata_val;
+ char *datadata_val;
} datadata;
};
typedef struct __db_get_reply __db_get_reply;
@@ -353,7 +353,7 @@ struct __db_h_ffactor_msg {
typedef struct __db_h_ffactor_msg __db_h_ffactor_msg;
struct __db_h_ffactor_reply {
- gint status;
+ int status;
};
typedef struct __db_h_ffactor_reply __db_h_ffactor_reply;
@@ -364,7 +364,7 @@ struct __db_h_nelem_msg {
typedef struct __db_h_nelem_msg __db_h_nelem_msg;
struct __db_h_nelem_reply {
- gint status;
+ int status;
};
typedef struct __db_h_nelem_reply __db_h_nelem_reply;
@@ -377,14 +377,14 @@ struct __db_key_range_msg {
u_int keyflags;
struct {
u_int keydata_len;
- gchar *keydata_val;
+ char *keydata_val;
} keydata;
u_int flags;
};
typedef struct __db_key_range_msg __db_key_range_msg;
struct __db_key_range_reply {
- gint status;
+ int status;
double less;
double equal;
double greater;
@@ -398,15 +398,15 @@ struct __db_lorder_msg {
typedef struct __db_lorder_msg __db_lorder_msg;
struct __db_lorder_reply {
- gint status;
+ int status;
};
typedef struct __db_lorder_reply __db_lorder_reply;
struct __db_open_msg {
u_int dbpcl_id;
u_int txnpcl_id;
- gchar *name;
- gchar *subdb;
+ char *name;
+ char *subdb;
u_int type;
u_int flags;
u_int mode;
@@ -414,7 +414,7 @@ struct __db_open_msg {
typedef struct __db_open_msg __db_open_msg;
struct __db_open_reply {
- gint status;
+ int status;
u_int dbcl_id;
u_int type;
u_int dbflags;
@@ -429,7 +429,7 @@ struct __db_pagesize_msg {
typedef struct __db_pagesize_msg __db_pagesize_msg;
struct __db_pagesize_reply {
- gint status;
+ int status;
};
typedef struct __db_pagesize_reply __db_pagesize_reply;
@@ -442,7 +442,7 @@ struct __db_pget_msg {
u_int skeyflags;
struct {
u_int skeydata_len;
- gchar *skeydata_val;
+ char *skeydata_val;
} skeydata;
u_int pkeydlen;
u_int pkeydoff;
@@ -450,7 +450,7 @@ struct __db_pget_msg {
u_int pkeyflags;
struct {
u_int pkeydata_len;
- gchar *pkeydata_val;
+ char *pkeydata_val;
} pkeydata;
u_int datadlen;
u_int datadoff;
@@ -458,25 +458,25 @@ struct __db_pget_msg {
u_int dataflags;
struct {
u_int datadata_len;
- gchar *datadata_val;
+ char *datadata_val;
} datadata;
u_int flags;
};
typedef struct __db_pget_msg __db_pget_msg;
struct __db_pget_reply {
- gint status;
+ int status;
struct {
u_int skeydata_len;
- gchar *skeydata_val;
+ char *skeydata_val;
} skeydata;
struct {
u_int pkeydata_len;
- gchar *pkeydata_val;
+ char *pkeydata_val;
} pkeydata;
struct {
u_int datadata_len;
- gchar *datadata_val;
+ char *datadata_val;
} datadata;
};
typedef struct __db_pget_reply __db_pget_reply;
@@ -490,7 +490,7 @@ struct __db_put_msg {
u_int keyflags;
struct {
u_int keydata_len;
- gchar *keydata_val;
+ char *keydata_val;
} keydata;
u_int datadlen;
u_int datadoff;
@@ -498,17 +498,17 @@ struct __db_put_msg {
u_int dataflags;
struct {
u_int datadata_len;
- gchar *datadata_val;
+ char *datadata_val;
} datadata;
u_int flags;
};
typedef struct __db_put_msg __db_put_msg;
struct __db_put_reply {
- gint status;
+ int status;
struct {
u_int keydata_len;
- gchar *keydata_val;
+ char *keydata_val;
} keydata;
};
typedef struct __db_put_reply __db_put_reply;
@@ -520,7 +520,7 @@ struct __db_re_delim_msg {
typedef struct __db_re_delim_msg __db_re_delim_msg;
struct __db_re_delim_reply {
- gint status;
+ int status;
};
typedef struct __db_re_delim_reply __db_re_delim_reply;
@@ -531,7 +531,7 @@ struct __db_re_len_msg {
typedef struct __db_re_len_msg __db_re_len_msg;
struct __db_re_len_reply {
- gint status;
+ int status;
};
typedef struct __db_re_len_reply __db_re_len_reply;
@@ -542,34 +542,34 @@ struct __db_re_pad_msg {
typedef struct __db_re_pad_msg __db_re_pad_msg;
struct __db_re_pad_reply {
- gint status;
+ int status;
};
typedef struct __db_re_pad_reply __db_re_pad_reply;
struct __db_remove_msg {
u_int dbpcl_id;
- gchar *name;
- gchar *subdb;
+ char *name;
+ char *subdb;
u_int flags;
};
typedef struct __db_remove_msg __db_remove_msg;
struct __db_remove_reply {
- gint status;
+ int status;
};
typedef struct __db_remove_reply __db_remove_reply;
struct __db_rename_msg {
u_int dbpcl_id;
- gchar *name;
- gchar *subdb;
- gchar *newname;
+ char *name;
+ char *subdb;
+ char *newname;
u_int flags;
};
typedef struct __db_rename_msg __db_rename_msg;
struct __db_rename_reply {
- gint status;
+ int status;
};
typedef struct __db_rename_reply __db_rename_reply;
@@ -580,7 +580,7 @@ struct __db_stat_msg {
typedef struct __db_stat_msg __db_stat_msg;
struct __db_stat_reply {
- gint status;
+ int status;
struct {
u_int stats_len;
u_int *stats_val;
@@ -595,7 +595,7 @@ struct __db_sync_msg {
typedef struct __db_sync_msg __db_sync_msg;
struct __db_sync_reply {
- gint status;
+ int status;
};
typedef struct __db_sync_reply __db_sync_reply;
@@ -607,7 +607,7 @@ struct __db_truncate_msg {
typedef struct __db_truncate_msg __db_truncate_msg;
struct __db_truncate_reply {
- gint status;
+ int status;
u_int count;
};
typedef struct __db_truncate_reply __db_truncate_reply;
@@ -620,7 +620,7 @@ struct __db_cursor_msg {
typedef struct __db_cursor_msg __db_cursor_msg;
struct __db_cursor_reply {
- gint status;
+ int status;
u_int dbcidcl_id;
};
typedef struct __db_cursor_reply __db_cursor_reply;
@@ -636,7 +636,7 @@ struct __db_join_msg {
typedef struct __db_join_msg __db_join_msg;
struct __db_join_reply {
- gint status;
+ int status;
u_int dbcidcl_id;
};
typedef struct __db_join_reply __db_join_reply;
@@ -647,7 +647,7 @@ struct __dbc_close_msg {
typedef struct __dbc_close_msg __dbc_close_msg;
struct __dbc_close_reply {
- gint status;
+ int status;
};
typedef struct __dbc_close_reply __dbc_close_reply;
@@ -658,7 +658,7 @@ struct __dbc_count_msg {
typedef struct __dbc_count_msg __dbc_count_msg;
struct __dbc_count_reply {
- gint status;
+ int status;
u_int dupcount;
};
typedef struct __dbc_count_reply __dbc_count_reply;
@@ -670,7 +670,7 @@ struct __dbc_del_msg {
typedef struct __dbc_del_msg __dbc_del_msg;
struct __dbc_del_reply {
- gint status;
+ int status;
};
typedef struct __dbc_del_reply __dbc_del_reply;
@@ -681,7 +681,7 @@ struct __dbc_dup_msg {
typedef struct __dbc_dup_msg __dbc_dup_msg;
struct __dbc_dup_reply {
- gint status;
+ int status;
u_int dbcidcl_id;
};
typedef struct __dbc_dup_reply __dbc_dup_reply;
@@ -694,7 +694,7 @@ struct __dbc_get_msg {
u_int keyflags;
struct {
u_int keydata_len;
- gchar *keydata_val;
+ char *keydata_val;
} keydata;
u_int datadlen;
u_int datadoff;
@@ -702,21 +702,21 @@ struct __dbc_get_msg {
u_int dataflags;
struct {
u_int datadata_len;
- gchar *datadata_val;
+ char *datadata_val;
} datadata;
u_int flags;
};
typedef struct __dbc_get_msg __dbc_get_msg;
struct __dbc_get_reply {
- gint status;
+ int status;
struct {
u_int keydata_len;
- gchar *keydata_val;
+ char *keydata_val;
} keydata;
struct {
u_int datadata_len;
- gchar *datadata_val;
+ char *datadata_val;
} datadata;
};
typedef struct __dbc_get_reply __dbc_get_reply;
@@ -729,7 +729,7 @@ struct __dbc_pget_msg {
u_int skeyflags;
struct {
u_int skeydata_len;
- gchar *skeydata_val;
+ char *skeydata_val;
} skeydata;
u_int pkeydlen;
u_int pkeydoff;
@@ -737,7 +737,7 @@ struct __dbc_pget_msg {
u_int pkeyflags;
struct {
u_int pkeydata_len;
- gchar *pkeydata_val;
+ char *pkeydata_val;
} pkeydata;
u_int datadlen;
u_int datadoff;
@@ -745,25 +745,25 @@ struct __dbc_pget_msg {
u_int dataflags;
struct {
u_int datadata_len;
- gchar *datadata_val;
+ char *datadata_val;
} datadata;
u_int flags;
};
typedef struct __dbc_pget_msg __dbc_pget_msg;
struct __dbc_pget_reply {
- gint status;
+ int status;
struct {
u_int skeydata_len;
- gchar *skeydata_val;
+ char *skeydata_val;
} skeydata;
struct {
u_int pkeydata_len;
- gchar *pkeydata_val;
+ char *pkeydata_val;
} pkeydata;
struct {
u_int datadata_len;
- gchar *datadata_val;
+ char *datadata_val;
} datadata;
};
typedef struct __dbc_pget_reply __dbc_pget_reply;
@@ -776,7 +776,7 @@ struct __dbc_put_msg {
u_int keyflags;
struct {
u_int keydata_len;
- gchar *keydata_val;
+ char *keydata_val;
} keydata;
u_int datadlen;
u_int datadoff;
@@ -784,17 +784,17 @@ struct __dbc_put_msg {
u_int dataflags;
struct {
u_int datadata_len;
- gchar *datadata_val;
+ char *datadata_val;
} datadata;
u_int flags;
};
typedef struct __dbc_put_msg __dbc_put_msg;
struct __dbc_put_reply {
- gint status;
+ int status;
struct {
u_int keydata_len;
- gchar *keydata_val;
+ char *keydata_val;
} keydata;
};
typedef struct __dbc_put_reply __dbc_put_reply;
@@ -899,7 +899,7 @@ extern __dbc_get_reply * __db_dbc_get_4001();
extern __dbc_pget_reply * __db_dbc_pget_4001();
#define __DB_dbc_put ((unsigned long)(50))
extern __dbc_put_reply * __db_dbc_put_4001();
-extern gint db_rpc_serverprog_4001_freeresult();
+extern int db_rpc_serverprog_4001_freeresult();
/* the xdr functions */
extern bool_t xdr___env_cachesize_msg();
diff --git a/libdb/dbinc_auto/dbreg_ext.h b/libdb/dbinc_auto/dbreg_ext.h
index 118e1d0..eda2620 100644
--- a/libdb/dbinc_auto/dbreg_ext.h
+++ b/libdb/dbinc_auto/dbreg_ext.h
@@ -6,35 +6,35 @@
extern "C" {
#endif
-gint __dbreg_setup __P((DB *, const gchar *, u_int32_t));
-gint __dbreg_teardown __P((DB *));
-gint __dbreg_new_id __P((DB *, DB_TXN *));
-gint __dbreg_assign_id __P((DB *, int32_t));
-gint __dbreg_revoke_id __P((DB *, int));
-gint __dbreg_close_id __P((DB *, DB_TXN *));
-gint __dbreg_register_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, const DBT *, const DBT *, int32_t, DBTYPE, db_pgno_t, u_int32_t));
-gint __dbreg_register_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __dbreg_register_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __dbreg_register_read __P((DB_ENV *, gpointer , __dbreg_register_args **));
-gint __dbreg_init_print __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __dbreg_init_getpgnos __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __dbreg_init_recover __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __dbreg_register_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __dbreg_add_dbentry __P((DB_ENV *, DB_LOG *, DB *, int32_t));
+int __dbreg_setup __P((DB *, const char *, u_int32_t));
+int __dbreg_teardown __P((DB *));
+int __dbreg_new_id __P((DB *, DB_TXN *));
+int __dbreg_assign_id __P((DB *, int32_t));
+int __dbreg_revoke_id __P((DB *, int));
+int __dbreg_close_id __P((DB *, DB_TXN *));
+int __dbreg_register_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, const DBT *, const DBT *, int32_t, DBTYPE, db_pgno_t, u_int32_t));
+int __dbreg_register_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __dbreg_register_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __dbreg_register_read __P((DB_ENV *, void *, __dbreg_register_args **));
+int __dbreg_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __dbreg_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __dbreg_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __dbreg_register_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __dbreg_add_dbentry __P((DB_ENV *, DB_LOG *, DB *, int32_t));
void __dbreg_rem_dbentry __P((DB_LOG *, int32_t));
-gint __dbreg_open_files __P((DB_ENV *));
-gint __dbreg_close_files __P((DB_ENV *));
-gint __dbreg_nofiles __P((DB_ENV *));
-gint __dbreg_id_to_db __P((DB_ENV *, DB_TXN *, DB **, int32_t, int));
-gint __dbreg_id_to_db_int __P((DB_ENV *, DB_TXN *, DB **, int32_t, int, int));
-gint __dbreg_id_to_fname __P((DB_LOG *, int32_t, int, FNAME **));
-gint __dbreg_fid_to_fname __P((DB_LOG *, u_int8_t *, int, FNAME **));
-gint __dbreg_get_name __P((DB_ENV *, u_int8_t *, gchar **));
-gint __dbreg_do_open __P((DB_ENV *, DB_TXN *, DB_LOG *, u_int8_t *, gchar *, DBTYPE, int32_t, db_pgno_t, gpointer , u_int32_t));
-gint __dbreg_lazy_id __P((DB *));
-gint __dbreg_push_id __P((DB_ENV *, int32_t));
-gint __dbreg_pop_id __P((DB_ENV *, int32_t *));
-gint __dbreg_pluck_id __P((DB_ENV *, int32_t));
+int __dbreg_open_files __P((DB_ENV *));
+int __dbreg_close_files __P((DB_ENV *));
+int __dbreg_nofiles __P((DB_ENV *));
+int __dbreg_id_to_db __P((DB_ENV *, DB_TXN *, DB **, int32_t, int));
+int __dbreg_id_to_db_int __P((DB_ENV *, DB_TXN *, DB **, int32_t, int, int));
+int __dbreg_id_to_fname __P((DB_LOG *, int32_t, int, FNAME **));
+int __dbreg_fid_to_fname __P((DB_LOG *, u_int8_t *, int, FNAME **));
+int __dbreg_get_name __P((DB_ENV *, u_int8_t *, char **));
+int __dbreg_do_open __P((DB_ENV *, DB_TXN *, DB_LOG *, u_int8_t *, char *, DBTYPE, int32_t, db_pgno_t, void *, u_int32_t));
+int __dbreg_lazy_id __P((DB *));
+int __dbreg_push_id __P((DB_ENV *, int32_t));
+int __dbreg_pop_id __P((DB_ENV *, int32_t *));
+int __dbreg_pluck_id __P((DB_ENV *, int32_t));
void __dbreg_print_dblist __P((DB_ENV *));
#if defined(__cplusplus)
diff --git a/libdb/dbinc_auto/env_ext.h b/libdb/dbinc_auto/env_ext.h
index 23ece0d..4bd0eee 100644
--- a/libdb/dbinc_auto/env_ext.h
+++ b/libdb/dbinc_auto/env_ext.h
@@ -6,32 +6,32 @@
extern "C" {
#endif
-void __db_shalloc_init __P((gpointer , size_t));
-gint __db_shalloc_size __P((size_t, size_t));
-gint __db_shalloc __P((gpointer , size_t, size_t, gpointer ));
-void __db_shalloc_free __P((gpointer , gpointer ));
-size_t __db_shsizeof __P((gpointer));
-void __db_shalloc_dump __P((gpointer , FILE *));
-gint __db_tablesize __P((u_int32_t));
-void __db_hashinit __P((gpointer , u_int32_t));
-gint __db_fileinit __P((DB_ENV *, DB_FH *, size_t, int));
-gint __db_overwrite __P((DB_ENV *, const gchar *));
-gint __db_mi_env __P((DB_ENV *, const gchar *));
-gint __db_mi_open __P((DB_ENV *, const gchar *, int));
-gint __db_env_config __P((DB_ENV *, gchar *, u_int32_t));
-gint __dbenv_open __P((DB_ENV *, const gchar *, u_int32_t, int));
-gint __dbenv_remove __P((DB_ENV *, const gchar *, u_int32_t));
-gint __dbenv_close __P((DB_ENV *, u_int32_t));
-gint __db_appname __P((DB_ENV *, APPNAME, const gchar *, u_int32_t, DB_FH *, gchar **));
-gint __db_home __P((DB_ENV *, const gchar *, u_int32_t));
-gint __db_apprec __P((DB_ENV *, DB_LSN *, u_int32_t));
-gint __env_openfiles __P((DB_ENV *, DB_LOGC *, gpointer , DBT *, DB_LSN *, DB_LSN *, double, int));
-gint __db_e_attach __P((DB_ENV *, u_int32_t *));
-gint __db_e_detach __P((DB_ENV *, int));
-gint __db_e_remove __P((DB_ENV *, u_int32_t));
-gint __db_e_stat __P((DB_ENV *, REGENV *, REGION *, gint *, u_int32_t));
-gint __db_r_attach __P((DB_ENV *, REGINFO *, size_t));
-gint __db_r_detach __P((DB_ENV *, REGINFO *, int));
+void __db_shalloc_init __P((void *, size_t));
+int __db_shalloc_size __P((size_t, size_t));
+int __db_shalloc __P((void *, size_t, size_t, void *));
+void __db_shalloc_free __P((void *, void *));
+size_t __db_shsizeof __P((void *));
+void __db_shalloc_dump __P((void *, FILE *));
+int __db_tablesize __P((u_int32_t));
+void __db_hashinit __P((void *, u_int32_t));
+int __db_fileinit __P((DB_ENV *, DB_FH *, size_t, int));
+int __db_overwrite __P((DB_ENV *, const char *));
+int __db_mi_env __P((DB_ENV *, const char *));
+int __db_mi_open __P((DB_ENV *, const char *, int));
+int __db_env_config __P((DB_ENV *, char *, u_int32_t));
+int __dbenv_open __P((DB_ENV *, const char *, u_int32_t, int));
+int __dbenv_remove __P((DB_ENV *, const char *, u_int32_t));
+int __dbenv_close __P((DB_ENV *, u_int32_t));
+int __db_appname __P((DB_ENV *, APPNAME, const char *, u_int32_t, DB_FH *, char **));
+int __db_home __P((DB_ENV *, const char *, u_int32_t));
+int __db_apprec __P((DB_ENV *, DB_LSN *, u_int32_t));
+int __env_openfiles __P((DB_ENV *, DB_LOGC *, void *, DBT *, DB_LSN *, DB_LSN *, double, int));
+int __db_e_attach __P((DB_ENV *, u_int32_t *));
+int __db_e_detach __P((DB_ENV *, int));
+int __db_e_remove __P((DB_ENV *, u_int32_t));
+int __db_e_stat __P((DB_ENV *, REGENV *, REGION *, int *, u_int32_t));
+int __db_r_attach __P((DB_ENV *, REGINFO *, size_t));
+int __db_r_detach __P((DB_ENV *, REGINFO *, int));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/fileops_ext.h b/libdb/dbinc_auto/fileops_ext.h
index 66b03e0..5edf7bd 100644
--- a/libdb/dbinc_auto/fileops_ext.h
+++ b/libdb/dbinc_auto/fileops_ext.h
@@ -6,45 +6,45 @@
extern "C" {
#endif
-gint __fop_create_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, u_int32_t, u_int32_t));
-gint __fop_create_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __fop_create_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __fop_create_read __P((DB_ENV *, gpointer , __fop_create_args **));
-gint __fop_remove_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, u_int32_t));
-gint __fop_remove_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __fop_remove_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __fop_remove_read __P((DB_ENV *, gpointer , __fop_remove_args **));
-gint __fop_write_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, u_int32_t, u_int32_t, const DBT *, u_int32_t));
-gint __fop_write_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __fop_write_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __fop_write_read __P((DB_ENV *, gpointer , __fop_write_args **));
-gint __fop_rename_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, const DBT *, u_int32_t));
-gint __fop_rename_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __fop_rename_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __fop_rename_read __P((DB_ENV *, gpointer , __fop_rename_args **));
-gint __fop_file_remove_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, const DBT *, u_int32_t, u_int32_t));
-gint __fop_file_remove_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __fop_file_remove_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __fop_file_remove_read __P((DB_ENV *, gpointer , __fop_file_remove_args **));
-gint __fop_init_print __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __fop_init_getpgnos __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __fop_init_recover __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __fop_create __P((DB_ENV *, DB_TXN *, DB_FH *, const gchar *, APPNAME, int));
-gint __fop_remove __P((DB_ENV *, DB_TXN *, u_int8_t *, const gchar *, APPNAME));
-gint __fop_write __P((DB_ENV *, DB_TXN *, const gchar *, APPNAME, DB_FH *, u_int32_t, u_int8_t *, u_int32_t, u_int32_t));
-gint __fop_rename __P((DB_ENV *, DB_TXN *, const gchar *, const gchar *, u_int8_t *, APPNAME));
-gint __fop_create_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __fop_remove_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __fop_write_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __fop_rename_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __fop_file_remove_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __fop_lock_handle __P((DB_ENV *, DB *, u_int32_t, db_lockmode_t, DB_LOCK *, u_int32_t));
-gint __fop_file_setup __P((DB *, DB_TXN *, const gchar *, int, u_int32_t, u_int32_t *));
-gint __fop_subdb_setup __P((DB *, DB_TXN *, const gchar *, const gchar *, int, u_int32_t));
-gint __fop_remove_setup __P((DB *, DB_TXN *, const gchar *, u_int32_t));
-gint __fop_read_meta __P((DB_ENV *, const gchar *, u_int8_t *, size_t, DB_FH *, int, size_t *, u_int32_t));
-gint __fop_dummy __P((DB *, DB_TXN *, const gchar *, const gchar *, u_int32_t));
-gint __fop_dbrename __P((DB *, const gchar *, const gchar *));
+int __fop_create_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, u_int32_t, u_int32_t));
+int __fop_create_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_create_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_create_read __P((DB_ENV *, void *, __fop_create_args **));
+int __fop_remove_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, u_int32_t));
+int __fop_remove_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_remove_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_remove_read __P((DB_ENV *, void *, __fop_remove_args **));
+int __fop_write_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, u_int32_t, u_int32_t, const DBT *, u_int32_t));
+int __fop_write_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_write_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_write_read __P((DB_ENV *, void *, __fop_write_args **));
+int __fop_rename_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, const DBT *, u_int32_t));
+int __fop_rename_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_rename_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_rename_read __P((DB_ENV *, void *, __fop_rename_args **));
+int __fop_file_remove_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, const DBT *, u_int32_t, u_int32_t));
+int __fop_file_remove_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_file_remove_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_file_remove_read __P((DB_ENV *, void *, __fop_file_remove_args **));
+int __fop_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __fop_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __fop_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __fop_create __P((DB_ENV *, DB_TXN *, DB_FH *, const char *, APPNAME, int));
+int __fop_remove __P((DB_ENV *, DB_TXN *, u_int8_t *, const char *, APPNAME));
+int __fop_write __P((DB_ENV *, DB_TXN *, const char *, APPNAME, DB_FH *, u_int32_t, u_int8_t *, u_int32_t, u_int32_t));
+int __fop_rename __P((DB_ENV *, DB_TXN *, const char *, const char *, u_int8_t *, APPNAME));
+int __fop_create_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_remove_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_write_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_rename_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_file_remove_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_lock_handle __P((DB_ENV *, DB *, u_int32_t, db_lockmode_t, DB_LOCK *, u_int32_t));
+int __fop_file_setup __P((DB *, DB_TXN *, const char *, int, u_int32_t, u_int32_t *));
+int __fop_subdb_setup __P((DB *, DB_TXN *, const char *, const char *, int, u_int32_t));
+int __fop_remove_setup __P((DB *, DB_TXN *, const char *, u_int32_t));
+int __fop_read_meta __P((DB_ENV *, const char *, u_int8_t *, size_t, DB_FH *, int, size_t *, u_int32_t));
+int __fop_dummy __P((DB *, DB_TXN *, const char *, const char *, u_int32_t));
+int __fop_dbrename __P((DB *, const char *, const char *));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/hash_ext.h b/libdb/dbinc_auto/hash_ext.h
index 7c80e53..1ee2398 100644
--- a/libdb/dbinc_auto/hash_ext.h
+++ b/libdb/dbinc_auto/hash_ext.h
@@ -6,118 +6,118 @@
extern "C" {
#endif
-gint __ham_quick_delete __P((DBC *));
-gint __ham_c_init __P((DBC *));
-gint __ham_c_count __P((DBC *, db_recno_t *));
-gint __ham_c_dup __P((DBC *, DBC *));
+int __ham_quick_delete __P((DBC *));
+int __ham_c_init __P((DBC *));
+int __ham_c_count __P((DBC *, db_recno_t *));
+int __ham_c_dup __P((DBC *, DBC *));
u_int32_t __ham_call_hash __P((DBC *, u_int8_t *, int32_t));
-gint __ham_init_dbt __P((DB_ENV *, DBT *, u_int32_t, gpointer *, u_int32_t *));
-gint __ham_c_update __P((DBC *, u_int32_t, int, int));
-gint __ham_get_clist __P((DB *, db_pgno_t, u_int32_t, DBC ***));
-gint __ham_insdel_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, u_int32_t, DB_LSN *, const DBT *, const DBT *));
-gint __ham_insdel_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_insdel_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_insdel_read __P((DB_ENV *, gpointer , __ham_insdel_args **));
-gint __ham_newpage_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *));
-gint __ham_newpage_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_newpage_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_newpage_read __P((DB_ENV *, gpointer , __ham_newpage_args **));
-gint __ham_splitdata_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, const DBT *, DB_LSN *));
-gint __ham_splitdata_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_splitdata_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_splitdata_read __P((DB_ENV *, gpointer , __ham_splitdata_args **));
-gint __ham_replace_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, u_int32_t, DB_LSN *, int32_t, const DBT *, const DBT *, u_int32_t));
-gint __ham_replace_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_replace_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_replace_read __P((DB_ENV *, gpointer , __ham_replace_args **));
-gint __ham_copypage_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, const DBT *));
-gint __ham_copypage_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_copypage_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_copypage_read __P((DB_ENV *, gpointer , __ham_copypage_args **));
-gint __ham_metagroup_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, u_int32_t));
-gint __ham_metagroup_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_metagroup_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_metagroup_read __P((DB_ENV *, gpointer , __ham_metagroup_args **));
-gint __ham_groupalloc_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_pgno_t));
-gint __ham_groupalloc_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_groupalloc_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_groupalloc_read __P((DB_ENV *, gpointer , __ham_groupalloc_args **));
-gint __ham_curadj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, u_int32_t, u_int32_t, u_int32_t, int, int, u_int32_t));
-gint __ham_curadj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_curadj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_curadj_read __P((DB_ENV *, gpointer , __ham_curadj_args **));
-gint __ham_chgpg_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_ham_mode, db_pgno_t, db_pgno_t, u_int32_t, u_int32_t));
-gint __ham_chgpg_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_chgpg_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_chgpg_read __P((DB_ENV *, gpointer , __ham_chgpg_args **));
-gint __ham_init_print __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __ham_init_getpgnos __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __ham_init_recover __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __ham_pgin __P((DB_ENV *, DB *, db_pgno_t, gpointer , DBT *));
-gint __ham_pgout __P((DB_ENV *, DB *, db_pgno_t, gpointer , DBT *));
-gint __ham_mswap __P((gpointer));
-gint __ham_add_dup __P((DBC *, DBT *, u_int32_t, db_pgno_t *));
-gint __ham_dup_convert __P((DBC *));
-gint __ham_make_dup __P((DB_ENV *, const DBT *, DBT *d, gpointer *, u_int32_t *));
-void __ham_dsearch __P((DBC *, DBT *, u_int32_t *, gint *, u_int32_t));
+int __ham_init_dbt __P((DB_ENV *, DBT *, u_int32_t, void **, u_int32_t *));
+int __ham_c_update __P((DBC *, u_int32_t, int, int));
+int __ham_get_clist __P((DB *, db_pgno_t, u_int32_t, DBC ***));
+int __ham_insdel_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, u_int32_t, DB_LSN *, const DBT *, const DBT *));
+int __ham_insdel_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_insdel_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_insdel_read __P((DB_ENV *, void *, __ham_insdel_args **));
+int __ham_newpage_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *));
+int __ham_newpage_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_newpage_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_newpage_read __P((DB_ENV *, void *, __ham_newpage_args **));
+int __ham_splitdata_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, const DBT *, DB_LSN *));
+int __ham_splitdata_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_splitdata_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_splitdata_read __P((DB_ENV *, void *, __ham_splitdata_args **));
+int __ham_replace_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, u_int32_t, DB_LSN *, int32_t, const DBT *, const DBT *, u_int32_t));
+int __ham_replace_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_replace_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_replace_read __P((DB_ENV *, void *, __ham_replace_args **));
+int __ham_copypage_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, const DBT *));
+int __ham_copypage_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_copypage_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_copypage_read __P((DB_ENV *, void *, __ham_copypage_args **));
+int __ham_metagroup_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, u_int32_t));
+int __ham_metagroup_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_metagroup_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_metagroup_read __P((DB_ENV *, void *, __ham_metagroup_args **));
+int __ham_groupalloc_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_pgno_t));
+int __ham_groupalloc_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_groupalloc_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_groupalloc_read __P((DB_ENV *, void *, __ham_groupalloc_args **));
+int __ham_curadj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, u_int32_t, u_int32_t, u_int32_t, int, int, u_int32_t));
+int __ham_curadj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_curadj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_curadj_read __P((DB_ENV *, void *, __ham_curadj_args **));
+int __ham_chgpg_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_ham_mode, db_pgno_t, db_pgno_t, u_int32_t, u_int32_t));
+int __ham_chgpg_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_chgpg_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_chgpg_read __P((DB_ENV *, void *, __ham_chgpg_args **));
+int __ham_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __ham_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __ham_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __ham_pgin __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
+int __ham_pgout __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
+int __ham_mswap __P((void *));
+int __ham_add_dup __P((DBC *, DBT *, u_int32_t, db_pgno_t *));
+int __ham_dup_convert __P((DBC *));
+int __ham_make_dup __P((DB_ENV *, const DBT *, DBT *d, void **, u_int32_t *));
+void __ham_dsearch __P((DBC *, DBT *, u_int32_t *, int *, u_int32_t));
void __ham_cprint __P((DBC *));
-u_int32_t __ham_func2 __P((DB *, gconstpointer , u_int32_t));
-u_int32_t __ham_func3 __P((DB *, gconstpointer , u_int32_t));
-u_int32_t __ham_func4 __P((DB *, gconstpointer , u_int32_t));
-u_int32_t __ham_func5 __P((DB *, gconstpointer , u_int32_t));
-u_int32_t __ham_test __P((DB *, gconstpointer , u_int32_t));
-gint __ham_get_meta __P((DBC *));
-gint __ham_release_meta __P((DBC *));
-gint __ham_dirty_meta __P((DBC *));
-gint __ham_db_create __P((DB *));
-gint __ham_db_close __P((DB *));
-gint __ham_open __P((DB *, DB_TXN *, const gchar * name, db_pgno_t, u_int32_t));
-gint __ham_metachk __P((DB *, const gchar *, HMETA *));
-gint __ham_new_file __P((DB *, DB_TXN *, DB_FH *, const gchar *));
-gint __ham_new_subdb __P((DB *, DB *, DB_TXN *));
-gint __ham_item __P((DBC *, db_lockmode_t, db_pgno_t *));
-gint __ham_item_reset __P((DBC *));
+u_int32_t __ham_func2 __P((DB *, const void *, u_int32_t));
+u_int32_t __ham_func3 __P((DB *, const void *, u_int32_t));
+u_int32_t __ham_func4 __P((DB *, const void *, u_int32_t));
+u_int32_t __ham_func5 __P((DB *, const void *, u_int32_t));
+u_int32_t __ham_test __P((DB *, const void *, u_int32_t));
+int __ham_get_meta __P((DBC *));
+int __ham_release_meta __P((DBC *));
+int __ham_dirty_meta __P((DBC *));
+int __ham_db_create __P((DB *));
+int __ham_db_close __P((DB *));
+int __ham_open __P((DB *, DB_TXN *, const char * name, db_pgno_t, u_int32_t));
+int __ham_metachk __P((DB *, const char *, HMETA *));
+int __ham_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
+int __ham_new_subdb __P((DB *, DB *, DB_TXN *));
+int __ham_item __P((DBC *, db_lockmode_t, db_pgno_t *));
+int __ham_item_reset __P((DBC *));
void __ham_item_init __P((DBC *));
-gint __ham_item_last __P((DBC *, db_lockmode_t, db_pgno_t *));
-gint __ham_item_first __P((DBC *, db_lockmode_t, db_pgno_t *));
-gint __ham_item_prev __P((DBC *, db_lockmode_t, db_pgno_t *));
-gint __ham_item_next __P((DBC *, db_lockmode_t, db_pgno_t *));
+int __ham_item_last __P((DBC *, db_lockmode_t, db_pgno_t *));
+int __ham_item_first __P((DBC *, db_lockmode_t, db_pgno_t *));
+int __ham_item_prev __P((DBC *, db_lockmode_t, db_pgno_t *));
+int __ham_item_next __P((DBC *, db_lockmode_t, db_pgno_t *));
void __ham_putitem __P((DB *, PAGE *p, const DBT *, int));
void __ham_reputpair __P((DB *, PAGE *, u_int32_t, const DBT *, const DBT *));
-gint __ham_del_pair __P((DBC *, int));
-gint __ham_replpair __P((DBC *, DBT *, u_int32_t));
+int __ham_del_pair __P((DBC *, int));
+int __ham_replpair __P((DBC *, DBT *, u_int32_t));
void __ham_onpage_replace __P((DB *, PAGE *, u_int32_t, int32_t, int32_t, DBT *));
-gint __ham_split_page __P((DBC *, u_int32_t, u_int32_t));
-gint __ham_add_el __P((DBC *, const DBT *, const DBT *, int));
+int __ham_split_page __P((DBC *, u_int32_t, u_int32_t));
+int __ham_add_el __P((DBC *, const DBT *, const DBT *, int));
void __ham_copy_item __P((DB *, PAGE *, u_int32_t, PAGE *));
-gint __ham_add_ovflpage __P((DBC *, PAGE *, int, PAGE **));
-gint __ham_get_cpage __P((DBC *, db_lockmode_t));
-gint __ham_next_cpage __P((DBC *, db_pgno_t, int));
-gint __ham_lock_bucket __P((DBC *, db_lockmode_t));
+int __ham_add_ovflpage __P((DBC *, PAGE *, int, PAGE **));
+int __ham_get_cpage __P((DBC *, db_lockmode_t));
+int __ham_next_cpage __P((DBC *, db_pgno_t, int));
+int __ham_lock_bucket __P((DBC *, db_lockmode_t));
void __ham_dpair __P((DB *, PAGE *, u_int32_t));
-gint __ham_insdel_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_newpage_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_replace_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_splitdata_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_copypage_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_metagroup_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_groupalloc_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_curadj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_chgpg_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __ham_reclaim __P((DB *, DB_TXN *txn));
-gint __ham_truncate __P((DB *, DB_TXN *txn, u_int32_t *));
-gint __ham_stat __P((DB *, gpointer , u_int32_t));
-gint __ham_traverse __P((DBC *, db_lockmode_t, gint (*)(DB *, PAGE *, gpointer , gint *), gpointer , int));
-gint __ham_30_hashmeta __P((DB *, gchar *, u_int8_t *));
-gint __ham_30_sizefix __P((DB *, DB_FH *, gchar *, u_int8_t *));
-gint __ham_31_hashmeta __P((DB *, gchar *, u_int32_t, DB_FH *, PAGE *, gint *));
-gint __ham_31_hash __P((DB *, gchar *, u_int32_t, DB_FH *, PAGE *, gint *));
-gint __ham_vrfy_meta __P((DB *, VRFY_DBINFO *, HMETA *, db_pgno_t, u_int32_t));
-gint __ham_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-gint __ham_vrfy_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
-gint __ham_vrfy_hashing __P((DB *, u_int32_t, HMETA *, u_int32_t, db_pgno_t, u_int32_t, u_int32_t (*) __P((DB *, gconstpointer , u_int32_t))));
-gint __ham_salvage __P((DB *, VRFY_DBINFO *, db_pgno_t, PAGE *, gpointer , gint (*)(gpointer , gconstpointer ), u_int32_t));
-gint __ham_meta2pgset __P((DB *, VRFY_DBINFO *, HMETA *, u_int32_t, DB *));
+int __ham_insdel_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_newpage_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_replace_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_splitdata_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_copypage_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_metagroup_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_groupalloc_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_curadj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_chgpg_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __ham_reclaim __P((DB *, DB_TXN *txn));
+int __ham_truncate __P((DB *, DB_TXN *txn, u_int32_t *));
+int __ham_stat __P((DB *, void *, u_int32_t));
+int __ham_traverse __P((DBC *, db_lockmode_t, int (*)(DB *, PAGE *, void *, int *), void *, int));
+int __ham_30_hashmeta __P((DB *, char *, u_int8_t *));
+int __ham_30_sizefix __P((DB *, DB_FH *, char *, u_int8_t *));
+int __ham_31_hashmeta __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
+int __ham_31_hash __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
+int __ham_vrfy_meta __P((DB *, VRFY_DBINFO *, HMETA *, db_pgno_t, u_int32_t));
+int __ham_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
+int __ham_vrfy_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
+int __ham_vrfy_hashing __P((DB *, u_int32_t, HMETA *, u_int32_t, db_pgno_t, u_int32_t, u_int32_t (*) __P((DB *, const void *, u_int32_t))));
+int __ham_salvage __P((DB *, VRFY_DBINFO *, db_pgno_t, PAGE *, void *, int (*)(void *, const void *), u_int32_t));
+int __ham_meta2pgset __P((DB *, VRFY_DBINFO *, HMETA *, u_int32_t, DB *));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/hmac_ext.h b/libdb/dbinc_auto/hmac_ext.h
index 31470a9..d161a72 100644
--- a/libdb/dbinc_auto/hmac_ext.h
+++ b/libdb/dbinc_auto/hmac_ext.h
@@ -8,11 +8,11 @@ extern "C" {
void __db_chksum __P((u_int8_t *, size_t, u_int8_t *, u_int8_t *));
void __db_derive_mac __P((u_int8_t *, size_t, u_int8_t *));
-gint __db_check_chksum __P((DB_ENV *, DB_CIPHER *, u_int8_t *, gpointer , size_t, int));
-void __db_SHA1Transform __P((u_int32_t *, guchar *));
+int __db_check_chksum __P((DB_ENV *, DB_CIPHER *, u_int8_t *, void *, size_t, int));
+void __db_SHA1Transform __P((u_int32_t *, unsigned char *));
void __db_SHA1Init __P((SHA1_CTX *));
-void __db_SHA1Update __P((SHA1_CTX *, guchar *, size_t));
-void __db_SHA1Final __P((guchar *, SHA1_CTX *));
+void __db_SHA1Update __P((SHA1_CTX *, unsigned char *, size_t));
+void __db_SHA1Final __P((unsigned char *, SHA1_CTX *));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/lock_ext.h b/libdb/dbinc_auto/lock_ext.h
index 62a66e7..be6b1d0 100644
--- a/libdb/dbinc_auto/lock_ext.h
+++ b/libdb/dbinc_auto/lock_ext.h
@@ -6,31 +6,31 @@
extern "C" {
#endif
-gint __lock_id __P((DB_ENV *, u_int32_t *));
-gint __lock_id_free __P((DB_ENV *, u_int32_t));
-gint __lock_vec __P((DB_ENV *, u_int32_t, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **));
-gint __lock_get __P((DB_ENV *, u_int32_t, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *));
-gint __lock_put __P((DB_ENV *, DB_LOCK *));
-gint __lock_downgrade __P((DB_ENV *, DB_LOCK *, db_lockmode_t, u_int32_t));
-gint __lock_addfamilylocker __P((DB_ENV *, u_int32_t, u_int32_t));
-gint __lock_freefamilylocker __P((DB_LOCKTAB *, u_int32_t));
-gint __lock_set_timeout __P(( DB_ENV *, u_int32_t, db_timeout_t, u_int32_t));
-gint __lock_inherit_timeout __P(( DB_ENV *, u_int32_t, u_int32_t));
-gint __lock_getlocker __P((DB_LOCKTAB *, u_int32_t, u_int32_t, int, DB_LOCKER **));
-gint __lock_promote __P((DB_LOCKTAB *, DB_LOCKOBJ *, u_int32_t));
-gint __lock_expired __P((DB_ENV *, db_timeval_t *, db_timeval_t *));
-gint __lock_detect __P((DB_ENV *, u_int32_t, u_int32_t, gint *));
+int __lock_id __P((DB_ENV *, u_int32_t *));
+int __lock_id_free __P((DB_ENV *, u_int32_t));
+int __lock_vec __P((DB_ENV *, u_int32_t, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **));
+int __lock_get __P((DB_ENV *, u_int32_t, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *));
+int __lock_put __P((DB_ENV *, DB_LOCK *));
+int __lock_downgrade __P((DB_ENV *, DB_LOCK *, db_lockmode_t, u_int32_t));
+int __lock_addfamilylocker __P((DB_ENV *, u_int32_t, u_int32_t));
+int __lock_freefamilylocker __P((DB_LOCKTAB *, u_int32_t));
+int __lock_set_timeout __P(( DB_ENV *, u_int32_t, db_timeout_t, u_int32_t));
+int __lock_inherit_timeout __P(( DB_ENV *, u_int32_t, u_int32_t));
+int __lock_getlocker __P((DB_LOCKTAB *, u_int32_t, u_int32_t, int, DB_LOCKER **));
+int __lock_promote __P((DB_LOCKTAB *, DB_LOCKOBJ *, u_int32_t));
+int __lock_expired __P((DB_ENV *, db_timeval_t *, db_timeval_t *));
+int __lock_detect __P((DB_ENV *, u_int32_t, u_int32_t, int *));
void __lock_dbenv_create __P((DB_ENV *));
void __lock_dbenv_close __P((DB_ENV *));
-gint __lock_open __P((DB_ENV *));
-gint __lock_dbenv_refresh __P((DB_ENV *));
+int __lock_open __P((DB_ENV *));
+int __lock_dbenv_refresh __P((DB_ENV *));
void __lock_region_destroy __P((DB_ENV *, REGINFO *));
-gint __lock_id_set __P((DB_ENV *, u_int32_t, u_int32_t));
-gint __lock_stat __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
-gint __lock_dump_region __P((DB_ENV *, gchar *, FILE *));
+int __lock_id_set __P((DB_ENV *, u_int32_t, u_int32_t));
+int __lock_stat __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
+int __lock_dump_region __P((DB_ENV *, char *, FILE *));
void __lock_printlock __P((DB_LOCKTAB *, struct __db_lock *, int));
-gint __lock_cmp __P((const DBT *, DB_LOCKOBJ *));
-gint __lock_locker_cmp __P((u_int32_t, DB_LOCKER *));
+int __lock_cmp __P((const DBT *, DB_LOCKOBJ *));
+int __lock_locker_cmp __P((u_int32_t, DB_LOCKER *));
u_int32_t __lock_ohash __P((const DBT *));
u_int32_t __lock_lhash __P((DB_LOCKOBJ *));
u_int32_t __lock_locker_hash __P((u_int32_t));
diff --git a/libdb/dbinc_auto/log_ext.h b/libdb/dbinc_auto/log_ext.h
index 64ef81b..6fc69af 100644
--- a/libdb/dbinc_auto/log_ext.h
+++ b/libdb/dbinc_auto/log_ext.h
@@ -6,25 +6,25 @@
extern "C" {
#endif
-gint __log_open __P((DB_ENV *));
-gint __log_find __P((DB_LOG *, int, u_int32_t *, logfile_validity *));
-gint __log_valid __P((DB_LOG *, u_int32_t, int, logfile_validity *));
-gint __log_dbenv_refresh __P((DB_ENV *));
-gint __log_stat __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
+int __log_open __P((DB_ENV *));
+int __log_find __P((DB_LOG *, int, u_int32_t *, logfile_validity *));
+int __log_valid __P((DB_LOG *, u_int32_t, int, logfile_validity *));
+int __log_dbenv_refresh __P((DB_ENV *));
+int __log_stat __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
void __log_get_cached_ckp_lsn __P((DB_ENV *, DB_LSN *));
void __log_region_destroy __P((DB_ENV *, REGINFO *));
-gint __log_vtruncate __P((DB_ENV *, DB_LSN *, DB_LSN *));
-gint __log_is_outdated __P((DB_ENV *dbenv, u_int32_t fnum, gint *outdatedp));
-gint __log_archive __P((DB_ENV *, gchar **[], u_int32_t));
-gint __log_cursor __P((DB_ENV *, DB_LOGC **, u_int32_t));
+int __log_vtruncate __P((DB_ENV *, DB_LSN *, DB_LSN *));
+int __log_is_outdated __P((DB_ENV *dbenv, u_int32_t fnum, int *outdatedp));
+int __log_archive __P((DB_ENV *, char **[], u_int32_t));
+int __log_cursor __P((DB_ENV *, DB_LOGC **, u_int32_t));
void __log_dbenv_create __P((DB_ENV *));
-gint __log_put __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
+int __log_put __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
void __log_txn_lsn __P((DB_ENV *, DB_LSN *, u_int32_t *, u_int32_t *));
-gint __log_newfile __P((DB_LOG *, DB_LSN *));
-gint __log_flush __P((DB_ENV *, const DB_LSN *));
-gint __log_file __P((DB_ENV *, const DB_LSN *, gchar *, size_t));
-gint __log_name __P((DB_LOG *, u_int32_t, gchar **, DB_FH *, u_int32_t));
-gint __log_rep_put __P((DB_ENV *, DB_LSN *, const DBT *));
+int __log_newfile __P((DB_LOG *, DB_LSN *));
+int __log_flush __P((DB_ENV *, const DB_LSN *));
+int __log_file __P((DB_ENV *, const DB_LSN *, char *, size_t));
+int __log_name __P((DB_LOG *, u_int32_t, char **, DB_FH *, u_int32_t));
+int __log_rep_put __P((DB_ENV *, DB_LSN *, const DBT *));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/mp_ext.h b/libdb/dbinc_auto/mp_ext.h
index eedd9e0..ceadb3d 100644
--- a/libdb/dbinc_auto/mp_ext.h
+++ b/libdb/dbinc_auto/mp_ext.h
@@ -6,37 +6,37 @@
extern "C" {
#endif
-gint __memp_alloc __P((DB_MPOOL *, REGINFO *, MPOOLFILE *, size_t, roff_t *, gpointer ));
+int __memp_alloc __P((DB_MPOOL *, REGINFO *, MPOOLFILE *, size_t, roff_t *, void *));
#ifdef DIAGNOSTIC
void __memp_check_order __P((DB_MPOOL_HASH *));
#endif
-gint __memp_bhwrite __P((DB_MPOOL *, DB_MPOOL_HASH *, MPOOLFILE *, BH *, int));
-gint __memp_pgread __P((DB_MPOOLFILE *, DB_MUTEX *, BH *, int));
-gint __memp_pg __P((DB_MPOOLFILE *, BH *, int));
+int __memp_bhwrite __P((DB_MPOOL *, DB_MPOOL_HASH *, MPOOLFILE *, BH *, int));
+int __memp_pgread __P((DB_MPOOLFILE *, DB_MUTEX *, BH *, int));
+int __memp_pg __P((DB_MPOOLFILE *, BH *, int));
void __memp_bhfree __P((DB_MPOOL *, DB_MPOOL_HASH *, BH *, int));
-gint __memp_fget __P((DB_MPOOLFILE *, db_pgno_t *, u_int32_t, gpointer ));
-gint __memp_fcreate __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
-gint __memp_fopen_int __P((DB_MPOOLFILE *, MPOOLFILE *, const gchar *, u_int32_t, int, size_t));
-gint __memp_fclose_int __P((DB_MPOOLFILE *, u_int32_t));
-gint __memp_mf_discard __P((DB_MPOOL *, MPOOLFILE *));
-gchar * __memp_fn __P((DB_MPOOLFILE *));
-gchar * __memp_fns __P((DB_MPOOL *, MPOOLFILE *));
-gint __memp_fput __P((DB_MPOOLFILE *, gpointer , u_int32_t));
-gint __memp_fset __P((DB_MPOOLFILE *, gpointer , u_int32_t));
+int __memp_fget __P((DB_MPOOLFILE *, db_pgno_t *, u_int32_t, void *));
+int __memp_fcreate __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
+int __memp_fopen_int __P((DB_MPOOLFILE *, MPOOLFILE *, const char *, u_int32_t, int, size_t));
+int __memp_fclose_int __P((DB_MPOOLFILE *, u_int32_t));
+int __memp_mf_discard __P((DB_MPOOL *, MPOOLFILE *));
+char * __memp_fn __P((DB_MPOOLFILE *));
+char * __memp_fns __P((DB_MPOOL *, MPOOLFILE *));
+int __memp_fput __P((DB_MPOOLFILE *, void *, u_int32_t));
+int __memp_fset __P((DB_MPOOLFILE *, void *, u_int32_t));
void __memp_dbenv_create __P((DB_ENV *));
-gint __memp_open __P((DB_ENV *));
-gint __memp_dbenv_refresh __P((DB_ENV *));
+int __memp_open __P((DB_ENV *));
+int __memp_dbenv_refresh __P((DB_ENV *));
void __mpool_region_destroy __P((DB_ENV *, REGINFO *));
-gint __memp_nameop __P((DB_ENV *, u_int8_t *, const gchar *, const gchar *, const gchar *));
-gint __memp_register __P((DB_ENV *, int, gint (*)(DB_ENV *, db_pgno_t, gpointer , DBT *), gint (*)(DB_ENV *, db_pgno_t, gpointer , DBT *)));
-gint __memp_stat __P((DB_ENV *, DB_MPOOL_STAT **, DB_MPOOL_FSTAT ***, u_int32_t));
-gint __memp_dump_region __P((DB_ENV *, gchar *, FILE *));
+int __memp_nameop __P((DB_ENV *, u_int8_t *, const char *, const char *, const char *));
+int __memp_register __P((DB_ENV *, int, int (*)(DB_ENV *, db_pgno_t, void *, DBT *), int (*)(DB_ENV *, db_pgno_t, void *, DBT *)));
+int __memp_stat __P((DB_ENV *, DB_MPOOL_STAT **, DB_MPOOL_FSTAT ***, u_int32_t));
+int __memp_dump_region __P((DB_ENV *, char *, FILE *));
void __memp_stat_hash __P((REGINFO *, MPOOL *, u_int32_t *));
-gint __memp_sync __P((DB_ENV *, DB_LSN *));
-gint __memp_fsync __P((DB_MPOOLFILE *));
-gint __mp_xxx_fh __P((DB_MPOOLFILE *, DB_FH **));
-gint __memp_sync_int __P((DB_ENV *, DB_MPOOLFILE *, int, db_sync_op, gint *));
-gint __memp_trickle __P((DB_ENV *, int, gint *));
+int __memp_sync __P((DB_ENV *, DB_LSN *));
+int __memp_fsync __P((DB_MPOOLFILE *));
+int __mp_xxx_fh __P((DB_MPOOLFILE *, DB_FH **));
+int __memp_sync_int __P((DB_ENV *, DB_MPOOLFILE *, int, db_sync_op, int *));
+int __memp_trickle __P((DB_ENV *, int, int *));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/mutex_ext.h b/libdb/dbinc_auto/mutex_ext.h
index f16ffab..a40f04d 100644
--- a/libdb/dbinc_auto/mutex_ext.h
+++ b/libdb/dbinc_auto/mutex_ext.h
@@ -6,28 +6,28 @@
extern "C" {
#endif
-gint __db_fcntl_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
-gint __db_fcntl_mutex_lock __P((DB_ENV *, DB_MUTEX *));
-gint __db_fcntl_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
-gint __db_fcntl_mutex_destroy __P((DB_MUTEX *));
-gint __db_pthread_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
-gint __db_pthread_mutex_lock __P((DB_ENV *, DB_MUTEX *));
-gint __db_pthread_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
-gint __db_pthread_mutex_destroy __P((DB_MUTEX *));
-gint __db_tas_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
-gint __db_tas_mutex_lock __P((DB_ENV *, DB_MUTEX *));
-gint __db_tas_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
-gint __db_tas_mutex_destroy __P((DB_MUTEX *));
-gint __db_win32_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
-gint __db_win32_mutex_lock __P((DB_ENV *, DB_MUTEX *));
-gint __db_win32_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
-gint __db_win32_mutex_destroy __P((DB_MUTEX *));
-gint __db_mutex_setup __P((DB_ENV *, REGINFO *, gpointer , u_int32_t));
+int __db_fcntl_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
+int __db_fcntl_mutex_lock __P((DB_ENV *, DB_MUTEX *));
+int __db_fcntl_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
+int __db_fcntl_mutex_destroy __P((DB_MUTEX *));
+int __db_pthread_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
+int __db_pthread_mutex_lock __P((DB_ENV *, DB_MUTEX *));
+int __db_pthread_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
+int __db_pthread_mutex_destroy __P((DB_MUTEX *));
+int __db_tas_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
+int __db_tas_mutex_lock __P((DB_ENV *, DB_MUTEX *));
+int __db_tas_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
+int __db_tas_mutex_destroy __P((DB_MUTEX *));
+int __db_win32_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
+int __db_win32_mutex_lock __P((DB_ENV *, DB_MUTEX *));
+int __db_win32_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
+int __db_win32_mutex_destroy __P((DB_MUTEX *));
+int __db_mutex_setup __P((DB_ENV *, REGINFO *, void *, u_int32_t));
void __db_mutex_free __P((DB_ENV *, REGINFO *, DB_MUTEX *));
void __db_shreg_locks_clear __P((DB_MUTEX *, REGINFO *, REGMAINT *));
void __db_shreg_locks_destroy __P((REGINFO *, REGMAINT *));
-gint __db_shreg_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t, u_int32_t, REGINFO *, REGMAINT *));
-void __db_shreg_maintinit __P((REGINFO *, gpointer addr, size_t));
+int __db_shreg_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t, u_int32_t, REGINFO *, REGMAINT *));
+void __db_shreg_maintinit __P((REGINFO *, void *addr, size_t));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/os_ext.h b/libdb/dbinc_auto/os_ext.h
index 77bcd16..0a2e5ab 100644
--- a/libdb/dbinc_auto/os_ext.h
+++ b/libdb/dbinc_auto/os_ext.h
@@ -6,67 +6,67 @@
extern "C" {
#endif
-gint __os_abspath __P((const gchar *));
-gint __os_umalloc __P((DB_ENV *, size_t, gpointer ));
-gint __os_urealloc __P((DB_ENV *, size_t, gpointer ));
-gint __os_ufree __P((DB_ENV *, gpointer ));
-gint __os_strdup __P((DB_ENV *, const gchar *, gpointer ));
-gint __os_calloc __P((DB_ENV *, size_t, size_t, gpointer ));
-gint __os_malloc __P((DB_ENV *, size_t, gpointer ));
-gint __os_realloc __P((DB_ENV *, size_t, gpointer ));
-void __os_free __P((DB_ENV *, gpointer ));
-gpointer __ua_memcpy __P((gpointer , gconstpointer , size_t));
-gint __os_clock __P((DB_ENV *, u_int32_t *, u_int32_t *));
-gint __os_fs_notzero __P((void));
-gint __os_dirlist __P((DB_ENV *, const gchar *, gchar ***, gint *));
-void __os_dirfree __P((DB_ENV *, gchar **, int));
-gint __os_get_errno_ret_zero __P((void));
-gint __os_get_errno __P((void));
+int __os_abspath __P((const char *));
+int __os_umalloc __P((DB_ENV *, size_t, void *));
+int __os_urealloc __P((DB_ENV *, size_t, void *));
+int __os_ufree __P((DB_ENV *, void *));
+int __os_strdup __P((DB_ENV *, const char *, void *));
+int __os_calloc __P((DB_ENV *, size_t, size_t, void *));
+int __os_malloc __P((DB_ENV *, size_t, void *));
+int __os_realloc __P((DB_ENV *, size_t, void *));
+void __os_free __P((DB_ENV *, void *));
+void *__ua_memcpy __P((void *, const void *, size_t));
+int __os_clock __P((DB_ENV *, u_int32_t *, u_int32_t *));
+int __os_fs_notzero __P((void));
+int __os_dirlist __P((DB_ENV *, const char *, char ***, int *));
+void __os_dirfree __P((DB_ENV *, char **, int));
+int __os_get_errno_ret_zero __P((void));
+int __os_get_errno __P((void));
void __os_set_errno __P((int));
-gint __os_fileid __P((DB_ENV *, const gchar *, int, u_int8_t *));
-gint __os_fsync __P((DB_ENV *, DB_FH *));
-gint __os_openhandle __P((DB_ENV *, const gchar *, int, int, DB_FH *));
-gint __os_closehandle __P((DB_ENV *, DB_FH *));
+int __os_fileid __P((DB_ENV *, const char *, int, u_int8_t *));
+int __os_fsync __P((DB_ENV *, DB_FH *));
+int __os_openhandle __P((DB_ENV *, const char *, int, int, DB_FH *));
+int __os_closehandle __P((DB_ENV *, DB_FH *));
void __os_id __P((u_int32_t *));
-gint __os_r_sysattach __P((DB_ENV *, REGINFO *, REGION *));
-gint __os_r_sysdetach __P((DB_ENV *, REGINFO *, int));
-gint __os_mapfile __P((DB_ENV *, gchar *, DB_FH *, size_t, int, gpointer *));
-gint __os_unmapfile __P((DB_ENV *, gpointer , size_t));
+int __os_r_sysattach __P((DB_ENV *, REGINFO *, REGION *));
+int __os_r_sysdetach __P((DB_ENV *, REGINFO *, int));
+int __os_mapfile __P((DB_ENV *, char *, DB_FH *, size_t, int, void **));
+int __os_unmapfile __P((DB_ENV *, void *, size_t));
u_int32_t __db_oflags __P((int));
-gint __db_omode __P((const gchar *));
-gint __os_open __P((DB_ENV *, const gchar *, u_int32_t, int, DB_FH *));
+int __db_omode __P((const char *));
+int __os_open __P((DB_ENV *, const char *, u_int32_t, int, DB_FH *));
#ifdef HAVE_QNX
-gint __os_shmname __P((DB_ENV *, const gchar *, gchar **));
+int __os_shmname __P((DB_ENV *, const char *, char **));
#endif
-gint __os_r_attach __P((DB_ENV *, REGINFO *, REGION *));
-gint __os_r_detach __P((DB_ENV *, REGINFO *, int));
-gint __os_rename __P((DB_ENV *, const gchar *, const gchar *, u_int32_t));
-gint __os_isroot __P((void));
-gchar *__db_rpath __P((const gchar *));
-gint __os_io __P((DB_ENV *, DB_IO *, int, size_t *));
-gint __os_read __P((DB_ENV *, DB_FH *, gpointer , size_t, size_t *));
-gint __os_write __P((DB_ENV *, DB_FH *, gpointer , size_t, size_t *));
-gint __os_seek __P((DB_ENV *, DB_FH *, size_t, db_pgno_t, u_int32_t, int, DB_OS_SEEK));
-gint __os_sleep __P((DB_ENV *, u_long, u_long));
-gint __os_spin __P((DB_ENV *));
+int __os_r_attach __P((DB_ENV *, REGINFO *, REGION *));
+int __os_r_detach __P((DB_ENV *, REGINFO *, int));
+int __os_rename __P((DB_ENV *, const char *, const char *, u_int32_t));
+int __os_isroot __P((void));
+char *__db_rpath __P((const char *));
+int __os_io __P((DB_ENV *, DB_IO *, int, size_t *));
+int __os_read __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
+int __os_write __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
+int __os_seek __P((DB_ENV *, DB_FH *, size_t, db_pgno_t, u_int32_t, int, DB_OS_SEEK));
+int __os_sleep __P((DB_ENV *, u_long, u_long));
+int __os_spin __P((DB_ENV *));
void __os_yield __P((DB_ENV*, u_long));
-gint __os_exists __P((const gchar *, gint *));
-gint __os_ioinfo __P((DB_ENV *, const gchar *, DB_FH *, u_int32_t *, u_int32_t *, u_int32_t *));
-gint __os_tmpdir __P((DB_ENV *, u_int32_t));
-gint __os_region_unlink __P((DB_ENV *, const gchar *));
-gint __os_unlink __P((DB_ENV *, const gchar *));
+int __os_exists __P((const char *, int *));
+int __os_ioinfo __P((DB_ENV *, const char *, DB_FH *, u_int32_t *, u_int32_t *, u_int32_t *));
+int __os_tmpdir __P((DB_ENV *, u_int32_t));
+int __os_region_unlink __P((DB_ENV *, const char *));
+int __os_unlink __P((DB_ENV *, const char *));
#if defined(DB_WIN32)
-gint __os_win32_errno __P((void));
+int __os_win32_errno __P((void));
#endif
-gint __os_fsync __P((DB_ENV *, DB_FH *));
-gint __os_openhandle __P((DB_ENV *, const gchar *, int, int, DB_FH *));
-gint __os_closehandle __P((DB_ENV *, DB_FH *));
-gint __os_io __P((DB_ENV *, DB_IO *, int, size_t *));
-gint __os_read __P((DB_ENV *, DB_FH *, gpointer , size_t, size_t *));
-gint __os_write __P((DB_ENV *, DB_FH *, gpointer , size_t, size_t *));
-gint __os_exists __P((const gchar *, gint *));
-gint __os_ioinfo __P((DB_ENV *, const gchar *, DB_FH *, u_int32_t *, u_int32_t *, u_int32_t *));
-gint __os_is_winnt __P((void));
+int __os_fsync __P((DB_ENV *, DB_FH *));
+int __os_openhandle __P((DB_ENV *, const char *, int, int, DB_FH *));
+int __os_closehandle __P((DB_ENV *, DB_FH *));
+int __os_io __P((DB_ENV *, DB_IO *, int, size_t *));
+int __os_read __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
+int __os_write __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
+int __os_exists __P((const char *, int *));
+int __os_ioinfo __P((DB_ENV *, const char *, DB_FH *, u_int32_t *, u_int32_t *, u_int32_t *));
+int __os_is_winnt __P((void));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/qam_ext.h b/libdb/dbinc_auto/qam_ext.h
index 56e4282..16dbea7 100644
--- a/libdb/dbinc_auto/qam_ext.h
+++ b/libdb/dbinc_auto/qam_ext.h
@@ -6,63 +6,63 @@
extern "C" {
#endif
-gint __qam_position __P((DBC *, db_recno_t *, qam_position_mode, gint *));
-gint __qam_pitem __P((DBC *, QPAGE *, u_int32_t, db_recno_t, DBT *));
-gint __qam_append __P((DBC *, DBT *, DBT *));
-gint __qam_c_dup __P((DBC *, DBC *));
-gint __qam_c_init __P((DBC *));
-gint __qam_truncate __P((DB *, DB_TXN *, u_int32_t *));
-gint __qam_incfirst_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_recno_t, db_pgno_t));
-gint __qam_incfirst_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __qam_incfirst_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __qam_incfirst_read __P((DB_ENV *, gpointer , __qam_incfirst_args **));
-gint __qam_mvptr_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_recno_t, db_recno_t, db_recno_t, db_recno_t, DB_LSN *, db_pgno_t));
-gint __qam_mvptr_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __qam_mvptr_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __qam_mvptr_read __P((DB_ENV *, gpointer , __qam_mvptr_args **));
-gint __qam_del_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_recno_t));
-gint __qam_del_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __qam_del_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __qam_del_read __P((DB_ENV *, gpointer , __qam_del_args **));
-gint __qam_add_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_recno_t, const DBT *, u_int32_t, const DBT *));
-gint __qam_add_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __qam_add_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __qam_add_read __P((DB_ENV *, gpointer , __qam_add_args **));
-gint __qam_delext_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_recno_t, const DBT *));
-gint __qam_delext_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __qam_delext_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __qam_delext_read __P((DB_ENV *, gpointer , __qam_delext_args **));
-gint __qam_init_print __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __qam_init_getpgnos __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __qam_init_recover __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __qam_mswap __P((PAGE *));
-gint __qam_pgin_out __P((DB_ENV *, db_pgno_t, gpointer , DBT *));
-gint __qam_fprobe __P((DB *, db_pgno_t, gpointer , qam_probe_mode, u_int32_t));
-gint __qam_fclose __P((DB *, db_pgno_t));
-gint __qam_fremove __P((DB *, db_pgno_t));
-gint __qam_sync __P((DB *, u_int32_t));
-gint __qam_gen_filelist __P(( DB *, QUEUE_FILELIST **));
-gint __qam_extent_names __P((DB_ENV *, gchar *, gchar ***));
+int __qam_position __P((DBC *, db_recno_t *, qam_position_mode, int *));
+int __qam_pitem __P((DBC *, QPAGE *, u_int32_t, db_recno_t, DBT *));
+int __qam_append __P((DBC *, DBT *, DBT *));
+int __qam_c_dup __P((DBC *, DBC *));
+int __qam_c_init __P((DBC *));
+int __qam_truncate __P((DB *, DB_TXN *, u_int32_t *));
+int __qam_incfirst_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_recno_t, db_pgno_t));
+int __qam_incfirst_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __qam_incfirst_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __qam_incfirst_read __P((DB_ENV *, void *, __qam_incfirst_args **));
+int __qam_mvptr_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_recno_t, db_recno_t, db_recno_t, db_recno_t, DB_LSN *, db_pgno_t));
+int __qam_mvptr_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __qam_mvptr_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __qam_mvptr_read __P((DB_ENV *, void *, __qam_mvptr_args **));
+int __qam_del_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_recno_t));
+int __qam_del_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __qam_del_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __qam_del_read __P((DB_ENV *, void *, __qam_del_args **));
+int __qam_add_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_recno_t, const DBT *, u_int32_t, const DBT *));
+int __qam_add_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __qam_add_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __qam_add_read __P((DB_ENV *, void *, __qam_add_args **));
+int __qam_delext_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_recno_t, const DBT *));
+int __qam_delext_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __qam_delext_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __qam_delext_read __P((DB_ENV *, void *, __qam_delext_args **));
+int __qam_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __qam_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __qam_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __qam_mswap __P((PAGE *));
+int __qam_pgin_out __P((DB_ENV *, db_pgno_t, void *, DBT *));
+int __qam_fprobe __P((DB *, db_pgno_t, void *, qam_probe_mode, u_int32_t));
+int __qam_fclose __P((DB *, db_pgno_t));
+int __qam_fremove __P((DB *, db_pgno_t));
+int __qam_sync __P((DB *, u_int32_t));
+int __qam_gen_filelist __P(( DB *, QUEUE_FILELIST **));
+int __qam_extent_names __P((DB_ENV *, char *, char ***));
void __qam_exid __P((DB *, u_int8_t *, u_int32_t));
-gint __qam_db_create __P((DB *));
-gint __qam_db_close __P((DB *));
-gint __db_prqueue __P((DB *, FILE *, u_int32_t));
-gint __qam_remove __P((DB *, DB_TXN *, const gchar *, const gchar *, DB_LSN *));
-gint __qam_rename __P((DB *, DB_TXN *, const gchar *, const gchar *, const gchar *));
-gint __qam_open __P((DB *, DB_TXN *, const gchar *, db_pgno_t, int, u_int32_t));
-gint __qam_metachk __P((DB *, const gchar *, QMETA *));
-gint __qam_new_file __P((DB *, DB_TXN *, DB_FH *, const gchar *));
-gint __qam_incfirst_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __qam_mvptr_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __qam_del_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __qam_delext_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __qam_add_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __qam_stat __P((DB *, gpointer , u_int32_t));
-gint __qam_31_qammeta __P((DB *, gchar *, u_int8_t *));
-gint __qam_32_qammeta __P((DB *, gchar *, u_int8_t *));
-gint __qam_vrfy_meta __P((DB *, VRFY_DBINFO *, QMETA *, db_pgno_t, u_int32_t));
-gint __qam_vrfy_data __P((DB *, VRFY_DBINFO *, QPAGE *, db_pgno_t, u_int32_t));
-gint __qam_vrfy_structure __P((DB *, VRFY_DBINFO *, u_int32_t));
+int __qam_db_create __P((DB *));
+int __qam_db_close __P((DB *));
+int __db_prqueue __P((DB *, FILE *, u_int32_t));
+int __qam_remove __P((DB *, DB_TXN *, const char *, const char *, DB_LSN *));
+int __qam_rename __P((DB *, DB_TXN *, const char *, const char *, const char *));
+int __qam_open __P((DB *, DB_TXN *, const char *, db_pgno_t, int, u_int32_t));
+int __qam_metachk __P((DB *, const char *, QMETA *));
+int __qam_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
+int __qam_incfirst_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __qam_mvptr_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __qam_del_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __qam_delext_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __qam_add_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __qam_stat __P((DB *, void *, u_int32_t));
+int __qam_31_qammeta __P((DB *, char *, u_int8_t *));
+int __qam_32_qammeta __P((DB *, char *, u_int8_t *));
+int __qam_vrfy_meta __P((DB *, VRFY_DBINFO *, QMETA *, db_pgno_t, u_int32_t));
+int __qam_vrfy_data __P((DB *, VRFY_DBINFO *, QPAGE *, db_pgno_t, u_int32_t));
+int __qam_vrfy_structure __P((DB *, VRFY_DBINFO *, u_int32_t));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/rep_ext.h b/libdb/dbinc_auto/rep_ext.h
index fda5414..22e2d25 100644
--- a/libdb/dbinc_auto/rep_ext.h
+++ b/libdb/dbinc_auto/rep_ext.h
@@ -6,23 +6,23 @@
extern "C" {
#endif
-gint __rep_dbenv_create __P((DB_ENV *));
-gint __rep_process_message __P((DB_ENV *, DBT *, DBT *, gint *));
-gint __rep_process_txn __P((DB_ENV *, DBT *));
-gint __rep_region_init __P((DB_ENV *));
-gint __rep_region_destroy __P((DB_ENV *));
-gint __rep_dbenv_close __P((DB_ENV *));
-gint __rep_preclose __P((DB_ENV *, int));
-gint __rep_check_alloc __P((DB_ENV *, TXN_RECS *, int));
-gint __rep_send_message __P((DB_ENV *, int, u_int32_t, DB_LSN *, const DBT *, u_int32_t));
-gint __rep_new_master __P((DB_ENV *, REP_CONTROL *, int));
-gint __rep_lockpgno_init __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __rep_unlockpages __P((DB_ENV *, u_int32_t));
-gint __rep_lockpages __P((DB_ENV *, gint (**)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t, DB_LSN *, DB_LSN *, TXN_RECS *, u_int32_t));
-gint __rep_is_client __P((DB_ENV *));
-gint __rep_send_vote __P((DB_ENV *, DB_LSN *, int, int, int));
-gint __rep_grow_sites __P((DB_ENV *dbenv, gint nsites));
-void __rep_print_message __P((DB_ENV *, int, REP_CONTROL *, gchar *));
+int __rep_dbenv_create __P((DB_ENV *));
+int __rep_process_message __P((DB_ENV *, DBT *, DBT *, int *));
+int __rep_process_txn __P((DB_ENV *, DBT *));
+int __rep_region_init __P((DB_ENV *));
+int __rep_region_destroy __P((DB_ENV *));
+int __rep_dbenv_close __P((DB_ENV *));
+int __rep_preclose __P((DB_ENV *, int));
+int __rep_check_alloc __P((DB_ENV *, TXN_RECS *, int));
+int __rep_send_message __P((DB_ENV *, int, u_int32_t, DB_LSN *, const DBT *, u_int32_t));
+int __rep_new_master __P((DB_ENV *, REP_CONTROL *, int));
+int __rep_lockpgno_init __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __rep_unlockpages __P((DB_ENV *, u_int32_t));
+int __rep_lockpages __P((DB_ENV *, int (**)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t, DB_LSN *, DB_LSN *, TXN_RECS *, u_int32_t));
+int __rep_is_client __P((DB_ENV *));
+int __rep_send_vote __P((DB_ENV *, DB_LSN *, int, int, int));
+int __rep_grow_sites __P((DB_ENV *dbenv, int nsites));
+void __rep_print_message __P((DB_ENV *, int, REP_CONTROL *, char *));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/rpc_client_ext.h b/libdb/dbinc_auto/rpc_client_ext.h
index ec79295..9634b34 100644
--- a/libdb/dbinc_auto/rpc_client_ext.h
+++ b/libdb/dbinc_auto/rpc_client_ext.h
@@ -6,160 +6,160 @@
extern "C" {
#endif
-gint __dbcl_envrpcserver __P((DB_ENV *, gpointer , const gchar *, long, long, u_int32_t));
-gint __dbcl_env_open_wrap __P((DB_ENV *, const gchar *, u_int32_t, int));
-gint __dbcl_db_open_wrap __P((DB *, DB_TXN *, const gchar *, const gchar *, DBTYPE, u_int32_t, int));
-gint __dbcl_refresh __P((DB_ENV *));
-gint __dbcl_retcopy __P((DB_ENV *, DBT *, gpointer , u_int32_t, gpointer *, u_int32_t *));
+int __dbcl_envrpcserver __P((DB_ENV *, void *, const char *, long, long, u_int32_t));
+int __dbcl_env_open_wrap __P((DB_ENV *, const char *, u_int32_t, int));
+int __dbcl_db_open_wrap __P((DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int));
+int __dbcl_refresh __P((DB_ENV *));
+int __dbcl_retcopy __P((DB_ENV *, DBT *, void *, u_int32_t, void **, u_int32_t *));
void __dbcl_txn_end __P((DB_TXN *));
void __dbcl_txn_setup __P((DB_ENV *, DB_TXN *, DB_TXN *, u_int32_t));
void __dbcl_c_refresh __P((DBC *));
-gint __dbcl_c_setup __P((long, DB *, DBC **));
-gint __dbcl_dbclose_common __P((DB *));
-gint __dbcl_env_alloc __P((DB_ENV *, gpointer (*)(size_t), gpointer (*)(gpointer , size_t), void (*)(gpointer)));
-gint __dbcl_set_app_dispatch __P((DB_ENV *, gint (*)(DB_ENV *, DBT *, DB_LSN *, db_recops)));
-gint __dbcl_env_cachesize __P((DB_ENV *, u_int32_t, u_int32_t, int));
-gint __dbcl_env_close __P((DB_ENV *, u_int32_t));
-gint __dbcl_env_create __P((DB_ENV *, long));
-gint __dbcl_set_data_dir __P((DB_ENV *, const gchar *));
-gint __dbcl_env_dbremove __P((DB_ENV *, DB_TXN *, const gchar *, const gchar *, u_int32_t));
-gint __dbcl_env_dbrename __P((DB_ENV *, DB_TXN *, const gchar *, const gchar *, const gchar *, u_int32_t));
-gint __dbcl_env_encrypt __P((DB_ENV *, const gchar *, u_int32_t));
-gint __dbcl_env_set_feedback __P((DB_ENV *, void (*)(DB_ENV *, int, int)));
-gint __dbcl_env_flags __P((DB_ENV *, u_int32_t, int));
-gint __dbcl_set_lg_bsize __P((DB_ENV *, u_int32_t));
-gint __dbcl_set_lg_dir __P((DB_ENV *, const gchar *));
-gint __dbcl_set_lg_max __P((DB_ENV *, u_int32_t));
-gint __dbcl_set_lg_regionmax __P((DB_ENV *, u_int32_t));
-gint __dbcl_set_lk_conflict __P((DB_ENV *, u_int8_t *, int));
-gint __dbcl_set_lk_detect __P((DB_ENV *, u_int32_t));
-gint __dbcl_set_lk_max __P((DB_ENV *, u_int32_t));
-gint __dbcl_set_lk_max_locks __P((DB_ENV *, u_int32_t));
-gint __dbcl_set_lk_max_lockers __P((DB_ENV *, u_int32_t));
-gint __dbcl_set_lk_max_objects __P((DB_ENV *, u_int32_t));
-gint __dbcl_set_mp_mmapsize __P((DB_ENV *, size_t));
-gint __dbcl_env_open __P((DB_ENV *, const gchar *, u_int32_t, int));
-gint __dbcl_env_paniccall __P((DB_ENV *, void (*)(DB_ENV *, int)));
-gint __dbcl_env_remove __P((DB_ENV *, const gchar *, u_int32_t));
-gint __dbcl_set_shm_key __P((DB_ENV *, long));
-gint __dbcl_set_tas_spins __P((DB_ENV *, u_int32_t));
-gint __dbcl_set_timeout __P((DB_ENV *, u_int32_t, u_int32_t));
-gint __dbcl_set_tmp_dir __P((DB_ENV *, const gchar *));
-gint __dbcl_set_tx_max __P((DB_ENV *, u_int32_t));
-gint __dbcl_set_tx_timestamp __P((DB_ENV *, time_t *));
-gint __dbcl_set_verbose __P((DB_ENV *, u_int32_t, int));
-gint __dbcl_txn_abort __P((DB_TXN *));
-gint __dbcl_txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
-gint __dbcl_txn_checkpoint __P((DB_ENV *, u_int32_t, u_int32_t, u_int32_t));
-gint __dbcl_txn_commit __P((DB_TXN *, u_int32_t));
-gint __dbcl_txn_discard __P((DB_TXN *, u_int32_t));
-gint __dbcl_txn_prepare __P((DB_TXN *, u_int8_t *));
-gint __dbcl_txn_recover __P((DB_ENV *, DB_PREPLIST *, long, long *, u_int32_t));
-gint __dbcl_txn_stat __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
-gint __dbcl_txn_timeout __P((DB_TXN *, u_int32_t, u_int32_t));
-gint __dbcl_rep_elect __P((DB_ENV *, int, int, u_int32_t, gint *));
-gint __dbcl_rep_flush __P((DB_ENV *));
-gint __dbcl_rep_process_message __P((DB_ENV *, DBT *, DBT *, gint *));
-gint __dbcl_rep_set_limit __P((DB_ENV *, u_int32_t, u_int32_t));
-gint __dbcl_rep_set_request __P((DB_ENV *, u_int32_t, u_int32_t));
-gint __dbcl_rep_set_rep_transport __P((DB_ENV *, int, gint (*)(DB_ENV *, const DBT *, const DBT *, int, u_int32_t)));
-gint __dbcl_rep_start __P((DB_ENV *, DBT *, u_int32_t));
-gint __dbcl_rep_stat __P((DB_ENV *, DB_REP_STAT **, u_int32_t));
-gint __dbcl_db_alloc __P((DB *, gpointer (*)(size_t), gpointer (*)(gpointer , size_t), void (*)(gpointer)));
-gint __dbcl_db_associate __P((DB *, DB_TXN *, DB *, gint (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
-gint __dbcl_db_bt_compare __P((DB *, gint (*)(DB *, const DBT *, const DBT *)));
-gint __dbcl_db_bt_maxkey __P((DB *, u_int32_t));
-gint __dbcl_db_bt_minkey __P((DB *, u_int32_t));
-gint __dbcl_db_bt_prefix __P((DB *, size_t(*)(DB *, const DBT *, const DBT *)));
-gint __dbcl_db_set_append_recno __P((DB *, gint (*)(DB *, DBT *, db_recno_t)));
-gint __dbcl_db_cache_priority __P((DB *, DB_CACHE_PRIORITY));
-gint __dbcl_db_cachesize __P((DB *, u_int32_t, u_int32_t, int));
-gint __dbcl_db_close __P((DB *, u_int32_t));
-gint __dbcl_db_create __P((DB *, DB_ENV *, u_int32_t));
-gint __dbcl_db_del __P((DB *, DB_TXN *, DBT *, u_int32_t));
-gint __dbcl_db_dup_compare __P((DB *, gint (*)(DB *, const DBT *, const DBT *)));
-gint __dbcl_db_encrypt __P((DB *, const gchar *, u_int32_t));
-gint __dbcl_db_extentsize __P((DB *, u_int32_t));
-gint __dbcl_db_fd __P((DB *, gint *));
-gint __dbcl_db_feedback __P((DB *, void (*)(DB *, int, int)));
-gint __dbcl_db_flags __P((DB *, u_int32_t));
-gint __dbcl_db_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-gint __dbcl_db_h_ffactor __P((DB *, u_int32_t));
-gint __dbcl_db_h_hash __P((DB *, u_int32_t(*)(DB *, gconstpointer , u_int32_t)));
-gint __dbcl_db_h_nelem __P((DB *, u_int32_t));
-gint __dbcl_db_key_range __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t));
-gint __dbcl_db_lorder __P((DB *, int));
-gint __dbcl_db_open __P((DB *, DB_TXN *, const gchar *, const gchar *, DBTYPE, u_int32_t, int));
-gint __dbcl_db_pagesize __P((DB *, u_int32_t));
-gint __dbcl_db_panic __P((DB *, void (*)(DB_ENV *, int)));
-gint __dbcl_db_pget __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
-gint __dbcl_db_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-gint __dbcl_db_re_delim __P((DB *, int));
-gint __dbcl_db_re_len __P((DB *, u_int32_t));
-gint __dbcl_db_re_pad __P((DB *, int));
-gint __dbcl_db_re_source __P((DB *, const gchar *));
-gint __dbcl_db_remove __P((DB *, const gchar *, const gchar *, u_int32_t));
-gint __dbcl_db_rename __P((DB *, const gchar *, const gchar *, const gchar *, u_int32_t));
-gint __dbcl_db_stat __P((DB *, gpointer , u_int32_t));
-gint __dbcl_db_sync __P((DB *, u_int32_t));
-gint __dbcl_db_truncate __P((DB *, DB_TXN *, u_int32_t *, u_int32_t));
-gint __dbcl_db_upgrade __P((DB *, const gchar *, u_int32_t));
-gint __dbcl_db_verify __P((DB *, const gchar *, const gchar *, FILE *, u_int32_t));
-gint __dbcl_db_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
-gint __dbcl_db_join __P((DB *, DBC **, DBC **, u_int32_t));
-gint __dbcl_dbc_close __P((DBC *));
-gint __dbcl_dbc_count __P((DBC *, db_recno_t *, u_int32_t));
-gint __dbcl_dbc_del __P((DBC *, u_int32_t));
-gint __dbcl_dbc_dup __P((DBC *, DBC **, u_int32_t));
-gint __dbcl_dbc_get __P((DBC *, DBT *, DBT *, u_int32_t));
-gint __dbcl_dbc_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
-gint __dbcl_dbc_put __P((DBC *, DBT *, DBT *, u_int32_t));
-gint __dbcl_lock_detect __P((DB_ENV *, u_int32_t, u_int32_t, gint *));
-gint __dbcl_lock_get __P((DB_ENV *, u_int32_t, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *));
-gint __dbcl_lock_id __P((DB_ENV *, u_int32_t *));
-gint __dbcl_lock_id_free __P((DB_ENV *, u_int32_t));
-gint __dbcl_lock_put __P((DB_ENV *, DB_LOCK *));
-gint __dbcl_lock_stat __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
-gint __dbcl_lock_vec __P((DB_ENV *, u_int32_t, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **));
-gint __dbcl_log_archive __P((DB_ENV *, gchar ***, u_int32_t));
-gint __dbcl_log_cursor __P((DB_ENV *, DB_LOGC **, u_int32_t));
-gint __dbcl_log_file __P((DB_ENV *, const DB_LSN *, gchar *, size_t));
-gint __dbcl_log_flush __P((DB_ENV *, const DB_LSN *));
-gint __dbcl_log_put __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
-gint __dbcl_log_stat __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
-gint __dbcl_memp_fcreate __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
-gint __dbcl_memp_register __P((DB_ENV *, int, gint (*)(DB_ENV *, db_pgno_t, gpointer , DBT *), gint (*)(DB_ENV *, db_pgno_t, gpointer , DBT *)));
-gint __dbcl_memp_stat __P((DB_ENV *, DB_MPOOL_STAT **, DB_MPOOL_FSTAT ***, u_int32_t));
-gint __dbcl_memp_sync __P((DB_ENV *, DB_LSN *));
-gint __dbcl_memp_trickle __P((DB_ENV *, int, gint *));
-gint __dbcl_env_close_ret __P((DB_ENV *, u_int32_t, __env_close_reply *));
-gint __dbcl_env_create_ret __P((DB_ENV *, long, __env_create_reply *));
-gint __dbcl_env_open_ret __P((DB_ENV *, const gchar *, u_int32_t, int, __env_open_reply *));
-gint __dbcl_env_remove_ret __P((DB_ENV *, const gchar *, u_int32_t, __env_remove_reply *));
-gint __dbcl_txn_abort_ret __P((DB_TXN *, __txn_abort_reply *));
-gint __dbcl_txn_begin_ret __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t, __txn_begin_reply *));
-gint __dbcl_txn_commit_ret __P((DB_TXN *, u_int32_t, __txn_commit_reply *));
-gint __dbcl_txn_discard_ret __P((DB_TXN *, u_int32_t, __txn_discard_reply *));
-gint __dbcl_txn_recover_ret __P((DB_ENV *, DB_PREPLIST *, long, long *, u_int32_t, __txn_recover_reply *));
-gint __dbcl_db_close_ret __P((DB *, u_int32_t, __db_close_reply *));
-gint __dbcl_db_create_ret __P((DB *, DB_ENV *, u_int32_t, __db_create_reply *));
-gint __dbcl_db_get_ret __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t, __db_get_reply *));
-gint __dbcl_db_key_range_ret __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t, __db_key_range_reply *));
-gint __dbcl_db_open_ret __P((DB *, DB_TXN *, const gchar *, const gchar *, DBTYPE, u_int32_t, int, __db_open_reply *));
-gint __dbcl_db_pget_ret __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t, __db_pget_reply *));
-gint __dbcl_db_put_ret __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t, __db_put_reply *));
-gint __dbcl_db_remove_ret __P((DB *, const gchar *, const gchar *, u_int32_t, __db_remove_reply *));
-gint __dbcl_db_rename_ret __P((DB *, const gchar *, const gchar *, const gchar *, u_int32_t, __db_rename_reply *));
-gint __dbcl_db_stat_ret __P((DB *, gpointer , u_int32_t, __db_stat_reply *));
-gint __dbcl_db_truncate_ret __P((DB *, DB_TXN *, u_int32_t *, u_int32_t, __db_truncate_reply *));
-gint __dbcl_db_cursor_ret __P((DB *, DB_TXN *, DBC **, u_int32_t, __db_cursor_reply *));
-gint __dbcl_db_join_ret __P((DB *, DBC **, DBC **, u_int32_t, __db_join_reply *));
-gint __dbcl_dbc_close_ret __P((DBC *, __dbc_close_reply *));
-gint __dbcl_dbc_count_ret __P((DBC *, db_recno_t *, u_int32_t, __dbc_count_reply *));
-gint __dbcl_dbc_dup_ret __P((DBC *, DBC **, u_int32_t, __dbc_dup_reply *));
-gint __dbcl_dbc_get_ret __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_get_reply *));
-gint __dbcl_dbc_pget_ret __P((DBC *, DBT *, DBT *, DBT *, u_int32_t, __dbc_pget_reply *));
-gint __dbcl_dbc_put_ret __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_put_reply *));
+int __dbcl_c_setup __P((long, DB *, DBC **));
+int __dbcl_dbclose_common __P((DB *));
+int __dbcl_env_alloc __P((DB_ENV *, void *(*)(size_t), void *(*)(void *, size_t), void (*)(void *)));
+int __dbcl_set_app_dispatch __P((DB_ENV *, int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops)));
+int __dbcl_env_cachesize __P((DB_ENV *, u_int32_t, u_int32_t, int));
+int __dbcl_env_close __P((DB_ENV *, u_int32_t));
+int __dbcl_env_create __P((DB_ENV *, long));
+int __dbcl_set_data_dir __P((DB_ENV *, const char *));
+int __dbcl_env_dbremove __P((DB_ENV *, DB_TXN *, const char *, const char *, u_int32_t));
+int __dbcl_env_dbrename __P((DB_ENV *, DB_TXN *, const char *, const char *, const char *, u_int32_t));
+int __dbcl_env_encrypt __P((DB_ENV *, const char *, u_int32_t));
+int __dbcl_env_set_feedback __P((DB_ENV *, void (*)(DB_ENV *, int, int)));
+int __dbcl_env_flags __P((DB_ENV *, u_int32_t, int));
+int __dbcl_set_lg_bsize __P((DB_ENV *, u_int32_t));
+int __dbcl_set_lg_dir __P((DB_ENV *, const char *));
+int __dbcl_set_lg_max __P((DB_ENV *, u_int32_t));
+int __dbcl_set_lg_regionmax __P((DB_ENV *, u_int32_t));
+int __dbcl_set_lk_conflict __P((DB_ENV *, u_int8_t *, int));
+int __dbcl_set_lk_detect __P((DB_ENV *, u_int32_t));
+int __dbcl_set_lk_max __P((DB_ENV *, u_int32_t));
+int __dbcl_set_lk_max_locks __P((DB_ENV *, u_int32_t));
+int __dbcl_set_lk_max_lockers __P((DB_ENV *, u_int32_t));
+int __dbcl_set_lk_max_objects __P((DB_ENV *, u_int32_t));
+int __dbcl_set_mp_mmapsize __P((DB_ENV *, size_t));
+int __dbcl_env_open __P((DB_ENV *, const char *, u_int32_t, int));
+int __dbcl_env_paniccall __P((DB_ENV *, void (*)(DB_ENV *, int)));
+int __dbcl_env_remove __P((DB_ENV *, const char *, u_int32_t));
+int __dbcl_set_shm_key __P((DB_ENV *, long));
+int __dbcl_set_tas_spins __P((DB_ENV *, u_int32_t));
+int __dbcl_set_timeout __P((DB_ENV *, u_int32_t, u_int32_t));
+int __dbcl_set_tmp_dir __P((DB_ENV *, const char *));
+int __dbcl_set_tx_max __P((DB_ENV *, u_int32_t));
+int __dbcl_set_tx_timestamp __P((DB_ENV *, time_t *));
+int __dbcl_set_verbose __P((DB_ENV *, u_int32_t, int));
+int __dbcl_txn_abort __P((DB_TXN *));
+int __dbcl_txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
+int __dbcl_txn_checkpoint __P((DB_ENV *, u_int32_t, u_int32_t, u_int32_t));
+int __dbcl_txn_commit __P((DB_TXN *, u_int32_t));
+int __dbcl_txn_discard __P((DB_TXN *, u_int32_t));
+int __dbcl_txn_prepare __P((DB_TXN *, u_int8_t *));
+int __dbcl_txn_recover __P((DB_ENV *, DB_PREPLIST *, long, long *, u_int32_t));
+int __dbcl_txn_stat __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
+int __dbcl_txn_timeout __P((DB_TXN *, u_int32_t, u_int32_t));
+int __dbcl_rep_elect __P((DB_ENV *, int, int, u_int32_t, int *));
+int __dbcl_rep_flush __P((DB_ENV *));
+int __dbcl_rep_process_message __P((DB_ENV *, DBT *, DBT *, int *));
+int __dbcl_rep_set_limit __P((DB_ENV *, u_int32_t, u_int32_t));
+int __dbcl_rep_set_request __P((DB_ENV *, u_int32_t, u_int32_t));
+int __dbcl_rep_set_rep_transport __P((DB_ENV *, int, int (*)(DB_ENV *, const DBT *, const DBT *, int, u_int32_t)));
+int __dbcl_rep_start __P((DB_ENV *, DBT *, u_int32_t));
+int __dbcl_rep_stat __P((DB_ENV *, DB_REP_STAT **, u_int32_t));
+int __dbcl_db_alloc __P((DB *, void *(*)(size_t), void *(*)(void *, size_t), void (*)(void *)));
+int __dbcl_db_associate __P((DB *, DB_TXN *, DB *, int (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
+int __dbcl_db_bt_compare __P((DB *, int (*)(DB *, const DBT *, const DBT *)));
+int __dbcl_db_bt_maxkey __P((DB *, u_int32_t));
+int __dbcl_db_bt_minkey __P((DB *, u_int32_t));
+int __dbcl_db_bt_prefix __P((DB *, size_t(*)(DB *, const DBT *, const DBT *)));
+int __dbcl_db_set_append_recno __P((DB *, int (*)(DB *, DBT *, db_recno_t)));
+int __dbcl_db_cache_priority __P((DB *, DB_CACHE_PRIORITY));
+int __dbcl_db_cachesize __P((DB *, u_int32_t, u_int32_t, int));
+int __dbcl_db_close __P((DB *, u_int32_t));
+int __dbcl_db_create __P((DB *, DB_ENV *, u_int32_t));
+int __dbcl_db_del __P((DB *, DB_TXN *, DBT *, u_int32_t));
+int __dbcl_db_dup_compare __P((DB *, int (*)(DB *, const DBT *, const DBT *)));
+int __dbcl_db_encrypt __P((DB *, const char *, u_int32_t));
+int __dbcl_db_extentsize __P((DB *, u_int32_t));
+int __dbcl_db_fd __P((DB *, int *));
+int __dbcl_db_feedback __P((DB *, void (*)(DB *, int, int)));
+int __dbcl_db_flags __P((DB *, u_int32_t));
+int __dbcl_db_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+int __dbcl_db_h_ffactor __P((DB *, u_int32_t));
+int __dbcl_db_h_hash __P((DB *, u_int32_t(*)(DB *, const void *, u_int32_t)));
+int __dbcl_db_h_nelem __P((DB *, u_int32_t));
+int __dbcl_db_key_range __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t));
+int __dbcl_db_lorder __P((DB *, int));
+int __dbcl_db_open __P((DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int));
+int __dbcl_db_pagesize __P((DB *, u_int32_t));
+int __dbcl_db_panic __P((DB *, void (*)(DB_ENV *, int)));
+int __dbcl_db_pget __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
+int __dbcl_db_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+int __dbcl_db_re_delim __P((DB *, int));
+int __dbcl_db_re_len __P((DB *, u_int32_t));
+int __dbcl_db_re_pad __P((DB *, int));
+int __dbcl_db_re_source __P((DB *, const char *));
+int __dbcl_db_remove __P((DB *, const char *, const char *, u_int32_t));
+int __dbcl_db_rename __P((DB *, const char *, const char *, const char *, u_int32_t));
+int __dbcl_db_stat __P((DB *, void *, u_int32_t));
+int __dbcl_db_sync __P((DB *, u_int32_t));
+int __dbcl_db_truncate __P((DB *, DB_TXN *, u_int32_t *, u_int32_t));
+int __dbcl_db_upgrade __P((DB *, const char *, u_int32_t));
+int __dbcl_db_verify __P((DB *, const char *, const char *, FILE *, u_int32_t));
+int __dbcl_db_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
+int __dbcl_db_join __P((DB *, DBC **, DBC **, u_int32_t));
+int __dbcl_dbc_close __P((DBC *));
+int __dbcl_dbc_count __P((DBC *, db_recno_t *, u_int32_t));
+int __dbcl_dbc_del __P((DBC *, u_int32_t));
+int __dbcl_dbc_dup __P((DBC *, DBC **, u_int32_t));
+int __dbcl_dbc_get __P((DBC *, DBT *, DBT *, u_int32_t));
+int __dbcl_dbc_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
+int __dbcl_dbc_put __P((DBC *, DBT *, DBT *, u_int32_t));
+int __dbcl_lock_detect __P((DB_ENV *, u_int32_t, u_int32_t, int *));
+int __dbcl_lock_get __P((DB_ENV *, u_int32_t, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *));
+int __dbcl_lock_id __P((DB_ENV *, u_int32_t *));
+int __dbcl_lock_id_free __P((DB_ENV *, u_int32_t));
+int __dbcl_lock_put __P((DB_ENV *, DB_LOCK *));
+int __dbcl_lock_stat __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
+int __dbcl_lock_vec __P((DB_ENV *, u_int32_t, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **));
+int __dbcl_log_archive __P((DB_ENV *, char ***, u_int32_t));
+int __dbcl_log_cursor __P((DB_ENV *, DB_LOGC **, u_int32_t));
+int __dbcl_log_file __P((DB_ENV *, const DB_LSN *, char *, size_t));
+int __dbcl_log_flush __P((DB_ENV *, const DB_LSN *));
+int __dbcl_log_put __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
+int __dbcl_log_stat __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
+int __dbcl_memp_fcreate __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
+int __dbcl_memp_register __P((DB_ENV *, int, int (*)(DB_ENV *, db_pgno_t, void *, DBT *), int (*)(DB_ENV *, db_pgno_t, void *, DBT *)));
+int __dbcl_memp_stat __P((DB_ENV *, DB_MPOOL_STAT **, DB_MPOOL_FSTAT ***, u_int32_t));
+int __dbcl_memp_sync __P((DB_ENV *, DB_LSN *));
+int __dbcl_memp_trickle __P((DB_ENV *, int, int *));
+int __dbcl_env_close_ret __P((DB_ENV *, u_int32_t, __env_close_reply *));
+int __dbcl_env_create_ret __P((DB_ENV *, long, __env_create_reply *));
+int __dbcl_env_open_ret __P((DB_ENV *, const char *, u_int32_t, int, __env_open_reply *));
+int __dbcl_env_remove_ret __P((DB_ENV *, const char *, u_int32_t, __env_remove_reply *));
+int __dbcl_txn_abort_ret __P((DB_TXN *, __txn_abort_reply *));
+int __dbcl_txn_begin_ret __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t, __txn_begin_reply *));
+int __dbcl_txn_commit_ret __P((DB_TXN *, u_int32_t, __txn_commit_reply *));
+int __dbcl_txn_discard_ret __P((DB_TXN *, u_int32_t, __txn_discard_reply *));
+int __dbcl_txn_recover_ret __P((DB_ENV *, DB_PREPLIST *, long, long *, u_int32_t, __txn_recover_reply *));
+int __dbcl_db_close_ret __P((DB *, u_int32_t, __db_close_reply *));
+int __dbcl_db_create_ret __P((DB *, DB_ENV *, u_int32_t, __db_create_reply *));
+int __dbcl_db_get_ret __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t, __db_get_reply *));
+int __dbcl_db_key_range_ret __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t, __db_key_range_reply *));
+int __dbcl_db_open_ret __P((DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int, __db_open_reply *));
+int __dbcl_db_pget_ret __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t, __db_pget_reply *));
+int __dbcl_db_put_ret __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t, __db_put_reply *));
+int __dbcl_db_remove_ret __P((DB *, const char *, const char *, u_int32_t, __db_remove_reply *));
+int __dbcl_db_rename_ret __P((DB *, const char *, const char *, const char *, u_int32_t, __db_rename_reply *));
+int __dbcl_db_stat_ret __P((DB *, void *, u_int32_t, __db_stat_reply *));
+int __dbcl_db_truncate_ret __P((DB *, DB_TXN *, u_int32_t *, u_int32_t, __db_truncate_reply *));
+int __dbcl_db_cursor_ret __P((DB *, DB_TXN *, DBC **, u_int32_t, __db_cursor_reply *));
+int __dbcl_db_join_ret __P((DB *, DBC **, DBC **, u_int32_t, __db_join_reply *));
+int __dbcl_dbc_close_ret __P((DBC *, __dbc_close_reply *));
+int __dbcl_dbc_count_ret __P((DBC *, db_recno_t *, u_int32_t, __dbc_count_reply *));
+int __dbcl_dbc_dup_ret __P((DBC *, DBC **, u_int32_t, __dbc_dup_reply *));
+int __dbcl_dbc_get_ret __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_get_reply *));
+int __dbcl_dbc_pget_ret __P((DBC *, DBT *, DBT *, DBT *, u_int32_t, __dbc_pget_reply *));
+int __dbcl_dbc_put_ret __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_put_reply *));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/rpc_server_ext.h b/libdb/dbinc_auto/rpc_server_ext.h
index 74b029c..c0c7068 100644
--- a/libdb/dbinc_auto/rpc_server_ext.h
+++ b/libdb/dbinc_auto/rpc_server_ext.h
@@ -9,42 +9,42 @@ extern "C" {
void __env_cachesize_proc __P((long, u_int32_t, u_int32_t, u_int32_t, __env_cachesize_reply *));
void __env_close_proc __P((long, u_int32_t, __env_close_reply *));
void __env_create_proc __P((u_int32_t, __env_create_reply *));
-void __env_dbremove_proc __P((long, long, gchar *, gchar *, u_int32_t, __env_dbremove_reply *));
-void __env_dbrename_proc __P((long, long, gchar *, gchar *, gchar *, u_int32_t, __env_dbrename_reply *));
-void __env_encrypt_proc __P((long, gchar *, u_int32_t, __env_encrypt_reply *));
+void __env_dbremove_proc __P((long, long, char *, char *, u_int32_t, __env_dbremove_reply *));
+void __env_dbrename_proc __P((long, long, char *, char *, char *, u_int32_t, __env_dbrename_reply *));
+void __env_encrypt_proc __P((long, char *, u_int32_t, __env_encrypt_reply *));
void __env_flags_proc __P((long, u_int32_t, u_int32_t, __env_flags_reply *));
-void __env_open_proc __P((long, gchar *, u_int32_t, u_int32_t, __env_open_reply *));
-void __env_remove_proc __P((long, gchar *, u_int32_t, __env_remove_reply *));
+void __env_open_proc __P((long, char *, u_int32_t, u_int32_t, __env_open_reply *));
+void __env_remove_proc __P((long, char *, u_int32_t, __env_remove_reply *));
void __txn_abort_proc __P((long, __txn_abort_reply *));
void __txn_begin_proc __P((long, long, u_int32_t, __txn_begin_reply *));
void __txn_commit_proc __P((long, u_int32_t, __txn_commit_reply *));
void __txn_discard_proc __P((long, u_int32_t, __txn_discard_reply *));
void __txn_prepare_proc __P((long, u_int8_t *, __txn_prepare_reply *));
-void __txn_recover_proc __P((long, u_int32_t, u_int32_t, __txn_recover_reply *, gint *));
+void __txn_recover_proc __P((long, u_int32_t, u_int32_t, __txn_recover_reply *, int *));
void __db_bt_maxkey_proc __P((long, u_int32_t, __db_bt_maxkey_reply *));
void __db_associate_proc __P((long, long, long, u_int32_t, __db_associate_reply *));
void __db_bt_minkey_proc __P((long, u_int32_t, __db_bt_minkey_reply *));
void __db_close_proc __P((long, u_int32_t, __db_close_reply *));
void __db_create_proc __P((long, u_int32_t, __db_create_reply *));
-void __db_del_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, __db_del_reply *));
-void __db_encrypt_proc __P((long, gchar *, u_int32_t, __db_encrypt_reply *));
+void __db_del_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_del_reply *));
+void __db_encrypt_proc __P((long, char *, u_int32_t, __db_encrypt_reply *));
void __db_extentsize_proc __P((long, u_int32_t, __db_extentsize_reply *));
void __db_flags_proc __P((long, u_int32_t, __db_flags_reply *));
-void __db_get_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, __db_get_reply *, gint *));
+void __db_get_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_get_reply *, int *));
void __db_h_ffactor_proc __P((long, u_int32_t, __db_h_ffactor_reply *));
void __db_h_nelem_proc __P((long, u_int32_t, __db_h_nelem_reply *));
-void __db_key_range_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, __db_key_range_reply *));
+void __db_key_range_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_key_range_reply *));
void __db_lorder_proc __P((long, u_int32_t, __db_lorder_reply *));
-void __db_open_proc __P((long, long, gchar *, gchar *, u_int32_t, u_int32_t, u_int32_t, __db_open_reply *));
+void __db_open_proc __P((long, long, char *, char *, u_int32_t, u_int32_t, u_int32_t, __db_open_reply *));
void __db_pagesize_proc __P((long, u_int32_t, __db_pagesize_reply *));
-void __db_pget_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, __db_pget_reply *, gint *));
-void __db_put_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, __db_put_reply *, gint *));
+void __db_pget_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_pget_reply *, int *));
+void __db_put_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_put_reply *, int *));
void __db_re_delim_proc __P((long, u_int32_t, __db_re_delim_reply *));
void __db_re_len_proc __P((long, u_int32_t, __db_re_len_reply *));
void __db_re_pad_proc __P((long, u_int32_t, __db_re_pad_reply *));
-void __db_remove_proc __P((long, gchar *, gchar *, u_int32_t, __db_remove_reply *));
-void __db_rename_proc __P((long, gchar *, gchar *, gchar *, u_int32_t, __db_rename_reply *));
-void __db_stat_proc __P((long, u_int32_t, __db_stat_reply *, gint *));
+void __db_remove_proc __P((long, char *, char *, u_int32_t, __db_remove_reply *));
+void __db_rename_proc __P((long, char *, char *, char *, u_int32_t, __db_rename_reply *));
+void __db_stat_proc __P((long, u_int32_t, __db_stat_reply *, int *));
void __db_sync_proc __P((long, u_int32_t, __db_sync_reply *));
void __db_truncate_proc __P((long, long, u_int32_t, __db_truncate_reply *));
void __db_cursor_proc __P((long, long, u_int32_t, __db_cursor_reply *));
@@ -53,22 +53,22 @@ void __dbc_close_proc __P((long, __dbc_close_reply *));
void __dbc_count_proc __P((long, u_int32_t, __dbc_count_reply *));
void __dbc_del_proc __P((long, u_int32_t, __dbc_del_reply *));
void __dbc_dup_proc __P((long, u_int32_t, __dbc_dup_reply *));
-void __dbc_get_proc __P((long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, __dbc_get_reply *, gint *));
-void __dbc_pget_proc __P((long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, __dbc_pget_reply *, gint *));
-void __dbc_put_proc __P((long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, __dbc_put_reply *, gint *));
+void __dbc_get_proc __P((long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __dbc_get_reply *, int *));
+void __dbc_pget_proc __P((long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __dbc_pget_reply *, int *));
+void __dbc_put_proc __P((long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __dbc_put_reply *, int *));
void __dbsrv_settimeout __P((ct_entry *, u_int32_t));
void __dbsrv_timeout __P((int));
void __dbclear_ctp __P((ct_entry *));
void __dbdel_ctp __P((ct_entry *));
-ct_entry *new_ct_ent __P((gint *));
+ct_entry *new_ct_ent __P((int *));
ct_entry *get_tableent __P((long));
-ct_entry *__dbsrv_sharedb __P((ct_entry *, const gchar *, const gchar *, DBTYPE, u_int32_t));
+ct_entry *__dbsrv_sharedb __P((ct_entry *, const char *, const char *, DBTYPE, u_int32_t));
ct_entry *__dbsrv_shareenv __P((ct_entry *, home_entry *, u_int32_t));
void __dbsrv_active __P((ct_entry *));
-gint __db_close_int __P((long, u_int32_t));
-gint __dbc_close_int __P((ct_entry *));
-gint __dbenv_close_int __P((long, u_int32_t, int));
-home_entry *get_home __P((gchar *));
+int __db_close_int __P((long, u_int32_t));
+int __dbc_close_int __P((ct_entry *));
+int __dbenv_close_int __P((long, u_int32_t, int));
+home_entry *get_home __P((char *));
__env_cachesize_reply *__db_env_cachesize_4001 __P((__env_cachesize_msg *, struct svc_req *));
__env_close_reply *__db_env_close_4001 __P((__env_close_msg *, struct svc_req *));
__env_create_reply *__db_env_create_4001 __P((__env_create_msg *, struct svc_req *));
diff --git a/libdb/dbinc_auto/tcl_ext.h b/libdb/dbinc_auto/tcl_ext.h
index 5f17c0c..619ea4a 100644
--- a/libdb/dbinc_auto/tcl_ext.h
+++ b/libdb/dbinc_auto/tcl_ext.h
@@ -6,75 +6,75 @@
extern "C" {
#endif
-gint bdb_HCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
+int bdb_HCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
#if DB_DBM_HSEARCH != 0
-gint bdb_NdbmOpen __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DBM **));
+int bdb_NdbmOpen __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DBM **));
#endif
#if DB_DBM_HSEARCH != 0
-gint bdb_DbmCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*, int, DBM *));
+int bdb_DbmCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*, int, DBM *));
#endif
-gint ndbm_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
+int ndbm_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
void _DbInfoDelete __P((Tcl_Interp *, DBTCL_INFO *));
-gint db_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
-gint dbc_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
-gint env_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
-gint tcl_EnvRemove __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
-gint tcl_EnvVerbose __P((Tcl_Interp *, DB_ENV *, Tcl_Obj *, Tcl_Obj *));
-gint tcl_EnvAttr __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_EnvTest __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-DBTCL_INFO *_NewInfo __P((Tcl_Interp *, gpointer , gchar *, enum INFOTYPE));
-gpointer _NameToPtr __P((CONST gchar *));
-DBTCL_INFO *_PtrToInfo __P((CONST gpointer ));
-DBTCL_INFO *_NameToInfo __P((CONST gchar *));
-void _SetInfoData __P((DBTCL_INFO *, gpointer ));
+int db_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
+int dbc_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
+int env_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
+int tcl_EnvRemove __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
+int tcl_EnvVerbose __P((Tcl_Interp *, DB_ENV *, Tcl_Obj *, Tcl_Obj *));
+int tcl_EnvAttr __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_EnvTest __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+DBTCL_INFO *_NewInfo __P((Tcl_Interp *, void *, char *, enum INFOTYPE));
+void *_NameToPtr __P((CONST char *));
+DBTCL_INFO *_PtrToInfo __P((CONST void *));
+DBTCL_INFO *_NameToInfo __P((CONST char *));
+void _SetInfoData __P((DBTCL_INFO *, void *));
void _DeleteInfo __P((DBTCL_INFO *));
-gint _SetListElem __P((Tcl_Interp *, Tcl_Obj *, gpointer , int, gpointer , int));
-gint _SetListElemInt __P((Tcl_Interp *, Tcl_Obj *, gpointer , int));
-gint _SetListRecnoElem __P((Tcl_Interp *, Tcl_Obj *, db_recno_t, u_char *, int));
-gint _Set3DBTList __P((Tcl_Interp *, Tcl_Obj *, DBT *, int, DBT *, int, DBT *));
-gint _SetMultiList __P((Tcl_Interp *, Tcl_Obj *, DBT *, DBT*, int, int));
-gint _GetGlobPrefix __P((gchar *, gchar **));
-gint _ReturnSetup __P((Tcl_Interp *, int, int, gchar *));
-gint _ErrorSetup __P((Tcl_Interp *, int, gchar *));
-void _ErrorFunc __P((CONST gchar *, gchar *));
-gint _GetLsn __P((Tcl_Interp *, Tcl_Obj *, DB_LSN *));
-gint _GetUInt32 __P((Tcl_Interp *, Tcl_Obj *, u_int32_t *));
-Tcl_Obj *_GetFlagsList __P((Tcl_Interp *, u_int32_t, void (*)(u_int32_t, gpointer , void (*)(u_int32_t, const FN *, gpointer ))));
+int _SetListElem __P((Tcl_Interp *, Tcl_Obj *, void *, int, void *, int));
+int _SetListElemInt __P((Tcl_Interp *, Tcl_Obj *, void *, int));
+int _SetListRecnoElem __P((Tcl_Interp *, Tcl_Obj *, db_recno_t, u_char *, int));
+int _Set3DBTList __P((Tcl_Interp *, Tcl_Obj *, DBT *, int, DBT *, int, DBT *));
+int _SetMultiList __P((Tcl_Interp *, Tcl_Obj *, DBT *, DBT*, int, int));
+int _GetGlobPrefix __P((char *, char **));
+int _ReturnSetup __P((Tcl_Interp *, int, int, char *));
+int _ErrorSetup __P((Tcl_Interp *, int, char *));
+void _ErrorFunc __P((CONST char *, char *));
+int _GetLsn __P((Tcl_Interp *, Tcl_Obj *, DB_LSN *));
+int _GetUInt32 __P((Tcl_Interp *, Tcl_Obj *, u_int32_t *));
+Tcl_Obj *_GetFlagsList __P((Tcl_Interp *, u_int32_t, void (*)(u_int32_t, void *, void (*)(u_int32_t, const FN *, void *))));
void _debug_check __P((void));
-gint _CopyObjBytes __P((Tcl_Interp *, Tcl_Obj *obj, gpointer *, u_int32_t *, gint *));
-gint tcl_LockDetect __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_LockGet __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_LockStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_LockTimeout __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_LockVec __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_LogArchive __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_LogCompare __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
-gint tcl_LogFile __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_LogFlush __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_LogGet __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_LogPut __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_LogStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint logc_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
+int _CopyObjBytes __P((Tcl_Interp *, Tcl_Obj *obj, void **, u_int32_t *, int *));
+int tcl_LockDetect __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_LockGet __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_LockStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_LockTimeout __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_LockVec __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_LogArchive __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_LogCompare __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
+int tcl_LogFile __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_LogFlush __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_LogGet __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_LogPut __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_LogStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int logc_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
void _MpInfoDelete __P((Tcl_Interp *, DBTCL_INFO *));
-gint tcl_MpSync __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_MpTrickle __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_Mp __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
-gint tcl_MpStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_RepElect __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-gint tcl_RepFlush __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-gint tcl_RepLimit __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-gint tcl_RepRequest __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-gint tcl_RepStart __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-gint tcl_RepProcessMessage __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-gint tcl_RepStat __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
+int tcl_MpSync __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_MpTrickle __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_Mp __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
+int tcl_MpStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_RepElect __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
+int tcl_RepFlush __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
+int tcl_RepLimit __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
+int tcl_RepRequest __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
+int tcl_RepStart __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
+int tcl_RepProcessMessage __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
+int tcl_RepStat __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
void _TxnInfoDelete __P((Tcl_Interp *, DBTCL_INFO *));
-gint tcl_TxnCheckpoint __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_Txn __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
-gint tcl_TxnStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_TxnTimeout __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-gint tcl_TxnRecover __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
-gint bdb_RandCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
-gint tcl_Mutex __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
+int tcl_TxnCheckpoint __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_Txn __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
+int tcl_TxnStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_TxnTimeout __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+int tcl_TxnRecover __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
+int bdb_RandCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
+int tcl_Mutex __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/txn_ext.h b/libdb/dbinc_auto/txn_ext.h
index 704d9e4..a53338d 100644
--- a/libdb/dbinc_auto/txn_ext.h
+++ b/libdb/dbinc_auto/txn_ext.h
@@ -6,64 +6,64 @@
extern "C" {
#endif
-gint __txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
-gint __txn_xa_begin __P((DB_ENV *, DB_TXN *));
-gint __txn_compensate_begin __P((DB_ENV *, DB_TXN **txnp));
-gint __txn_commit __P((DB_TXN *, u_int32_t));
-gint __txn_abort __P((DB_TXN *));
-gint __txn_discard __P((DB_TXN *, u_int32_t flags));
-gint __txn_prepare __P((DB_TXN *, u_int8_t *));
+int __txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
+int __txn_xa_begin __P((DB_ENV *, DB_TXN *));
+int __txn_compensate_begin __P((DB_ENV *, DB_TXN **txnp));
+int __txn_commit __P((DB_TXN *, u_int32_t));
+int __txn_abort __P((DB_TXN *));
+int __txn_discard __P((DB_TXN *, u_int32_t flags));
+int __txn_prepare __P((DB_TXN *, u_int8_t *));
u_int32_t __txn_id __P((DB_TXN *));
-gint __txn_checkpoint __P((DB_ENV *, u_int32_t, u_int32_t, u_int32_t));
-gint __txn_getckp __P((DB_ENV *, DB_LSN *));
-gint __txn_activekids __P((DB_ENV *, u_int32_t, DB_TXN *));
-gint __txn_force_abort __P((DB_ENV *, u_int8_t *));
-gint __txn_preclose __P((DB_ENV *));
-gint __txn_reset __P((DB_ENV *));
+int __txn_checkpoint __P((DB_ENV *, u_int32_t, u_int32_t, u_int32_t));
+int __txn_getckp __P((DB_ENV *, DB_LSN *));
+int __txn_activekids __P((DB_ENV *, u_int32_t, DB_TXN *));
+int __txn_force_abort __P((DB_ENV *, u_int8_t *));
+int __txn_preclose __P((DB_ENV *));
+int __txn_reset __P((DB_ENV *));
void __txn_updateckp __P((DB_ENV *, DB_LSN *));
-gint __txn_regop_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, int32_t));
-gint __txn_regop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __txn_regop_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __txn_regop_read __P((DB_ENV *, gpointer , __txn_regop_args **));
-gint __txn_ckp_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, DB_LSN *, int32_t));
-gint __txn_ckp_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __txn_ckp_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __txn_ckp_read __P((DB_ENV *, gpointer , __txn_ckp_args **));
-gint __txn_child_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, DB_LSN *));
-gint __txn_child_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __txn_child_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __txn_child_read __P((DB_ENV *, gpointer , __txn_child_args **));
-gint __txn_xa_regop_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, const DBT *, int32_t, u_int32_t, u_int32_t, DB_LSN *));
-gint __txn_xa_regop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __txn_xa_regop_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __txn_xa_regop_read __P((DB_ENV *, gpointer , __txn_xa_regop_args **));
-gint __txn_recycle_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, u_int32_t));
-gint __txn_recycle_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __txn_recycle_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __txn_recycle_read __P((DB_ENV *, gpointer , __txn_recycle_args **));
-gint __txn_init_print __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __txn_init_getpgnos __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
-gint __txn_init_recover __P((DB_ENV *, gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+int __txn_regop_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, int32_t));
+int __txn_regop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __txn_regop_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __txn_regop_read __P((DB_ENV *, void *, __txn_regop_args **));
+int __txn_ckp_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, DB_LSN *, int32_t));
+int __txn_ckp_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __txn_ckp_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __txn_ckp_read __P((DB_ENV *, void *, __txn_ckp_args **));
+int __txn_child_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, DB_LSN *));
+int __txn_child_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __txn_child_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __txn_child_read __P((DB_ENV *, void *, __txn_child_args **));
+int __txn_xa_regop_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, const DBT *, int32_t, u_int32_t, u_int32_t, DB_LSN *));
+int __txn_xa_regop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __txn_xa_regop_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __txn_xa_regop_read __P((DB_ENV *, void *, __txn_xa_regop_args **));
+int __txn_recycle_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, u_int32_t));
+int __txn_recycle_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __txn_recycle_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __txn_recycle_read __P((DB_ENV *, void *, __txn_recycle_args **));
+int __txn_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __txn_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
+int __txn_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
void __txn_dbenv_create __P((DB_ENV *));
-gint __txn_regop_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __txn_xa_regop_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __txn_ckp_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __txn_child_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint __txn_restore_txn __P((DB_ENV *, DB_LSN *, __txn_xa_regop_args *));
-gint __txn_recycle_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+int __txn_regop_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __txn_xa_regop_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __txn_ckp_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __txn_child_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __txn_restore_txn __P((DB_ENV *, DB_LSN *, __txn_xa_regop_args *));
+int __txn_recycle_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
void __txn_continue __P((DB_ENV *, DB_TXN *, TXN_DETAIL *, size_t));
-gint __txn_map_gid __P((DB_ENV *, u_int8_t *, TXN_DETAIL **, size_t *));
-gint __txn_recover __P((DB_ENV *, DB_PREPLIST *, long, long *, u_int32_t));
-gint __txn_get_prepared __P((DB_ENV *, XID *, DB_PREPLIST *, long, long *, u_int32_t));
-gint __txn_open __P((DB_ENV *));
-gint __txn_dbenv_refresh __P((DB_ENV *));
+int __txn_map_gid __P((DB_ENV *, u_int8_t *, TXN_DETAIL **, size_t *));
+int __txn_recover __P((DB_ENV *, DB_PREPLIST *, long, long *, u_int32_t));
+int __txn_get_prepared __P((DB_ENV *, XID *, DB_PREPLIST *, long, long *, u_int32_t));
+int __txn_open __P((DB_ENV *));
+int __txn_dbenv_refresh __P((DB_ENV *));
void __txn_region_destroy __P((DB_ENV *, REGINFO *));
-gint __txn_id_set __P((DB_ENV *, u_int32_t, u_int32_t));
-gint __txn_stat __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
-gint __txn_remevent __P((DB_ENV *, DB_TXN *, const gchar *, u_int8_t*));
-gint __txn_lockevent __P((DB_ENV *, DB_TXN *, DB *, DB_LOCK *, u_int32_t));
+int __txn_id_set __P((DB_ENV *, u_int32_t, u_int32_t));
+int __txn_stat __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
+int __txn_remevent __P((DB_ENV *, DB_TXN *, const char *, u_int8_t*));
+int __txn_lockevent __P((DB_ENV *, DB_TXN *, DB *, DB_LOCK *, u_int32_t));
void __txn_remlock __P((DB_ENV *, DB_TXN *, DB_LOCK *, u_int32_t));
-gint __txn_doevents __P((DB_ENV *, DB_TXN *, int, int));
+int __txn_doevents __P((DB_ENV *, DB_TXN *, int, int));
#if defined(__cplusplus)
}
diff --git a/libdb/dbinc_auto/xa_ext.h b/libdb/dbinc_auto/xa_ext.h
index 17d59a3..e4fc989 100644
--- a/libdb/dbinc_auto/xa_ext.h
+++ b/libdb/dbinc_auto/xa_ext.h
@@ -6,12 +6,12 @@
extern "C" {
#endif
-gint __db_xa_create __P((DB *));
-gint __db_rmid_to_env __P((gint rmid, DB_ENV **envp));
-gint __db_xid_to_txn __P((DB_ENV *, XID *, size_t *));
-gint __db_map_rmid __P((int, DB_ENV *));
-gint __db_unmap_rmid __P((int));
-gint __db_map_xid __P((DB_ENV *, XID *, size_t));
+int __db_xa_create __P((DB *));
+int __db_rmid_to_env __P((int rmid, DB_ENV **envp));
+int __db_xid_to_txn __P((DB_ENV *, XID *, size_t *));
+int __db_map_rmid __P((int, DB_ENV *));
+int __db_unmap_rmid __P((int));
+int __db_map_xid __P((DB_ENV *, XID *, size_t));
void __db_unmap_xid __P((DB_ENV *, XID *, size_t));
#if defined(__cplusplus)
diff --git a/libdb/dbm/dbm.c b/libdb/dbm/dbm.c
index d891f5d..98ba086 100644
--- a/libdb/dbm/dbm.c
+++ b/libdb/dbm/dbm.c
@@ -43,7 +43,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -70,7 +70,7 @@ static const gchar revid[] = "$Id$";
* EXTERN: datum __db_ndbm_fetch __P((DBM *, datum));
* EXTERN: datum __db_ndbm_firstkey __P((DBM *));
* EXTERN: datum __db_ndbm_nextkey __P((DBM *));
- * EXTERN: DBM *__db_ndbm_open __P((const gchar *, int, int));
+ * EXTERN: DBM *__db_ndbm_open __P((const char *, int, int));
* EXTERN: int __db_ndbm_pagfno __P((DBM *));
* EXTERN: int __db_ndbm_rdonly __P((DBM *));
* EXTERN: int __db_ndbm_store __P((DBM *, datum, datum, int));
@@ -81,7 +81,7 @@ static const gchar revid[] = "$Id$";
* EXTERN: int __db_dbm_dirf __P((void));
* EXTERN: datum __db_dbm_fetch __P((datum));
* EXTERN: datum __db_dbm_firstkey __P((void));
- * EXTERN: int __db_dbm_init __P((gchar *));
+ * EXTERN: int __db_dbm_init __P((char *));
* EXTERN: datum __db_dbm_nextkey __P((datum));
* EXTERN: int __db_dbm_pagf __P((void));
* EXTERN: int __db_dbm_store __P((datum, datum));
@@ -96,9 +96,9 @@ static DBM *__cur_db;
static void __db_no_open __P((void));
-gint
+int
__db_dbm_init(file)
- gchar *file;
+ char *file;
{
if (__cur_db != NULL)
(void)dbm_close(__cur_db);
@@ -110,7 +110,7 @@ __db_dbm_init(file)
return (-1);
}
-gint
+int
__db_dbm_close()
{
if (__cur_db != NULL) {
@@ -166,7 +166,7 @@ __db_dbm_nextkey(key)
return (dbm_nextkey(__cur_db));
}
-gint
+int
__db_dbm_delete(key)
datum key;
{
@@ -177,7 +177,7 @@ __db_dbm_delete(key)
return (dbm_delete(__cur_db, key));
}
-gint
+int
__db_dbm_store(key, dat)
datum key, dat;
{
@@ -206,13 +206,13 @@ __db_no_open()
*/
DBM *
__db_ndbm_open(file, oflags, mode)
- const gchar *file;
- gint oflags, mode;
+ const char *file;
+ int oflags, mode;
{
DB *dbp;
DBC *dbc;
- gint ret;
- gchar path[MAXPATHLEN];
+ int ret;
+ char path[MAXPATHLEN];
/*
* !!!
@@ -286,7 +286,7 @@ __db_ndbm_fetch(dbm, key)
DBC *dbc;
DBT _key, _data;
datum data;
- gint ret;
+ int ret;
dbc = (DBC *)dbm;
@@ -328,7 +328,7 @@ __db_ndbm_firstkey(dbm)
DBC *dbc;
DBT _key, _data;
datum key;
- gint ret;
+ int ret;
dbc = (DBC *)dbm;
@@ -363,7 +363,7 @@ __db_ndbm_nextkey(dbm)
DBC *dbc;
DBT _key, _data;
datum key;
- gint ret;
+ int ret;
dbc = (DBC *)dbm;
@@ -391,14 +391,14 @@ __db_ndbm_nextkey(dbm)
* 0 on success
* <0 failure
*/
-gint
+int
__db_ndbm_delete(dbm, key)
DBM *dbm;
datum key;
{
DBC *dbc;
DBT _key;
- gint ret;
+ int ret;
dbc = (DBC *)dbm;
@@ -424,15 +424,15 @@ __db_ndbm_delete(dbm, key)
* <0 failure
* 1 if DBM_INSERT and entry exists
*/
-gint
+int
__db_ndbm_store(dbm, key, data, flags)
DBM *dbm;
datum key, data;
- gint flags;
+ int flags;
{
DBC *dbc;
DBT _key, _data;
- gint ret;
+ int ret;
dbc = (DBC *)dbm;
@@ -456,7 +456,7 @@ __db_ndbm_store(dbm, key, data, flags)
return (-1);
}
-gint
+int
__db_ndbm_error(dbm)
DBM *dbm;
{
@@ -467,7 +467,7 @@ __db_ndbm_error(dbm)
return (F_ISSET(dbc->dbp, DB_AM_DBM_ERROR));
}
-gint
+int
__db_ndbm_clearerr(dbm)
DBM *dbm;
{
@@ -484,7 +484,7 @@ __db_ndbm_clearerr(dbm)
* 1 if read-only
* 0 if not read-only
*/
-gint
+int
__db_ndbm_rdonly(dbm)
DBM *dbm;
{
@@ -501,19 +501,19 @@ __db_ndbm_rdonly(dbm)
* the same one for both files. Hopefully, the user is using it for locking
* and picked one to use at random.
*/
-gint
+int
__db_ndbm_dirfno(dbm)
DBM *dbm;
{
return (dbm_pagfno(dbm));
}
-gint
+int
__db_ndbm_pagfno(dbm)
DBM *dbm;
{
DBC *dbc;
- gint fd;
+ int fd;
dbc = (DBC *)dbm;
diff --git a/libdb/dbreg/dbreg.c b/libdb/dbreg/dbreg.c
index 5281cdb..4346b61 100644
--- a/libdb/dbreg/dbreg.c
+++ b/libdb/dbreg/dbreg.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -85,20 +85,20 @@ static const gchar revid[] = "$Id$";
* allocate a id for it later. (This happens when the handle is on a
* replication client that later becomes a master.)
*
- * PUBLIC: gint __dbreg_setup __P((DB *, const gchar *, u_int32_t));
+ * PUBLIC: int __dbreg_setup __P((DB *, const char *, u_int32_t));
*/
-gint
+int
__dbreg_setup(dbp, name, create_txnid)
DB *dbp;
- const gchar *name;
+ const char *name;
u_int32_t create_txnid;
{
DB_ENV *dbenv;
DB_LOG *dblp;
FNAME *fnp;
- gint ret;
+ int ret;
size_t len;
- gpointer namep;
+ void *namep;
dbenv = dbp->dbenv;
dblp = dbenv->lg_handle;
@@ -147,9 +147,9 @@ __dbreg_setup(dbp, name, create_txnid)
* __dbreg_teardown --
* Destroy a DB handle's FNAME struct.
*
- * PUBLIC: gint __dbreg_teardown __P((DB *));
+ * PUBLIC: int __dbreg_teardown __P((DB *));
*/
-gint
+int
__dbreg_teardown(dbp)
DB *dbp;
{
@@ -186,9 +186,9 @@ __dbreg_teardown(dbp)
* __dbreg_new_id --
* Assign an unused dbreg id to this database handle.
*
- * PUBLIC: gint __dbreg_new_id __P((DB *, DB_TXN *));
+ * PUBLIC: int __dbreg_new_id __P((DB *, DB_TXN *));
*/
-gint
+int
__dbreg_new_id(dbp, txn)
DB *dbp;
DB_TXN *txn;
@@ -200,7 +200,7 @@ __dbreg_new_id(dbp, txn)
FNAME *fnp;
LOG *lp;
int32_t id;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
dblp = dbenv->lg_handle;
@@ -243,7 +243,7 @@ __dbreg_new_id(dbp, txn)
memset(&r_name, 0, sizeof(r_name));
if (fnp->name_off != INVALID_ROFF) {
r_name.data = R_ADDR(&dblp->reginfo, fnp->name_off);
- r_name.size = (u_int32_t)strlen((gchar *)r_name.data) + 1;
+ r_name.size = (u_int32_t)strlen((char *)r_name.data) + 1;
}
fid_dbt.data = dbp->fileid;
fid_dbt.size = DB_FILE_ID_LEN;
@@ -266,9 +266,9 @@ err: MUTEX_UNLOCK(dbenv, &lp->fq_mutex);
* __dbreg_assign_id --
* Assign a particular dbreg id to this database handle.
*
- * PUBLIC: gint __dbreg_assign_id __P((DB *, int32_t));
+ * PUBLIC: int __dbreg_assign_id __P((DB *, int32_t));
*/
-gint
+int
__dbreg_assign_id(dbp, id)
DB *dbp;
int32_t id;
@@ -278,7 +278,7 @@ __dbreg_assign_id(dbp, id)
DB_LOG *dblp;
FNAME *close_fnp, *fnp;
LOG *lp;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
dblp = dbenv->lg_handle;
@@ -352,19 +352,19 @@ err: MUTEX_UNLOCK(dbenv, &lp->fq_mutex);
* Take a log id away from a dbp, in preparation for closing it,
* but without logging the close.
*
- * PUBLIC: gint __dbreg_revoke_id __P((DB *, int));
+ * PUBLIC: int __dbreg_revoke_id __P((DB *, int));
*/
-gint
+int
__dbreg_revoke_id(dbp, have_lock)
DB *dbp;
- gint have_lock;
+ int have_lock;
{
DB_ENV *dbenv;
DB_LOG *dblp;
FNAME *fnp;
LOG *lp;
int32_t id;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
dblp = dbenv->lg_handle;
@@ -400,9 +400,9 @@ __dbreg_revoke_id(dbp, have_lock)
* Take a dbreg id away from a dbp that we're closing, and log
* the unregistry.
*
- * PUBLIC: gint __dbreg_close_id __P((DB *, DB_TXN *));
+ * PUBLIC: int __dbreg_close_id __P((DB *, DB_TXN *));
*/
-gint
+int
__dbreg_close_id(dbp, txn)
DB *dbp;
DB_TXN *txn;
@@ -413,7 +413,7 @@ __dbreg_close_id(dbp, txn)
DB_LSN r_unused;
FNAME *fnp;
LOG *lp;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
dblp = dbenv->lg_handle;
@@ -432,7 +432,7 @@ __dbreg_close_id(dbp, txn)
memset(&r_name, 0, sizeof(r_name));
r_name.data = R_ADDR(&dblp->reginfo, fnp->name_off);
r_name.size =
- (u_int32_t)strlen((gchar *)r_name.data) + 1;
+ (u_int32_t)strlen((char *)r_name.data) + 1;
dbtp = &r_name;
}
memset(&fid_dbt, 0, sizeof(fid_dbt));
diff --git a/libdb/dbreg/dbreg_auto.c b/libdb/dbreg/dbreg_auto.c
index 3577610..91eace3 100644
--- a/libdb/dbreg/dbreg_auto.c
+++ b/libdb/dbreg/dbreg_auto.c
@@ -18,11 +18,11 @@
#include "dbinc/txn.h"
/*
- * PUBLIC: gint __dbreg_register_log __P((DB_ENV *, DB_TXN *,
+ * PUBLIC: int __dbreg_register_log __P((DB_ENV *, DB_TXN *,
* PUBLIC: DB_LSN *, u_int32_t, u_int32_t, const DBT *, const DBT *,
* PUBLIC: int32_t, DBTYPE, db_pgno_t, u_int32_t));
*/
-gint
+int
__dbreg_register_log(dbenv, txnid, ret_lsnp, flags,
opcode, name, uid, fileid, ftype, meta_pgno,
id)
@@ -43,7 +43,7 @@ __dbreg_register_log(dbenv, txnid, ret_lsnp, flags,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
rectype = DB___dbreg_register;
@@ -151,19 +151,19 @@ __dbreg_register_log(dbenv, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __dbreg_register_getpgnos __P((DB_ENV *, DBT *,
- * PUBLIC: DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __dbreg_register_getpgnos __P((DB_ENV *, DBT *,
+ * PUBLIC: DB_LSN *, db_recops, void *));
*/
-gint
+int
__dbreg_register_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -184,21 +184,21 @@ __dbreg_register_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __dbreg_register_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __dbreg_register_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__dbreg_register_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__dbreg_register_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -236,19 +236,19 @@ __dbreg_register_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __dbreg_register_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int __dbreg_register_read __P((DB_ENV *, void *,
* PUBLIC: __dbreg_register_args **));
*/
-gint
+int
__dbreg_register_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__dbreg_register_args **argpp;
{
__dbreg_register_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__dbreg_register_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -303,16 +303,16 @@ __dbreg_register_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __dbreg_init_print __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __dbreg_init_print __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__dbreg_init_print(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__dbreg_register_print, DB___dbreg_register)) != 0)
@@ -321,17 +321,17 @@ __dbreg_init_print(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __dbreg_init_getpgnos __P((DB_ENV *,
- * PUBLIC: gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ),
+ * PUBLIC: int __dbreg_init_getpgnos __P((DB_ENV *,
+ * PUBLIC: int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *),
* PUBLIC: size_t *));
*/
-gint
+int
__dbreg_init_getpgnos(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__dbreg_register_getpgnos, DB___dbreg_register)) != 0)
@@ -340,16 +340,16 @@ __dbreg_init_getpgnos(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __dbreg_init_recover __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __dbreg_init_recover __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__dbreg_init_recover(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__dbreg_register_recover, DB___dbreg_register)) != 0)
diff --git a/libdb/dbreg/dbreg_rec.c b/libdb/dbreg/dbreg_rec.c
index 968ae11..5f19a9e 100644
--- a/libdb/dbreg/dbreg_rec.c
+++ b/libdb/dbreg/dbreg_rec.c
@@ -36,7 +36,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -51,26 +51,26 @@ static const gchar revid[] = "$Id$";
#include "dbinc/log.h"
#include "dbinc/txn.h"
-static gint __dbreg_open_file __P((DB_ENV *,
- DB_TXN *, __dbreg_register_args *, gpointer ));
+static int __dbreg_open_file __P((DB_ENV *,
+ DB_TXN *, __dbreg_register_args *, void *));
/*
- * PUBLIC: gint __dbreg_register_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __dbreg_register_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__dbreg_register_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
DB_ENTRY *dbe;
DB_LOG *dblp;
DB *dbp;
__dbreg_register_args *argp;
- gint do_close, do_open, do_rem, ret, t_ret;
+ int do_close, do_open, do_rem, ret, t_ret;
dblp = dbenv->lg_handle;
dbp = NULL;
@@ -274,7 +274,7 @@ __dbreg_open_file(dbenv, txn, argp, info)
DB_ENV *dbenv;
DB_TXN *txn;
__dbreg_register_args *argp;
- gpointer info;
+ void *info;
{
DB_ENTRY *dbe;
DB_LOG *lp;
diff --git a/libdb/dbreg/dbreg_util.c b/libdb/dbreg/dbreg_util.c
index 904cc4b..810c3dd 100644
--- a/libdb/dbreg/dbreg_util.c
+++ b/libdb/dbreg/dbreg_util.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -22,15 +22,15 @@ static const gchar revid[] = "$Id$";
#include "dbinc/log.h"
#include "dbinc/txn.h"
-static gint __dbreg_check_master __P((DB_ENV *, u_int8_t *, gchar *));
+static int __dbreg_check_master __P((DB_ENV *, u_int8_t *, char *));
/*
* __dbreg_add_dbentry --
* Adds a DB entry to the dbreg DB entry table.
*
- * PUBLIC: gint __dbreg_add_dbentry __P((DB_ENV *, DB_LOG *, DB *, int32_t));
+ * PUBLIC: int __dbreg_add_dbentry __P((DB_ENV *, DB_LOG *, DB *, int32_t));
*/
-gint
+int
__dbreg_add_dbentry(dbenv, dblp, dbp, ndx)
DB_ENV *dbenv;
DB_LOG *dblp;
@@ -38,7 +38,7 @@ __dbreg_add_dbentry(dbenv, dblp, dbp, ndx)
int32_t ndx;
{
int32_t i;
- gint ret;
+ int ret;
ret = 0;
@@ -92,9 +92,9 @@ __dbreg_rem_dbentry(dblp, ndx)
* __dbreg_open_files --
* Put a LOG_CHECKPOINT log record for each open database.
*
- * PUBLIC: gint __dbreg_open_files __P((DB_ENV *));
+ * PUBLIC: int __dbreg_open_files __P((DB_ENV *));
*/
-gint
+int
__dbreg_open_files(dbenv)
DB_ENV *dbenv;
{
@@ -103,7 +103,7 @@ __dbreg_open_files(dbenv)
DBT *dbtp, fid_dbt, t;
FNAME *fnp;
LOG *lp;
- gint ret;
+ int ret;
dblp = dbenv->lg_handle;
lp = dblp->reginfo.primary;
@@ -155,15 +155,15 @@ __dbreg_open_files(dbenv)
* db_rename. We may not have flushed the log_register record that
* closes the file.
*
- * PUBLIC: gint __dbreg_close_files __P((DB_ENV *));
+ * PUBLIC: int __dbreg_close_files __P((DB_ENV *));
*/
-gint
+int
__dbreg_close_files(dbenv)
DB_ENV *dbenv;
{
DB_LOG *dblp;
DB *dbp;
- gint ret, t_ret;
+ int ret, t_ret;
int32_t i;
/* If we haven't initialized logging, we have nothing to do. */
@@ -206,15 +206,15 @@ __dbreg_close_files(dbenv)
* Check that there are no open files in the process local table.
* Returns 0 if there are no files and EINVAL if there are any.
*
- * PUBLIC: gint __dbreg_nofiles __P((DB_ENV *));
+ * PUBLIC: int __dbreg_nofiles __P((DB_ENV *));
*/
-gint
+int
__dbreg_nofiles(dbenv)
DB_ENV *dbenv;
{
DB *dbp;
DB_LOG *dblp;
- gint ret;
+ int ret;
int32_t i;
/* If we haven't initialized logging, we have nothing to do. */
@@ -239,15 +239,15 @@ __dbreg_nofiles(dbenv)
* __dbreg_id_to_db --
* Return the DB corresponding to the specified dbreg id.
*
- * PUBLIC: gint __dbreg_id_to_db __P((DB_ENV *, DB_TXN *, DB **, int32_t, int));
+ * PUBLIC: int __dbreg_id_to_db __P((DB_ENV *, DB_TXN *, DB **, int32_t, int));
*/
-gint
+int
__dbreg_id_to_db(dbenv, txn, dbpp, ndx, inc)
DB_ENV *dbenv;
DB_TXN *txn;
DB **dbpp;
int32_t ndx;
- gint inc;
+ int inc;
{
return (__dbreg_id_to_db_int(dbenv, txn, dbpp, ndx, inc, 1));
}
@@ -262,21 +262,21 @@ __dbreg_id_to_db(dbenv, txn, dbpp, ndx, inc)
* some processes may not have the files open (e.g., XA), then we also get
* called from __dbreg_assign_id and it's OK if there is no mapping.
*
- * PUBLIC: gint __dbreg_id_to_db_int __P((DB_ENV *,
+ * PUBLIC: int __dbreg_id_to_db_int __P((DB_ENV *,
* PUBLIC: DB_TXN *, DB **, int32_t, int, int));
*/
-gint
+int
__dbreg_id_to_db_int(dbenv, txn, dbpp, ndx, inc, tryopen)
DB_ENV *dbenv;
DB_TXN *txn;
DB **dbpp;
int32_t ndx;
- gint inc, tryopen;
+ int inc, tryopen;
{
DB_LOG *dblp;
FNAME *fname;
- gint ret;
- gchar *name;
+ int ret;
+ char *name;
ret = 0;
dblp = dbenv->lg_handle;
@@ -362,19 +362,19 @@ err: MUTEX_THREAD_UNLOCK(dbenv, dblp->mutexp);
* Traverse the shared-memory region looking for the entry that
* matches the passed dbreg id. Returns 0 on success; -1 on error.
*
- * PUBLIC: gint __dbreg_id_to_fname __P((DB_LOG *, int32_t, int, FNAME **));
+ * PUBLIC: int __dbreg_id_to_fname __P((DB_LOG *, int32_t, int, FNAME **));
*/
-gint
+int
__dbreg_id_to_fname(dblp, lid, have_lock, fnamep)
DB_LOG *dblp;
int32_t lid;
- gint have_lock;
+ int have_lock;
FNAME **fnamep;
{
DB_ENV *dbenv;
FNAME *fnp;
LOG *lp;
- gint ret;
+ int ret;
dbenv = dblp->dbenv;
lp = dblp->reginfo.primary;
@@ -401,19 +401,19 @@ __dbreg_id_to_fname(dblp, lid, have_lock, fnamep)
* Traverse the shared-memory region looking for the entry that
* matches the passed file unique id. Returns 0 on success; -1 on error.
*
- * PUBLIC: gint __dbreg_fid_to_fname __P((DB_LOG *, u_int8_t *, int, FNAME **));
+ * PUBLIC: int __dbreg_fid_to_fname __P((DB_LOG *, u_int8_t *, int, FNAME **));
*/
-gint
+int
__dbreg_fid_to_fname(dblp, fid, have_lock, fnamep)
DB_LOG *dblp;
u_int8_t *fid;
- gint have_lock;
+ int have_lock;
FNAME **fnamep;
{
DB_ENV *dbenv;
FNAME *fnp;
LOG *lp;
- gint ret;
+ int ret;
dbenv = dblp->dbenv;
lp = dblp->reginfo.primary;
@@ -443,13 +443,13 @@ __dbreg_fid_to_fname(dblp, fid, have_lock, fnamep)
* and the name passed could be transient unless there is something
* ensuring that the file cannot be closed.
*
- * PUBLIC: gint __dbreg_get_name __P((DB_ENV *, u_int8_t *, gchar **));
+ * PUBLIC: int __dbreg_get_name __P((DB_ENV *, u_int8_t *, char **));
*/
-gint
+int
__dbreg_get_name(dbenv, fid, namep)
DB_ENV *dbenv;
u_int8_t *fid;
- gchar **namep;
+ char **namep;
{
DB_LOG *dblp;
FNAME *fname;
@@ -468,25 +468,25 @@ __dbreg_get_name(dbenv, fid, namep)
* __dbreg_do_open --
* Open files referenced in the log. This is the part of the open that
* is not protected by the thread mutex.
- * PUBLIC: gint __dbreg_do_open __P((DB_ENV *, DB_TXN *, DB_LOG *, u_int8_t *,
- * PUBLIC: gchar *, DBTYPE, int32_t, db_pgno_t, gpointer , u_int32_t));
+ * PUBLIC: int __dbreg_do_open __P((DB_ENV *, DB_TXN *, DB_LOG *, u_int8_t *,
+ * PUBLIC: char *, DBTYPE, int32_t, db_pgno_t, void *, u_int32_t));
*/
-gint
+int
__dbreg_do_open(dbenv,
txn, lp, uid, name, ftype, ndx, meta_pgno, info, id)
DB_ENV *dbenv;
DB_TXN *txn;
DB_LOG *lp;
u_int8_t *uid;
- gchar *name;
+ char *name;
DBTYPE ftype;
int32_t ndx;
db_pgno_t meta_pgno;
- gpointer info;
+ void *info;
u_int32_t id;
{
DB *dbp;
- gint ret;
+ int ret;
u_int32_t cstat;
if ((ret = db_create(&dbp, lp->dbenv, 0)) != 0)
@@ -565,10 +565,10 @@ static int
__dbreg_check_master(dbenv, uid, name)
DB_ENV *dbenv;
u_int8_t *uid;
- gchar *name;
+ char *name;
{
DB *dbp;
- gint ret;
+ int ret;
ret = 0;
if ((ret = db_create(&dbp, dbenv, 0)) != 0)
@@ -597,15 +597,15 @@ __dbreg_check_master(dbenv, uid, name)
* at this point we have no way of knowing whether the log record that incited
* us to call this will be part of a committed transaction.
*
- * PUBLIC: gint __dbreg_lazy_id __P((DB *));
+ * PUBLIC: int __dbreg_lazy_id __P((DB *));
*/
-gint
+int
__dbreg_lazy_id(dbp)
DB *dbp;
{
DB_ENV *dbenv;
DB_TXN *txn;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
@@ -632,10 +632,10 @@ __dbreg_lazy_id(dbp)
* The stack is protected by the fq_mutex, and in both functions we assume
* that this is already locked.
*
- * PUBLIC: gint __dbreg_push_id __P((DB_ENV *, int32_t));
- * PUBLIC: gint __dbreg_pop_id __P((DB_ENV *, int32_t *));
+ * PUBLIC: int __dbreg_push_id __P((DB_ENV *, int32_t));
+ * PUBLIC: int __dbreg_pop_id __P((DB_ENV *, int32_t *));
*/
-gint
+int
__dbreg_push_id(dbenv, id)
DB_ENV *dbenv;
int32_t id;
@@ -643,7 +643,7 @@ __dbreg_push_id(dbenv, id)
DB_LOG *dblp;
LOG *lp;
int32_t *stack, *newstack;
- gint ret;
+ int ret;
dblp = dbenv->lg_handle;
lp = dblp->reginfo.primary;
@@ -680,7 +680,7 @@ __dbreg_push_id(dbenv, id)
return (0);
}
-gint
+int
__dbreg_pop_id(dbenv, id)
DB_ENV *dbenv;
int32_t *id;
@@ -711,9 +711,9 @@ __dbreg_pop_id(dbenv, id)
* Returns success whether or not the particular id was found, and like
* push and pop, assumes that the fq_mutex is locked.
*
- * PUBLIC: gint __dbreg_pluck_id __P((DB_ENV *, int32_t));
+ * PUBLIC: int __dbreg_pluck_id __P((DB_ENV *, int32_t));
*/
-gint
+int
__dbreg_pluck_id(dbenv, id)
DB_ENV *dbenv;
int32_t id;
@@ -721,7 +721,7 @@ __dbreg_pluck_id(dbenv, id)
DB_LOG *dblp;
LOG *lp;
int32_t *stack;
- gint i;
+ int i;
dblp = dbenv->lg_handle;
lp = dblp->reginfo.primary;
@@ -760,8 +760,8 @@ __dbreg_print_dblist(dbenv)
DB_LOG *dblp;
FNAME *fnp;
LOG *lp;
- gint del, first;
- gchar *name;
+ int del, first;
+ char *name;
dblp = dbenv->lg_handle;
lp = dblp->reginfo.primary;
diff --git a/libdb/env/db_salloc.c b/libdb/env/db_salloc.c
index 91712da..32499d7 100644
--- a/libdb/env/db_salloc.c
+++ b/libdb/env/db_salloc.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -40,11 +40,11 @@ struct __data {
* __db_shalloc_init --
* Initialize the area as one large chunk.
*
- * PUBLIC: void __db_shalloc_init __P((gpointer , size_t));
+ * PUBLIC: void __db_shalloc_init __P((void *, size_t));
*/
void
__db_shalloc_init(area, size)
- gpointer area;
+ void *area;
size_t size;
{
struct __data *elp;
@@ -62,9 +62,9 @@ __db_shalloc_init(area, size)
* __db_shalloc_size --
* Return the space needed for an allocation, including alignment.
*
- * PUBLIC: gint __db_shalloc_size __P((size_t, size_t));
+ * PUBLIC: int __db_shalloc_size __P((size_t, size_t));
*/
-gint
+int
__db_shalloc_size(len, align)
size_t len, align;
{
@@ -88,16 +88,16 @@ __db_shalloc_size(len, align)
* __db_shalloc --
* Allocate some space from the shared region.
*
- * PUBLIC: gint __db_shalloc __P((gpointer , size_t, size_t, gpointer ));
+ * PUBLIC: int __db_shalloc __P((void *, size_t, size_t, void *));
*/
-gint
+int
__db_shalloc(p, len, align, retp)
- gpointer p, *retp;
+ void *p, *retp;
size_t len, align;
{
struct __data *elp;
size_t *sp;
- gpointer rp;
+ void *rp;
/* Never allocate less than the size of a struct __data. */
if (len < sizeof(struct __data))
@@ -134,7 +134,7 @@ __db_shalloc(p, len, align, retp)
if ((u_int8_t *)rp < (u_int8_t *)&elp->links)
continue;
- *(gpointer *)retp = rp;
+ *(void **)retp = rp;
#ifdef DIAGNOSTIC
/*
* At this point, whether or not we still need to split up a
@@ -182,16 +182,16 @@ __db_shalloc(p, len, align, retp)
* __db_shalloc_free --
* Free a shared memory allocation.
*
- * PUBLIC: void __db_shalloc_free __P((gpointer , gpointer ));
+ * PUBLIC: void __db_shalloc_free __P((void *, void *));
*/
void
__db_shalloc_free(regionp, ptr)
- gpointer regionp, *ptr;
+ void *regionp, *ptr;
{
struct __data *elp, *lastp, *newp;
struct __head *hp;
size_t free_size, *sp;
- gint merged;
+ int merged;
/*
* Step back over flagged length fields to find the beginning of
@@ -237,7 +237,7 @@ __db_shalloc_free(regionp, ptr)
*/
hp = (struct __head *)regionp;
for (elp = SH_LIST_FIRST(hp, __data), lastp = NULL;
- elp != NULL && (gpointer)elp < (gpointer)ptr;
+ elp != NULL && (void *)elp < (void *)ptr;
lastp = elp, elp = SH_LIST_NEXT(elp, links, __data))
;
@@ -292,11 +292,11 @@ __db_shalloc_free(regionp, ptr)
* the size of the memory being used, but also the extra alignment bytes
* in front and, #ifdef DIAGNOSTIC, the guard byte at the end.
*
- * PUBLIC: size_t __db_shsizeof __P((gpointer));
+ * PUBLIC: size_t __db_shsizeof __P((void *));
*/
size_t
__db_shsizeof(ptr)
- gpointer ptr;
+ void *ptr;
{
struct __data *elp;
size_t *sp;
@@ -315,11 +315,11 @@ __db_shsizeof(ptr)
/*
* __db_shalloc_dump --
*
- * PUBLIC: void __db_shalloc_dump __P((gpointer , FILE *));
+ * PUBLIC: void __db_shalloc_dump __P((void *, FILE *));
*/
void
__db_shalloc_dump(addr, fp)
- gpointer addr;
+ void *addr;
FILE *fp;
{
struct __data *elp;
diff --git a/libdb/env/db_shash.c b/libdb/env/db_shash.c
index 3330eb8..93f2b23 100644
--- a/libdb/env/db_shash.c
+++ b/libdb/env/db_shash.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -75,13 +75,13 @@ static const struct {
* __db_tablesize --
* Choose a size for the hash table.
*
- * PUBLIC: gint __db_tablesize __P((u_int32_t));
+ * PUBLIC: int __db_tablesize __P((u_int32_t));
*/
-gint
+int
__db_tablesize(n_buckets)
u_int32_t n_buckets;
{
- gint i;
+ int i;
/*
* We try to be clever about how big we make the hash tables. Use a
@@ -108,11 +108,11 @@ __db_tablesize(n_buckets)
* __db_hashinit --
* Initialize a hash table that resides in shared memory.
*
- * PUBLIC: void __db_hashinit __P((gpointer , u_int32_t));
+ * PUBLIC: void __db_hashinit __P((void *, u_int32_t));
*/
void
__db_hashinit(begin, nelements)
- gpointer begin;
+ void *begin;
u_int32_t nelements;
{
u_int32_t i;
diff --git a/libdb/env/env_file.c b/libdb/env/env_file.c
index 3c3528f..bc5a080 100644
--- a/libdb/env/env_file.c
+++ b/libdb/env/env_file.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -19,28 +19,28 @@ static const gchar revid[] = "$Id$";
#include "db_int.h"
-static gint __db_overwrite_pass __P((DB_ENV *,
- const gchar *, DB_FH *, u_int32_t, u_int32_t, u_int32_t));
+static int __db_overwrite_pass __P((DB_ENV *,
+ const char *, DB_FH *, u_int32_t, u_int32_t, u_int32_t));
/*
* __db_fileinit --
* Initialize a regular file, optionally zero-filling it as well.
*
- * PUBLIC: gint __db_fileinit __P((DB_ENV *, DB_FH *, size_t, int));
+ * PUBLIC: int __db_fileinit __P((DB_ENV *, DB_FH *, size_t, int));
*/
-gint
+int
__db_fileinit(dbenv, fhp, size, zerofill)
DB_ENV *dbenv;
DB_FH *fhp;
size_t size;
- gint zerofill;
+ int zerofill;
{
db_pgno_t pages;
size_t i;
size_t nw;
u_int32_t relative;
- gint ret;
- gchar buf[OS_VMPAGESIZE];
+ int ret;
+ char buf[OS_VMPAGESIZE];
/* Write nuls to the new bytes. */
memset(buf, 0, sizeof(buf));
@@ -91,16 +91,16 @@ __db_fileinit(dbenv, fhp, size, zerofill)
* __db_overwrite --
* Overwrite a file.
*
- * PUBLIC: gint __db_overwrite __P((DB_ENV *, const gchar *));
+ * PUBLIC: int __db_overwrite __P((DB_ENV *, const char *));
*/
-gint
+int
__db_overwrite(dbenv, path)
DB_ENV *dbenv;
- const gchar *path;
+ const char *path;
{
DB_FH fh, *fhp;
u_int32_t mbytes, bytes;
- gint ret;
+ int ret;
fhp = &fh;
if ((ret = __os_open(dbenv, path, DB_OSO_REGION, 0, fhp)) == 0 &&
@@ -135,13 +135,13 @@ err: if (F_ISSET(fhp, DB_FH_VALID))
static int
__db_overwrite_pass(dbenv, path, fhp, mbytes, bytes, pattern)
DB_ENV *dbenv;
- const gchar *path;
+ const char *path;
DB_FH *fhp;
u_int32_t mbytes, bytes, pattern;
{
size_t len, nw;
- gint i, ret;
- gchar buf[8 * 1024];
+ int i, ret;
+ char buf[8 * 1024];
if ((ret = __os_seek(dbenv, fhp, 0, 0, 0, 0, DB_OS_SEEK_SET)) != 0)
goto err;
diff --git a/libdb/env/env_method.c b/libdb/env/env_method.c
index 9b4ae8b..d98748a 100644
--- a/libdb/env/env_method.c
+++ b/libdb/env/env_method.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -45,41 +45,41 @@ static const gchar revid[] = "$Id$";
#include "dbinc_auto/rpc_client_ext.h"
#endif
-static void __dbenv_err __P((const DB_ENV *, int, const gchar *, ...));
-static void __dbenv_errx __P((const DB_ENV *, const gchar *, ...));
-static gint __dbenv_init __P((DB_ENV *));
-static gint __dbenv_set_alloc __P((DB_ENV *, gpointer (*)(size_t),
- gpointer (*)(gpointer , size_t), void (*)(gpointer)));
-static gint __dbenv_set_app_dispatch __P((DB_ENV *,
- gint (*)(DB_ENV *, DBT *, DB_LSN *, db_recops)));
-static gint __dbenv_set_data_dir __P((DB_ENV *, const gchar *));
-static gint __dbenv_set_encrypt __P((DB_ENV *, const gchar *, u_int32_t));
-static void __dbenv_set_errcall __P((DB_ENV *, void (*)(const gchar *, gchar *)));
+static void __dbenv_err __P((const DB_ENV *, int, const char *, ...));
+static void __dbenv_errx __P((const DB_ENV *, const char *, ...));
+static int __dbenv_init __P((DB_ENV *));
+static int __dbenv_set_alloc __P((DB_ENV *, void *(*)(size_t),
+ void *(*)(void *, size_t), void (*)(void *)));
+static int __dbenv_set_app_dispatch __P((DB_ENV *,
+ int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops)));
+static int __dbenv_set_data_dir __P((DB_ENV *, const char *));
+static int __dbenv_set_encrypt __P((DB_ENV *, const char *, u_int32_t));
+static void __dbenv_set_errcall __P((DB_ENV *, void (*)(const char *, char *)));
static void __dbenv_set_errfile __P((DB_ENV *, FILE *));
-static void __dbenv_set_errpfx __P((DB_ENV *, const gchar *));
-static gint __dbenv_set_feedback __P((DB_ENV *, void (*)(DB_ENV *, int, int)));
-static gint __dbenv_set_flags __P((DB_ENV *, u_int32_t, int));
-static gint __dbenv_set_paniccall __P((DB_ENV *, void (*)(DB_ENV *, int)));
-static gint __dbenv_set_rpc_server_noclnt
- __P((DB_ENV *, gpointer , const gchar *, long, long, u_int32_t));
-static gint __dbenv_set_shm_key __P((DB_ENV *, long));
-static gint __dbenv_set_tas_spins __P((DB_ENV *, u_int32_t));
-static gint __dbenv_set_tmp_dir __P((DB_ENV *, const gchar *));
-static gint __dbenv_set_verbose __P((DB_ENV *, u_int32_t, int));
+static void __dbenv_set_errpfx __P((DB_ENV *, const char *));
+static int __dbenv_set_feedback __P((DB_ENV *, void (*)(DB_ENV *, int, int)));
+static int __dbenv_set_flags __P((DB_ENV *, u_int32_t, int));
+static int __dbenv_set_paniccall __P((DB_ENV *, void (*)(DB_ENV *, int)));
+static int __dbenv_set_rpc_server_noclnt
+ __P((DB_ENV *, void *, const char *, long, long, u_int32_t));
+static int __dbenv_set_shm_key __P((DB_ENV *, long));
+static int __dbenv_set_tas_spins __P((DB_ENV *, u_int32_t));
+static int __dbenv_set_tmp_dir __P((DB_ENV *, const char *));
+static int __dbenv_set_verbose __P((DB_ENV *, u_int32_t, int));
/*
* db_env_create --
* DB_ENV constructor.
*
- * EXTERN: gint db_env_create __P((DB_ENV **, u_int32_t));
+ * EXTERN: int db_env_create __P((DB_ENV **, u_int32_t));
*/
-gint
+int
db_env_create(dbenvpp, flags)
DB_ENV **dbenvpp;
u_int32_t flags;
{
DB_ENV *dbenv;
- gint ret;
+ int ret;
/*
* !!!
@@ -194,12 +194,12 @@ __dbenv_init(dbenv)
*/
static void
#ifdef __STDC__
-__dbenv_err(const DB_ENV *dbenv, gint error, const gchar *fmt, ...)
+__dbenv_err(const DB_ENV *dbenv, int error, const char *fmt, ...)
#else
__dbenv_err(dbenv, error, fmt, va_alist)
const DB_ENV *dbenv;
- gint error;
- const gchar *fmt;
+ int error;
+ const char *fmt;
va_dcl
#endif
{
@@ -212,11 +212,11 @@ __dbenv_err(dbenv, error, fmt, va_alist)
*/
static void
#ifdef __STDC__
-__dbenv_errx(const DB_ENV *dbenv, const gchar *fmt, ...)
+__dbenv_errx(const DB_ENV *dbenv, const char *fmt, ...)
#else
__dbenv_errx(dbenv, fmt, va_alist)
const DB_ENV *dbenv;
- const gchar *fmt;
+ const char *fmt;
va_dcl
#endif
{
@@ -226,9 +226,9 @@ __dbenv_errx(dbenv, fmt, va_alist)
static int
__dbenv_set_alloc(dbenv, mal_func, real_func, free_func)
DB_ENV *dbenv;
- gpointer (*mal_func) __P((size_t));
- gpointer (*real_func) __P((gpointer , size_t));
- void (*free_func) __P((gpointer));
+ void *(*mal_func) __P((size_t));
+ void *(*real_func) __P((void *, size_t));
+ void (*free_func) __P((void *));
{
ENV_ILLEGAL_AFTER_OPEN(dbenv, "set_alloc");
@@ -245,7 +245,7 @@ __dbenv_set_alloc(dbenv, mal_func, real_func, free_func)
static int
__dbenv_set_app_dispatch(dbenv, app_dispatch)
DB_ENV *dbenv;
- gint (*app_dispatch) __P((DB_ENV *, DBT *, DB_LSN *, db_recops));
+ int (*app_dispatch) __P((DB_ENV *, DBT *, DB_LSN *, db_recops));
{
ENV_ILLEGAL_AFTER_OPEN(dbenv, "set_app_dispatch");
@@ -256,12 +256,12 @@ __dbenv_set_app_dispatch(dbenv, app_dispatch)
static int
__dbenv_set_encrypt(dbenv, passwd, flags)
DB_ENV *dbenv;
- const gchar *passwd;
+ const char *passwd;
u_int32_t flags;
{
#ifdef HAVE_CRYPTO
DB_CIPHER *db_cipher;
- gint ret;
+ int ret;
ENV_ILLEGAL_AFTER_OPEN(dbenv, "set_encrypt");
#define OK_CRYPTO_FLAGS (DB_ENCRYPT_AES)
@@ -329,7 +329,7 @@ static int
__dbenv_set_flags(dbenv, flags, onoff)
DB_ENV *dbenv;
u_int32_t flags;
- gint onoff;
+ int onoff;
{
#define OK_FLAGS \
(DB_AUTO_COMMIT | DB_CDB_ALLDB | DB_DIRECT_DB | DB_DIRECT_LOG | \
@@ -427,20 +427,20 @@ __dbenv_set_flags(dbenv, flags, onoff)
static int
__dbenv_set_data_dir(dbenv, dir)
DB_ENV *dbenv;
- const gchar *dir;
+ const char *dir;
{
- gint ret;
+ int ret;
#define DATA_INIT_CNT 20 /* Start with 20 data slots. */
if (dbenv->db_data_dir == NULL) {
if ((ret = __os_calloc(dbenv, DATA_INIT_CNT,
- sizeof(gchar **), &dbenv->db_data_dir)) != 0)
+ sizeof(char **), &dbenv->db_data_dir)) != 0)
return (ret);
dbenv->data_cnt = DATA_INIT_CNT;
} else if (dbenv->data_next == dbenv->data_cnt - 1) {
dbenv->data_cnt *= 2;
if ((ret = __os_realloc(dbenv,
- dbenv->data_cnt * sizeof(gchar **),
+ dbenv->data_cnt * sizeof(char **),
&dbenv->db_data_dir)) != 0)
return (ret);
}
@@ -451,7 +451,7 @@ __dbenv_set_data_dir(dbenv, dir)
static void
__dbenv_set_errcall(dbenv, errcall)
DB_ENV *dbenv;
- void (*errcall) __P((const gchar *, gchar *));
+ void (*errcall) __P((const char *, char *));
{
dbenv->db_errcall = errcall;
}
@@ -467,7 +467,7 @@ __dbenv_set_errfile(dbenv, errfile)
static void
__dbenv_set_errpfx(dbenv, errpfx)
DB_ENV *dbenv;
- const gchar *errpfx;
+ const char *errpfx;
{
dbenv->db_errpfx = errpfx;
}
@@ -513,7 +513,7 @@ __dbenv_set_tas_spins(dbenv, tas_spins)
static int
__dbenv_set_tmp_dir(dbenv, dir)
DB_ENV *dbenv;
- const gchar *dir;
+ const char *dir;
{
if (dbenv->db_tmp_dir != NULL)
__os_free(dbenv, dbenv->db_tmp_dir);
@@ -524,7 +524,7 @@ static int
__dbenv_set_verbose(dbenv, which, onoff)
DB_ENV *dbenv;
u_int32_t which;
- gint onoff;
+ int onoff;
{
switch (which) {
case DB_VERB_CHKPOINT:
@@ -547,12 +547,12 @@ __dbenv_set_verbose(dbenv, which, onoff)
* __db_mi_env --
* Method illegally called with public environment.
*
- * PUBLIC: gint __db_mi_env __P((DB_ENV *, const gchar *));
+ * PUBLIC: int __db_mi_env __P((DB_ENV *, const char *));
*/
-gint
+int
__db_mi_env(dbenv, name)
DB_ENV *dbenv;
- const gchar *name;
+ const char *name;
{
__db_err(dbenv, "%s: method not permitted in shared environment", name);
return (EINVAL);
@@ -562,13 +562,13 @@ __db_mi_env(dbenv, name)
* __db_mi_open --
* Method illegally called after open.
*
- * PUBLIC: gint __db_mi_open __P((DB_ENV *, const gchar *, int));
+ * PUBLIC: int __db_mi_open __P((DB_ENV *, const char *, int));
*/
-gint
+int
__db_mi_open(dbenv, name, after)
DB_ENV *dbenv;
- const gchar *name;
- gint after;
+ const char *name;
+ int after;
{
__db_err(dbenv, "%s: method not permitted %s open",
name, after ? "after" : "before");
@@ -579,15 +579,15 @@ __db_mi_open(dbenv, name, after)
* __db_env_config --
* Method or function called without required configuration.
*
- * PUBLIC: gint __db_env_config __P((DB_ENV *, gchar *, u_int32_t));
+ * PUBLIC: int __db_env_config __P((DB_ENV *, char *, u_int32_t));
*/
-gint
+int
__db_env_config(dbenv, i, flags)
DB_ENV *dbenv;
- gchar *i;
+ char *i;
u_int32_t flags;
{
- gchar *sub;
+ char *sub;
switch (flags) {
case DB_INIT_LOCK:
@@ -615,8 +615,8 @@ __db_env_config(dbenv, i, flags)
static int
__dbenv_set_rpc_server_noclnt(dbenv, cl, host, tsec, ssec, flags)
DB_ENV *dbenv;
- gpointer cl;
- const gchar *host;
+ void *cl;
+ const char *host;
long tsec, ssec;
u_int32_t flags;
{
diff --git a/libdb/env/env_open.c b/libdb/env/env_open.c
index b28f998..a1c4bbb 100644
--- a/libdb/env/env_open.c
+++ b/libdb/env/env_open.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -38,21 +38,21 @@ static const gchar revid[] = "$Id$";
#define strcasecmp _stricmp
#endif
-static gint __db_parse __P((DB_ENV *, gchar *));
-static gint __db_tmp_open __P((DB_ENV *, u_int32_t, gchar *, DB_FH *));
-static gint __dbenv_config __P((DB_ENV *, const gchar *, u_int32_t));
-static gint __dbenv_iremove __P((DB_ENV *, const gchar *, u_int32_t));
-static gint __dbenv_refresh __P((DB_ENV *, u_int32_t));
+static int __db_parse __P((DB_ENV *, char *));
+static int __db_tmp_open __P((DB_ENV *, u_int32_t, char *, DB_FH *));
+static int __dbenv_config __P((DB_ENV *, const char *, u_int32_t));
+static int __dbenv_iremove __P((DB_ENV *, const char *, u_int32_t));
+static int __dbenv_refresh __P((DB_ENV *, u_int32_t));
/*
* db_version --
* Return version information.
*
- * EXTERN: gchar *db_version __P((gint *, gint *, gint *));
+ * EXTERN: char *db_version __P((int *, int *, int *));
*/
-gchar *
+char *
db_version(majverp, minverp, patchp)
- gint *majverp, *minverp, *patchp;
+ int *majverp, *minverp, *patchp;
{
if (majverp != NULL)
*majverp = DB_VERSION_MAJOR;
@@ -60,24 +60,24 @@ db_version(majverp, minverp, patchp)
*minverp = DB_VERSION_MINOR;
if (patchp != NULL)
*patchp = DB_VERSION_PATCH;
- return ((gchar *)DB_VERSION_STRING);
+ return ((char *)DB_VERSION_STRING);
}
/*
* __dbenv_open --
* Initialize an environment.
*
- * PUBLIC: gint __dbenv_open __P((DB_ENV *, const gchar *, u_int32_t, int));
+ * PUBLIC: int __dbenv_open __P((DB_ENV *, const char *, u_int32_t, int));
*/
-gint
+int
__dbenv_open(dbenv, db_home, flags, mode)
DB_ENV *dbenv;
- const gchar *db_home;
+ const char *db_home;
u_int32_t flags;
- gint mode;
+ int mode;
{
DB_MPOOL *dbmp;
- gint ret;
+ int ret;
u_int32_t init_flags, orig_flags;
orig_flags = dbenv->flags;
@@ -358,15 +358,15 @@ err: /* If we fail after creating the regions, remove them. */
* __dbenv_remove --
* Discard an environment.
*
- * PUBLIC: gint __dbenv_remove __P((DB_ENV *, const gchar *, u_int32_t));
+ * PUBLIC: int __dbenv_remove __P((DB_ENV *, const char *, u_int32_t));
*/
-gint
+int
__dbenv_remove(dbenv, db_home, flags)
DB_ENV *dbenv;
- const gchar *db_home;
+ const char *db_home;
u_int32_t flags;
{
- gint ret, t_ret;
+ int ret, t_ret;
ret = __dbenv_iremove(dbenv, db_home, flags);
@@ -383,10 +383,10 @@ __dbenv_remove(dbenv, db_home, flags)
static int
__dbenv_iremove(dbenv, db_home, flags)
DB_ENV *dbenv;
- const gchar *db_home;
+ const char *db_home;
u_int32_t flags;
{
- gint ret;
+ int ret;
#undef OKFLAGS
#define OKFLAGS \
@@ -413,12 +413,12 @@ __dbenv_iremove(dbenv, db_home, flags)
static int
__dbenv_config(dbenv, db_home, flags)
DB_ENV *dbenv;
- const gchar *db_home;
+ const char *db_home;
u_int32_t flags;
{
FILE *fp;
- gint ret;
- gchar *p, buf[256];
+ int ret;
+ char *p, buf[256];
/*
* Set the database home. Do this before calling __db_appname,
@@ -482,15 +482,15 @@ __dbenv_config(dbenv, db_home, flags)
* __dbenv_close --
* DB_ENV destructor.
*
- * PUBLIC: gint __dbenv_close __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __dbenv_close __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__dbenv_close(dbenv, flags)
DB_ENV *dbenv;
u_int32_t flags;
{
- gchar **p;
- gint ret, t_ret;
+ char **p;
+ int ret, t_ret;
COMPQUIET(flags, 0);
@@ -524,7 +524,7 @@ __dbenv_close(dbenv, flags)
ret = t_ret;
/* Do per-subsystem destruction. */
- __lock_dbenv_close(dbenv); /* gpointer /
+ __lock_dbenv_close(dbenv); /* void */
if ((t_ret = __rep_dbenv_close(dbenv)) != 0 && ret == 0)
ret = t_ret;
@@ -564,7 +564,7 @@ __dbenv_refresh(dbenv, orig_flags)
u_int32_t orig_flags;
{
DB_MPOOL *dbmp;
- gint ret, t_ret;
+ int ret, t_ret;
ret = 0;
@@ -690,22 +690,22 @@ __dbenv_refresh(dbenv, orig_flags)
* of call, build a path based on the DB_ENV->open rules, and return
* it in allocated space.
*
- * PUBLIC: gint __db_appname __P((DB_ENV *, APPNAME,
- * PUBLIC: const gchar *, u_int32_t, DB_FH *, gchar **));
+ * PUBLIC: int __db_appname __P((DB_ENV *, APPNAME,
+ * PUBLIC: const char *, u_int32_t, DB_FH *, char **));
*/
-gint
+int
__db_appname(dbenv, appname, file, tmp_oflags, fhp, namep)
DB_ENV *dbenv;
APPNAME appname;
- const gchar *file;
+ const char *file;
u_int32_t tmp_oflags;
DB_FH *fhp;
- gchar **namep;
+ char **namep;
{
size_t len, str_len;
- gint data_entry, ret, slash, tmp_create;
- const gchar *a, *b;
- gchar *p, *str;
+ int data_entry, ret, slash, tmp_create;
+ const char *a, *b;
+ char *p, *str;
a = b = NULL;
data_entry = -1;
@@ -812,15 +812,15 @@ retry: /*
* __db_home --
* Find the database home.
*
- * PUBLIC: gint __db_home __P((DB_ENV *, const gchar *, u_int32_t));
+ * PUBLIC: int __db_home __P((DB_ENV *, const char *, u_int32_t));
*/
-gint
+int
__db_home(dbenv, db_home, flags)
DB_ENV *dbenv;
- const gchar *db_home;
+ const char *db_home;
u_int32_t flags;
{
- const gchar *p;
+ const char *p;
/*
* Use db_home by default, this allows utilities to reasonably
@@ -853,18 +853,18 @@ __db_home(dbenv, db_home, flags)
static int
__db_parse(dbenv, s)
DB_ENV *dbenv;
- gchar *s;
+ char *s;
{
u_long __max, __v, v1, v2, v3;
u_int32_t flags;
- gchar *name, *p, *value, v4;
+ char *name, *p, *value, v4;
/*
* !!!
* The value of 40 is hard-coded into format arguments to sscanf
* below, it can't be changed here without changing it there, too.
*/
- gchar arg[40];
+ char arg[40];
/*
* Name/value pairs are parsed as two white-space separated strings.
@@ -1106,13 +1106,13 @@ static int
__db_tmp_open(dbenv, tmp_oflags, path, fhp)
DB_ENV *dbenv;
u_int32_t tmp_oflags;
- gchar *path;
+ char *path;
DB_FH *fhp;
{
u_int32_t id;
- gint mode, isdir, ret;
- const gchar *p;
- gchar *trv;
+ int mode, isdir, ret;
+ const char *p;
+ char *trv;
/*
* Check the target directory; if you have six X's and it doesn't
diff --git a/libdb/env/env_recover.c b/libdb/env/env_recover.c
index 1bf6327..afe7353 100644
--- a/libdb/env/env_recover.c
+++ b/libdb/env/env_recover.c
@@ -8,9 +8,9 @@
#include "db_config.h"
#ifndef lint
-static const gchar copyright[] =
+static const char copyright[] =
"Copyright (c) 1996-2002\nSleepycat Software Inc. All rights reserved.\n";
-static const gchar revid[] =
+static const char revid[] =
"$Id$";
#endif
@@ -40,8 +40,8 @@ static const gchar revid[] =
#include "dbinc/txn.h"
#include "dbinc/db_am.h"
-static gint __log_backup __P((DB_ENV *, DB_LOGC *, DB_LSN *, DB_LSN *));
-static gint __log_earliest __P((DB_ENV *, DB_LOGC *, int32_t *, DB_LSN *));
+static int __log_backup __P((DB_ENV *, DB_LOGC *, DB_LSN *, DB_LSN *));
+static int __log_earliest __P((DB_ENV *, DB_LOGC *, int32_t *, DB_LSN *));
static double __lsn_diff __P((DB_LSN *, DB_LSN *, DB_LSN *, u_int32_t, int));
/*
@@ -51,9 +51,9 @@ static double __lsn_diff __P((DB_LSN *, DB_LSN *, DB_LSN *, u_int32_t, int));
* LSN of max_lsn, so we need to roll back sufficiently far for that
* to work. See __log_backup for details.
*
- * PUBLIC: gint __db_apprec __P((DB_ENV *, DB_LSN *, u_int32_t));
+ * PUBLIC: int __db_apprec __P((DB_ENV *, DB_LSN *, u_int32_t));
*/
-gint
+int
__db_apprec(dbenv, max_lsn, flags)
DB_ENV *dbenv;
DB_LSN *max_lsn;
@@ -67,12 +67,12 @@ __db_apprec(dbenv, max_lsn, flags)
time_t now, tlow;
int32_t log_size, low;
double nfiles;
- gint have_rec, is_thread, progress, ret, t_ret;
- gint (**dtab) __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int have_rec, is_thread, progress, ret, t_ret;
+ int (**dtab) __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t dtabsize;
u_int32_t hi_txn, lockid, txnid;
- gchar *p, *pass, t1[60], t2[60];
- gpointer txninfo;
+ char *p, *pass, t1[60], t2[60];
+ void *txninfo;
COMPQUIET(nfiles, (double)0);
@@ -593,7 +593,7 @@ static double
__lsn_diff(low, high, current, max, is_forward)
DB_LSN *low, *high, *current;
u_int32_t max;
- gint is_forward;
+ int is_forward;
{
double nf;
@@ -645,7 +645,7 @@ __log_backup(dbenv, logc, max_lsn, start_lsn)
DB_LSN lsn;
DBT data;
__txn_ckp_args *ckp_args;
- gint ret;
+ int ret;
memset(&data, 0, sizeof(data));
ckp_args = NULL;
@@ -695,7 +695,7 @@ __log_earliest(dbenv, logc, lowtime, lowlsn)
DBT data;
__txn_ckp_args *ckpargs;
u_int32_t rectype;
- gint cmp, ret;
+ int cmp, ret;
memset(&data, 0, sizeof(data));
/*
@@ -735,23 +735,23 @@ __log_earliest(dbenv, logc, lowtime, lowlsn)
* If we are not doing feedback processing (i.e., we are doing txn_recover
* processing and in_recovery is zero), then last_lsn can be NULL.
*
- * PUBLIC: gint __env_openfiles __P((DB_ENV *, DB_LOGC *,
- * PUBLIC: gpointer , DBT *, DB_LSN *, DB_LSN *, double, int));
+ * PUBLIC: int __env_openfiles __P((DB_ENV *, DB_LOGC *,
+ * PUBLIC: void *, DBT *, DB_LSN *, DB_LSN *, double, int));
*/
-gint
+int
__env_openfiles(dbenv, logc, txninfo,
data, open_lsn, last_lsn, nfiles, in_recovery)
DB_ENV *dbenv;
DB_LOGC *logc;
- gpointer txninfo;
+ void *txninfo;
DBT *data;
DB_LSN *open_lsn, *last_lsn;
- gint in_recovery;
+ int in_recovery;
double nfiles;
{
DB_LSN lsn;
u_int32_t log_size;
- gint progress, ret;
+ int progress, ret;
/*
* XXX
diff --git a/libdb/env/env_region.c b/libdb/env/env_region.c
index ce1a95b..e641e25 100644
--- a/libdb/env/env_region.c
+++ b/libdb/env/env_region.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -27,19 +27,19 @@ static const gchar revid[] = "$Id$";
#include "dbinc/rep.h"
#include "dbinc/txn.h"
-static gint __db_des_destroy __P((DB_ENV *, REGION *));
-static gint __db_des_get __P((DB_ENV *, REGINFO *, REGINFO *, REGION **));
-static gint __db_e_remfile __P((DB_ENV *));
-static gint __db_faultmem __P((DB_ENV *, gpointer , size_t, int));
+static int __db_des_destroy __P((DB_ENV *, REGION *));
+static int __db_des_get __P((DB_ENV *, REGINFO *, REGINFO *, REGION **));
+static int __db_e_remfile __P((DB_ENV *));
+static int __db_faultmem __P((DB_ENV *, void *, size_t, int));
static void __db_region_destroy __P((DB_ENV *, REGINFO *));
/*
* __db_e_attach
* Join/create the environment
*
- * PUBLIC: gint __db_e_attach __P((DB_ENV *, u_int32_t *));
+ * PUBLIC: int __db_e_attach __P((DB_ENV *, u_int32_t *));
*/
-gint
+int
__db_e_attach(dbenv, init_flagsp)
DB_ENV *dbenv;
u_int32_t *init_flagsp;
@@ -51,8 +51,8 @@ __db_e_attach(dbenv, init_flagsp)
size_t size;
size_t nrw;
u_int32_t mbytes, bytes;
- gint retry_cnt, ret, segid;
- gchar buf[sizeof(DB_REGION_FMT) + 20];
+ int retry_cnt, ret, segid;
+ char buf[sizeof(DB_REGION_FMT) + 20];
#if !defined(HAVE_MUTEX_THREADS)
/*
@@ -540,12 +540,12 @@ retry: /* Close any open file handle. */
* __db_e_detach --
* Detach from the environment.
*
- * PUBLIC: gint __db_e_detach __P((DB_ENV *, int));
+ * PUBLIC: int __db_e_detach __P((DB_ENV *, int));
*/
-gint
+int
__db_e_detach(dbenv, destroy)
DB_ENV *dbenv;
- gint destroy;
+ int destroy;
{
REGENV *renv;
REGINFO *infop;
@@ -613,9 +613,9 @@ __db_e_detach(dbenv, destroy)
* __db_e_remove --
* Discard an environment if it's not in use.
*
- * PUBLIC: gint __db_e_remove __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __db_e_remove __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__db_e_remove(dbenv, flags)
DB_ENV *dbenv;
u_int32_t flags;
@@ -624,7 +624,7 @@ __db_e_remove(dbenv, flags)
REGINFO *infop, reginfo;
REGION *rp;
u_int32_t db_env_reset;
- gint force, ret;
+ int force, ret;
force = LF_ISSET(DB_FORCE) ? 1 : 0;
/*
@@ -761,17 +761,17 @@ static int
__db_e_remfile(dbenv)
DB_ENV *dbenv;
{
- static gchar *old_region_names[] = {
+ static char *old_region_names[] = {
"__db_lock.share",
"__db_log.share",
"__db_mpool.share",
"__db_txn.share",
NULL
};
- gint cnt, fcnt, lastrm, ret;
+ int cnt, fcnt, lastrm, ret;
u_int8_t saved_byte;
- const gchar *dir;
- gchar *p, **names, *path, buf[sizeof(DB_REGION_FMT) + 20];
+ const char *dir;
+ char *p, **names, *path, buf[sizeof(DB_REGION_FMT) + 20];
/* Get the full path of a file in the environment. */
(void)snprintf(buf, sizeof(buf), "%s", DB_REGION_ENV);
@@ -844,7 +844,7 @@ __db_e_remfile(dbenv)
* Backward compatibility -- remove region files from releases
* before 2.8.XX.
*/
- for (names = (gchar **)old_region_names; *names != NULL; ++names)
+ for (names = (char **)old_region_names; *names != NULL; ++names)
if (__db_appname(dbenv,
DB_APP_NONE, *names, 0, NULL, &path) == 0) {
(void)__os_unlink(dbenv, path);
@@ -858,21 +858,21 @@ __db_e_remfile(dbenv)
* __db_e_stat
* Statistics for the environment.
*
- * PUBLIC: gint __db_e_stat __P((DB_ENV *,
- * PUBLIC: REGENV *, REGION *, gint *, u_int32_t));
+ * PUBLIC: int __db_e_stat __P((DB_ENV *,
+ * PUBLIC: REGENV *, REGION *, int *, u_int32_t));
*/
-gint
+int
__db_e_stat(dbenv, arg_renv, arg_regions, arg_regions_cnt, flags)
DB_ENV *dbenv;
REGENV *arg_renv;
REGION *arg_regions;
- gint *arg_regions_cnt;
+ int *arg_regions_cnt;
u_int32_t flags;
{
REGENV *renv;
REGINFO *infop;
REGION *rp;
- gint n, ret;
+ int n, ret;
infop = dbenv->reginfo;
renv = infop->primary;
@@ -913,9 +913,9 @@ __db_e_stat(dbenv, arg_renv, arg_regions, arg_regions_cnt, flags)
* __db_r_attach
* Join/create a region.
*
- * PUBLIC: gint __db_r_attach __P((DB_ENV *, REGINFO *, size_t));
+ * PUBLIC: int __db_r_attach __P((DB_ENV *, REGINFO *, size_t));
*/
-gint
+int
__db_r_attach(dbenv, infop, size)
DB_ENV *dbenv;
REGINFO *infop;
@@ -923,8 +923,8 @@ __db_r_attach(dbenv, infop, size)
{
REGENV *renv;
REGION *rp;
- gint ret;
- gchar buf[sizeof(DB_REGION_FMT) + 20];
+ int ret;
+ char buf[sizeof(DB_REGION_FMT) + 20];
renv = ((REGINFO *)dbenv->reginfo)->primary;
@@ -1012,17 +1012,17 @@ err: if (infop->addr != NULL)
* __db_r_detach --
* Detach from a region.
*
- * PUBLIC: gint __db_r_detach __P((DB_ENV *, REGINFO *, int));
+ * PUBLIC: int __db_r_detach __P((DB_ENV *, REGINFO *, int));
*/
-gint
+int
__db_r_detach(dbenv, infop, destroy)
DB_ENV *dbenv;
REGINFO *infop;
- gint destroy;
+ int destroy;
{
REGENV *renv;
REGION *rp;
- gint ret, t_ret;
+ int ret, t_ret;
renv = ((REGINFO *)dbenv->reginfo)->primary;
rp = infop->rp;
@@ -1077,7 +1077,7 @@ __db_des_get(dbenv, env_infop, infop, rpp)
REGENV *renv;
REGION *rp, *first_type;
u_int32_t maxid;
- gint ret;
+ int ret;
/*
* !!!
@@ -1189,11 +1189,11 @@ __db_des_destroy(dbenv, rp)
static int
__db_faultmem(dbenv, addr, size, created)
DB_ENV *dbenv;
- gpointer addr;
+ void *addr;
size_t size;
- gint created;
+ int created;
{
- gint ret;
+ int ret;
u_int8_t *p, *t;
/*
diff --git a/libdb/examples_c/bench_001.c b/libdb/examples_c/bench_001.c
index 530a83f..7ef4442 100644
--- a/libdb/examples_c/bench_001.c
+++ b/libdb/examples_c/bench_001.c
@@ -39,7 +39,7 @@
#define DATABASE "bench_001.db"
-int main(int, gchar *[]);
+int main(int, char *[]);
void usage(void);
const char
@@ -50,11 +50,11 @@ const char
*/
DB_ENV *
db_init(home, prefix, cachesize, txn)
- gchar *home, *prefix;
- gint cachesize, txn;
+ char *home, *prefix;
+ int cachesize, txn;
{
DB_ENV *dbenv;
- gint flags, ret;
+ int flags, ret;
if ((ret = db_env_create(&dbenv, 0)) != 0) {
dbenv->err(dbenv, ret, "db_env_create");
@@ -80,17 +80,17 @@ db_init(home, prefix, cachesize, txn)
* get -- loop getting batches of records.
*
*/
-gint
+int
get(dbp, txn, datalen, num, dups, iter, countp)
DB *dbp;
- gint txn, datalen, num, dups, iter, *countp;
+ int txn, datalen, num, dups, iter, *countp;
{
DBC *dbcp;
DBT key, data;
DB_TXN *txnp;
u_int32_t len, klen;
- gint count, flags, i, j, ret;
- gpointer pointer, *dp, *kp;
+ int count, flags, i, j, ret;
+ void *pointer, *dp, *kp;
memset(&key, 0, sizeof(key));
key.data = &j;
@@ -149,19 +149,19 @@ get(dbp, txn, datalen, num, dups, iter, countp)
* 10 to a transaction.
*/
#define PUTS_PER_TXN 10
-gint
+int
fill(dbenv, dbp, txn, datalen, num, dups)
DB_ENV *dbenv;
DB *dbp;
- gint txn, datalen, num, dups;
+ int txn, datalen, num, dups;
{
DBT key, data;
DB_TXN *txnp;
struct data {
- gint id;
- gchar str[1];
+ int id;
+ char str[1];
} *data_val;
- gint count, i, ret;
+ int count, i, ret;
/*
* Insert records into the database, where the key is the user
* input and the data is the user input in reverse order.
@@ -215,20 +215,20 @@ err: if (txnp != NULL)
return (ret);
}
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
+ extern char *optarg;
+ extern int optind;
DB *dbp;
DB_ENV *dbenv;
DB_TXN *txnp;
struct timeval start_time, end_time;
double secs;
- gint cache, ch, count, datalen, dups, env, init, iter, num, pagesize;
- gint ret, rflag, txn;
+ int cache, ch, count, datalen, dups, env, init, iter, num, pagesize;
+ int ret, rflag, txn;
txnp = NULL;
datalen = 20;
diff --git a/libdb/examples_c/ex_access.c b/libdb/examples_c/ex_access.c
index 83ff550..c993145 100644
--- a/libdb/examples_c/ex_access.c
+++ b/libdb/examples_c/ex_access.c
@@ -14,7 +14,7 @@
#include <string.h>
#ifdef _WIN32
-extern gint getopt(int, gchar * const *, const gchar *);
+extern int getopt(int, char * const *, const char *);
#else
#include <unistd.h>
#endif
@@ -22,22 +22,22 @@ extern gint getopt(int, gchar * const *, const gchar *);
#include <db.h>
#define DATABASE "access.db"
-gint main __P((int, gchar *[]));
-gint usage __P((void));
+int main __P((int, char *[]));
+int usage __P((void));
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gint optind;
+ extern int optind;
DB *dbp;
DBC *dbcp;
DBT key, data;
u_int32_t len;
- gint ch, ret, rflag;
- gchar *database, *p, *t, buf[1024], rbuf[1024];
- const gchar *progname = "ex_access"; /* Program name. */
+ int ch, ret, rflag;
+ char *database, *p, *t, buf[1024], rbuf[1024];
+ const char *progname = "ex_access"; /* Program name. */
rflag = 0;
while ((ch = getopt(argc, argv, "r")) != EOF)
@@ -130,8 +130,8 @@ main(argc, argv)
/* Walk through the database and print out the key/data pairs. */
while ((ret = dbcp->c_get(dbcp, &key, &data, DB_NEXT)) == 0)
printf("%.*s : %.*s\n",
- (int)key.size, (gchar *)key.data,
- (int)data.size, (gchar *)data.data);
+ (int)key.size, (char *)key.data,
+ (int)data.size, (char *)data.data);
if (ret != DB_NOTFOUND) {
dbp->err(dbp, ret, "DBcursor->get");
goto err2;
@@ -154,7 +154,7 @@ err1: (void)dbp->close(dbp, 0);
return (EXIT_FAILURE);
}
-gint
+int
usage()
{
(void)fprintf(stderr, "usage: ex_access [-r] [database]\n");
diff --git a/libdb/examples_c/ex_apprec/ex_apprec.c b/libdb/examples_c/ex_apprec/ex_apprec.c
index fbef1ad..52dca61 100644
--- a/libdb/examples_c/ex_apprec/ex_apprec.c
+++ b/libdb/examples_c/ex_apprec/ex_apprec.c
@@ -22,25 +22,25 @@
#include "ex_apprec.h"
int apprec_dispatch __P((DB_ENV *, DBT *, DB_LSN *, db_recops));
-int open_env __P((const gchar *, FILE *, const gchar *, DB_ENV **));
-int verify_absence __P((DB_ENV *, const gchar *));
-int verify_presence __P((DB_ENV *, const gchar *));
+int open_env __P((const char *, FILE *, const char *, DB_ENV **));
+int verify_absence __P((DB_ENV *, const char *));
+int verify_presence __P((DB_ENV *, const char *));
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
+ extern char *optarg;
+ extern int optind;
DB_ENV *dbenv;
DB_LSN lsn;
DB_TXN *txn;
DBT dirnamedbt;
- gint ret;
- const gchar *home;
- gchar ch, dirname[256];
- const gchar *progname = "ex_apprec"; /* Program name. */
+ int ret;
+ const char *home;
+ char ch, dirname[256];
+ const char *progname = "ex_apprec"; /* Program name. */
/* Default home. */
home = "TESTDIR";
@@ -167,14 +167,14 @@ main(argc, argv)
return (EXIT_SUCCESS);
}
-gint
+int
open_env(home, errfp, progname, dbenvp)
- const gchar *home, *progname;
+ const char *home, *progname;
FILE *errfp;
DB_ENV **dbenvp;
{
DB_ENV *dbenv;
- gint ret;
+ int ret;
/*
* Create an environment object and initialize it for error
@@ -213,7 +213,7 @@ open_env(home, errfp, progname, dbenvp)
* Sample application dispatch function to handle user-specified log record
* types.
*/
-gint
+int
apprec_dispatch(dbenv, dbt, lsn, op)
DB_ENV *dbenv;
DBT *dbt;
@@ -238,10 +238,10 @@ apprec_dispatch(dbenv, dbt, lsn, op)
}
}
-gint
+int
verify_absence(dbenv, dirname)
DB_ENV *dbenv;
- const gchar *dirname;
+ const char *dirname;
{
if (access(dirname, F_OK) == 0) {
@@ -252,10 +252,10 @@ verify_absence(dbenv, dirname)
return (0);
}
-gint
+int
verify_presence(dbenv, dirname)
DB_ENV *dbenv;
- const gchar *dirname;
+ const char *dirname;
{
if (access(dirname, F_OK) != 0) {
diff --git a/libdb/examples_c/ex_apprec/ex_apprec.h b/libdb/examples_c/ex_apprec/ex_apprec.h
index 1cd5fd0..852107a 100644
--- a/libdb/examples_c/ex_apprec/ex_apprec.h
+++ b/libdb/examples_c/ex_apprec/ex_apprec.h
@@ -12,13 +12,13 @@
#include "ex_apprec_auto.h"
-gint ex_apprec_mkdir_log
+int ex_apprec_mkdir_log
__P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *));
-gint ex_apprec_mkdir_print
- __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
-gint ex_apprec_mkdir_read
- __P((DB_ENV *, gpointer , ex_apprec_mkdir_args **));
-gint ex_apprec_mkdir_recover
- __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+int ex_apprec_mkdir_print
+ __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int ex_apprec_mkdir_read
+ __P((DB_ENV *, void *, ex_apprec_mkdir_args **));
+int ex_apprec_mkdir_recover
+ __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
#endif /* !_EX_APPREC_H_ */
diff --git a/libdb/examples_c/ex_apprec/ex_apprec_auto.c b/libdb/examples_c/ex_apprec/ex_apprec_auto.c
index 5c4884e..d8c27e7 100644
--- a/libdb/examples_c/ex_apprec/ex_apprec_auto.c
+++ b/libdb/examples_c/ex_apprec/ex_apprec_auto.c
@@ -8,10 +8,10 @@
#include "ex_apprec.h"
/*
- * PUBLIC: gint ex_apprec_mkdir_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int ex_apprec_mkdir_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, const DBT *));
*/
-gint
+int
ex_apprec_mkdir_log(dbenv, txnid, ret_lsnp, flags,
dirname)
DB_ENV *dbenv;
@@ -24,7 +24,7 @@ ex_apprec_mkdir_log(dbenv, txnid, ret_lsnp, flags,
DB_LSN *lsnp, null_lsn;
u_int32_t zero;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
rectype = DB_ex_apprec_mkdir;
@@ -84,21 +84,21 @@ ex_apprec_mkdir_log(dbenv, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint ex_apprec_mkdir_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int ex_apprec_mkdir_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
ex_apprec_mkdir_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
ex_apprec_mkdir_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -125,13 +125,13 @@ ex_apprec_mkdir_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint ex_apprec_mkdir_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int ex_apprec_mkdir_read __P((DB_ENV *, void *,
* PUBLIC: ex_apprec_mkdir_args **));
*/
-gint
+int
ex_apprec_mkdir_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
ex_apprec_mkdir_args **argpp;
{
ex_apprec_mkdir_args *argp;
@@ -165,20 +165,20 @@ ex_apprec_mkdir_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint ex_apprec_init_print __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int ex_apprec_init_print __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
ex_apprec_init_print(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint __db_add_recovery __P((DB_ENV *,
- gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ),
+ int __db_add_recovery __P((DB_ENV *,
+ int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *),
size_t *,
- gint (*)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ), u_int32_t));
- gint ret;
+ int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), u_int32_t));
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
ex_apprec_mkdir_print, DB_ex_apprec_mkdir)) != 0)
diff --git a/libdb/examples_c/ex_apprec/ex_apprec_rec.c b/libdb/examples_c/ex_apprec/ex_apprec_rec.c
index 70bb8cf..983ecbe 100644
--- a/libdb/examples_c/ex_apprec/ex_apprec_rec.c
+++ b/libdb/examples_c/ex_apprec/ex_apprec_rec.c
@@ -28,19 +28,19 @@
* ex_apprec_mkdir_recover --
* Recovery function for mkdir.
*
- * PUBLIC: gint ex_apprec_mkdir_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int ex_apprec_mkdir_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
ex_apprec_mkdir_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
ex_apprec_mkdir_args *argp;
- gint ret;
+ int ret;
argp = NULL;
@@ -62,7 +62,7 @@ ex_apprec_mkdir_recover(dbenv, dbtp, lsnp, op, info)
* exists. We log the trailing zero in pathnames, so we can
* simply pass the data part of the DBT into rmdir as a string.
* (Note that we don't have any alignment guarantees, but for
- * a gchar * this doesn't matter.)
+ * a char * this doesn't matter.)
*
* Ignore all errors other than ENOENT; DB may attempt to undo
* or redo operations without knowing whether they have already
diff --git a/libdb/examples_c/ex_btrec.c b/libdb/examples_c/ex_btrec.c
index a125220..c003aa3 100644
--- a/libdb/examples_c/ex_btrec.c
+++ b/libdb/examples_c/ex_btrec.c
@@ -20,15 +20,15 @@
int main __P((void));
int ex_btrec __P((void));
-void show __P((const gchar *, DBT *, DBT *));
+void show __P((const char *, DBT *, DBT *));
-gint
+int
main()
{
return (ex_btrec() == 1 ? EXIT_FAILURE : EXIT_SUCCESS);
}
-gint
+int
ex_btrec()
{
DB *dbp;
@@ -38,9 +38,9 @@ ex_btrec()
FILE *fp;
db_recno_t recno;
u_int32_t len;
- gint cnt, ret;
- gchar *p, *t, buf[1024], rbuf[1024];
- const gchar *progname = "ex_btrec"; /* Program name. */
+ int cnt, ret;
+ char *p, *t, buf[1024], rbuf[1024];
+ const char *progname = "ex_btrec"; /* Program name. */
/* Open the word database. */
if ((fp = fopen(WORDLIST, "r")) == NULL) {
@@ -194,10 +194,10 @@ err1: (void)dbp->close(dbp, 0);
*/
void
show(msg, key, data)
- const gchar *msg;
+ const char *msg;
DBT *key, *data;
{
printf("%s%.*s : %.*s\n", msg,
- (int)key->size, (gchar *)key->data,
- (int)data->size, (gchar *)data->data);
+ (int)key->size, (char *)key->data,
+ (int)data->size, (char *)data->data);
}
diff --git a/libdb/examples_c/ex_dbclient.c b/libdb/examples_c/ex_dbclient.c
index aaecba8..5f199b9 100644
--- a/libdb/examples_c/ex_dbclient.c
+++ b/libdb/examples_c/ex_dbclient.c
@@ -20,19 +20,19 @@
#define DATABASE "access.db"
-int db_clientrun __P((DB_ENV *, const gchar *));
-int ex_dbclient_run __P((const gchar *, FILE *, const gchar *, const gchar *));
-int main __P((int, gchar *[]));
+int db_clientrun __P((DB_ENV *, const char *));
+int ex_dbclient_run __P((const char *, FILE *, const char *, const char *));
+int main __P((int, char *[]));
/*
* An example of a program creating/configuring a Berkeley DB environment.
*/
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- const gchar *home;
+ const char *home;
if (argc != 2) {
fprintf(stderr, "Usage: %s hostname\n", argv[0]);
@@ -48,13 +48,13 @@ main(argc, argv)
stderr, argv[1], argv[0]) == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
-gint
+int
ex_dbclient(host)
- const gchar *host;
+ const char *host;
{
- const gchar *home;
- const gchar *progname = "ex_dbclient"; /* Program name. */
- gint ret;
+ const char *home;
+ const char *progname = "ex_dbclient"; /* Program name. */
+ int ret;
/*
* All of the shared database files live in DATABASE_HOME, but
@@ -68,13 +68,13 @@ ex_dbclient(host)
return (0);
}
-gint
+int
ex_dbclient_run(home, errfp, host, progname)
- const gchar *home, *host, *progname;
+ const char *home, *host, *progname;
FILE *errfp;
{
DB_ENV *dbenv;
- gint ret, retry;
+ int ret, retry;
/*
* Create an environment object and initialize it for error
@@ -142,16 +142,16 @@ retry:
return (0);
}
-gint
+int
db_clientrun(dbenv, progname)
DB_ENV *dbenv;
- const gchar *progname;
+ const char *progname;
{
DB *dbp;
DBT key, data;
u_int32_t len;
- gint ret;
- gchar *p, *t, buf[1024], rbuf[1024];
+ int ret;
+ char *p, *t, buf[1024], rbuf[1024];
/* Remove the previous database. */
@@ -206,8 +206,8 @@ db_clientrun(dbenv, progname)
switch (ret = dbp->get(dbp, NULL, &key, &data, 0)) {
case 0:
printf("%.*s : %.*s\n",
- (int)key.size, (gchar *)key.data,
- (int)data.size, (gchar *)data.data);
+ (int)key.size, (char *)key.data,
+ (int)data.size, (char *)data.data);
break;
default:
dbp->err(dbp, ret, "DB->get");
diff --git a/libdb/examples_c/ex_env.c b/libdb/examples_c/ex_env.c
index 9ddbf6a..68e4e3b 100644
--- a/libdb/examples_c/ex_env.c
+++ b/libdb/examples_c/ex_env.c
@@ -28,18 +28,18 @@
#endif
#endif
-int db_setup __P((const gchar *, const gchar *, FILE *, const gchar *));
-int db_teardown __P((const gchar *, const gchar *, FILE *, const gchar *));
+int db_setup __P((const char *, const char *, FILE *, const char *));
+int db_teardown __P((const char *, const char *, FILE *, const char *));
int main __P((void));
/*
* An example of a program creating/configuring a Berkeley DB environment.
*/
-gint
+int
main()
{
- const gchar *data_dir, *home;
- const gchar *progname = "ex_env"; /* Program name. */
+ const char *data_dir, *home;
+ const char *progname = "ex_env"; /* Program name. */
/*
* All of the shared database files live in DATABASE_HOME, but
@@ -59,13 +59,13 @@ main()
return (EXIT_SUCCESS);
}
-gint
+int
db_setup(home, data_dir, errfp, progname)
- const gchar *home, *data_dir, *progname;
+ const char *home, *data_dir, *progname;
FILE *errfp;
{
DB_ENV *dbenv;
- gint ret;
+ int ret;
/*
* Create an environment object and initialize it for error
@@ -110,13 +110,13 @@ db_setup(home, data_dir, errfp, progname)
return (0);
}
-gint
+int
db_teardown(home, data_dir, errfp, progname)
- const gchar *home, *data_dir, *progname;
+ const char *home, *data_dir, *progname;
FILE *errfp;
{
DB_ENV *dbenv;
- gint ret;
+ int ret;
/* Remove the shared database regions. */
if ((ret = db_env_create(&dbenv, 0)) != 0) {
diff --git a/libdb/examples_c/ex_lock.c b/libdb/examples_c/ex_lock.c
index ac2c7da..fe70fe0 100644
--- a/libdb/examples_c/ex_lock.c
+++ b/libdb/examples_c/ex_lock.c
@@ -13,37 +13,37 @@
#include <string.h>
#ifdef _WIN32
-extern gint getopt(int, gchar * const *, const gchar *);
+extern int getopt(int, char * const *, const char *);
#else
#include <unistd.h>
#endif
#include <db.h>
-gint db_init __P((const gchar *, u_int32_t, int));
-gint main __P((int, gchar *[]));
-gint usage __P((void));
+int db_init __P((const char *, u_int32_t, int));
+int main __P((int, char *[]));
+int usage __P((void));
DB_ENV *dbenv;
const char
*progname = "ex_lock"; /* Program name. */
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
+ extern char *optarg;
+ extern int optind;
DBT lock_dbt;
DB_LOCK lock;
DB_LOCK *locks;
db_lockmode_t lock_type;
long held;
u_int32_t len, locker, maxlocks;
- gint ch, do_unlink, did_get, i, lockid, lockcount, ret;
- const gchar *home;
- gchar opbuf[16], objbuf[1024], lockbuf[16];
+ int ch, do_unlink, did_get, i, lockid, lockcount, ret;
+ const char *home;
+ char opbuf[16], objbuf[1024], lockbuf[16];
home = "TESTDIR";
maxlocks = 0;
@@ -189,13 +189,13 @@ main(argc, argv)
* db_init --
* Initialize the environment.
*/
-gint
+int
db_init(home, maxlocks, do_unlink)
- const gchar *home;
+ const char *home;
u_int32_t maxlocks;
- gint do_unlink;
+ int do_unlink;
{
- gint ret;
+ int ret;
if ((ret = db_env_create(&dbenv, 0)) != 0) {
fprintf(stderr, "%s: db_env_create: %s\n",
@@ -230,7 +230,7 @@ db_init(home, maxlocks, do_unlink)
return (0);
}
-gint
+int
usage()
{
(void)fprintf(stderr,
diff --git a/libdb/examples_c/ex_mpool.c b/libdb/examples_c/ex_mpool.c
index ab385fd..4ce6969 100644
--- a/libdb/examples_c/ex_mpool.c
+++ b/libdb/examples_c/ex_mpool.c
@@ -16,29 +16,29 @@
#include <time.h>
#ifdef _WIN32
-extern gint getopt(int, gchar * const *, const gchar *);
+extern int getopt(int, char * const *, const char *);
#else
#include <unistd.h>
#endif
#include <db.h>
-int init __P((const gchar *, int, int, const gchar *));
-int run __P((int, int, int, int, const gchar *));
-int run_mpool __P((int, int, int, int, const gchar *));
-int main __P((int, gchar *[]));
-int usage __P((const gchar *));
+int init __P((const char *, int, int, const char *));
+int run __P((int, int, int, int, const char *));
+int run_mpool __P((int, int, int, int, const char *));
+int main __P((int, char *[]));
+int usage __P((const char *));
#define MPOOL "mpool" /* File. */
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
- gint cachesize, ch, hits, npages, pagesize;
- gchar *progname;
+ extern char *optarg;
+ extern int optind;
+ int cachesize, ch, hits, npages, pagesize;
+ char *progname;
cachesize = 20 * 1024;
hits = 1000;
@@ -74,9 +74,9 @@ main(argc, argv)
hits, npages, progname) == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
-gint
+int
usage(progname)
- const gchar *progname;
+ const char *progname;
{
(void)fprintf(stderr,
"usage: %s [-c cachesize] [-h hits] [-n npages] [-p pagesize]\n",
@@ -84,12 +84,12 @@ usage(progname)
return (EXIT_FAILURE);
}
-gint
+int
run_mpool(pagesize, cachesize, hits, npages, progname)
- gint pagesize, cachesize, hits, npages;
- const gchar *progname;
+ int pagesize, cachesize, hits, npages;
+ const char *progname;
{
- gint ret;
+ int ret;
/* Initialize the file. */
if ((ret = init(MPOOL, pagesize, npages, progname)) != 0)
@@ -106,14 +106,14 @@ run_mpool(pagesize, cachesize, hits, npages, progname)
* init --
* Create a backing file.
*/
-gint
+int
init(file, pagesize, npages, progname)
- const gchar *file, *progname;
- gint pagesize, npages;
+ const char *file, *progname;
+ int pagesize, npages;
{
FILE *fp;
- gint cnt;
- gchar *p;
+ int cnt;
+ char *p;
/*
* Create a file with the right number of pages, and store a page
@@ -124,14 +124,14 @@ init(file, pagesize, npages, progname)
"%s: %s: %s\n", progname, file, strerror(errno));
return (1);
}
- if ((p = (gchar *)malloc(pagesize)) == NULL) {
+ if ((p = (char *)malloc(pagesize)) == NULL) {
fprintf(stderr, "%s: %s\n", progname, strerror(ENOMEM));
return (1);
}
/* The pages are numbered from 0. */
for (cnt = 0; cnt <= npages; ++cnt) {
- *(gint *)p = cnt;
+ *(int *)p = cnt;
if (fwrite(p, pagesize, 1, fp) != 1) {
fprintf(stderr,
"%s: %s: %s\n", progname, file, strerror(errno));
@@ -148,16 +148,16 @@ init(file, pagesize, npages, progname)
* run --
* Get a set of pages.
*/
-gint
+int
run(hits, cachesize, pagesize, npages, progname)
- gint hits, cachesize, pagesize, npages;
- const gchar *progname;
+ int hits, cachesize, pagesize, npages;
+ const char *progname;
{
DB_ENV *dbenv;
DB_MPOOLFILE *mfp;
db_pgno_t pageno;
- gint cnt, ret;
- gpointer p;
+ int cnt, ret;
+ void *p;
dbenv = NULL;
mfp = NULL;
@@ -219,7 +219,7 @@ run(hits, cachesize, pagesize, npages, progname)
if (*(db_pgno_t *)p != pageno) {
dbenv->errx(dbenv,
"wrong page retrieved (%lu != %d)",
- (u_long)pageno, *(gint *)p);
+ (u_long)pageno, *(int *)p);
goto err;
}
if ((ret = mfp->put(mfp, p, 0)) != 0) {
diff --git a/libdb/examples_c/ex_repquote/ex_repquote.h b/libdb/examples_c/ex_repquote/ex_repquote.h
index 93c16e4..5dbf6c9 100644
--- a/libdb/examples_c/ex_repquote/ex_repquote.h
+++ b/libdb/examples_c/ex_repquote/ex_repquote.h
@@ -13,13 +13,13 @@
#define SELF_EID 1
typedef struct {
- gchar *host; /* Host name. */
+ char *host; /* Host name. */
u_int32_t port; /* Port on which to connect to this site. */
} repsite_t;
/* Globals */
-extern gint master_eid;
-extern gchar *myaddr;
+extern int master_eid;
+extern char *myaddr;
struct __member; typedef struct __member member_t;
struct __machtab; typedef struct __machtab machtab_t;
@@ -27,40 +27,40 @@ struct __machtab; typedef struct __machtab machtab_t;
/* Arguments for the connect_all thread. */
typedef struct {
DB_ENV *dbenv;
- const gchar *progname;
- const gchar *home;
+ const char *progname;
+ const char *home;
machtab_t *machtab;
repsite_t *sites;
- gint nsites;
+ int nsites;
} all_args;
/* Arguments for the connect_loop thread. */
typedef struct {
DB_ENV *dbenv;
- const gchar * home;
- const gchar * progname;
+ const char * home;
+ const char * progname;
machtab_t *machtab;
- gint port;
+ int port;
} connect_args;
#define CACHESIZE (10 * 1024 * 1024)
#define DATABASE "quote.db"
#define SLEEPTIME 3
-gpointer connect_all __P((gpointer args));
-gpointer connect_thread __P((gpointer args));
-gint doclient __P((DB_ENV *, const gchar *, machtab_t *));
-gint domaster __P((DB_ENV *, const gchar *));
-gint get_accepted_socket __P((const gchar *, int));
-gint get_connected_socket __P((machtab_t *, const gchar *, const gchar *, int, gint *, gint *));
-gint get_next_message __P((int, DBT *, DBT *));
-gint listen_socket_init __P((const gchar *, int));
-gint listen_socket_accept __P((machtab_t *, const gchar *, int, gint *));
-gint machtab_getinfo __P((machtab_t *, int, u_int32_t *, gint *));
-gint machtab_init __P((machtab_t **, int, int));
-void machtab_parm __P((machtab_t *, gint *, gint *, u_int32_t *));
-gint machtab_rem __P((machtab_t *, int, int));
-gint quote_send __P((DB_ENV *, const DBT *, const DBT *, int, u_int32_t));
+void *connect_all __P((void *args));
+void *connect_thread __P((void *args));
+int doclient __P((DB_ENV *, const char *, machtab_t *));
+int domaster __P((DB_ENV *, const char *));
+int get_accepted_socket __P((const char *, int));
+int get_connected_socket __P((machtab_t *, const char *, const char *, int, int *, int *));
+int get_next_message __P((int, DBT *, DBT *));
+int listen_socket_init __P((const char *, int));
+int listen_socket_accept __P((machtab_t *, const char *, int, int *));
+int machtab_getinfo __P((machtab_t *, int, u_int32_t *, int *));
+int machtab_init __P((machtab_t **, int, int));
+void machtab_parm __P((machtab_t *, int *, int *, u_int32_t *));
+int machtab_rem __P((machtab_t *, int, int));
+int quote_send __P((DB_ENV *, const DBT *, const DBT *, int, u_int32_t));
#ifndef COMPQUIET
#define COMPQUIET(x,y) x = (y)
diff --git a/libdb/examples_c/ex_repquote/ex_rq_client.c b/libdb/examples_c/ex_repquote/ex_rq_client.c
index 537571e..6662872 100644
--- a/libdb/examples_c/ex_repquote/ex_rq_client.c
+++ b/libdb/examples_c/ex_repquote/ex_rq_client.c
@@ -22,12 +22,12 @@
#include "ex_repquote.h"
-static gpointer check_loop __P((gpointer));
-static gpointer display_loop __P((gpointer));
-static gint print_stocks __P((DBC *));
+static void *check_loop __P((void *));
+static void *display_loop __P((void *));
+static int print_stocks __P((DBC *));
typedef struct {
- const gchar *progname;
+ const char *progname;
DB_ENV *dbenv;
} disploop_args;
@@ -36,34 +36,34 @@ typedef struct {
machtab_t *machtab;
} checkloop_args;
-gint
+int
doclient(dbenv, progname, machtab)
DB_ENV *dbenv;
- const gchar *progname;
+ const char *progname;
machtab_t *machtab;
{
checkloop_args cargs;
disploop_args dargs;
pthread_t check_thr, disp_thr;
- gpointer cstatus, *dstatus;
- gint rval, s;
+ void *cstatus, *dstatus;
+ int rval, s;
rval = EXIT_SUCCESS;
s = -1;
memset(&dargs, 0, sizeof(dargs));
- dstatus = (gpointer)EXIT_FAILURE;
+ dstatus = (void *)EXIT_FAILURE;
dargs.progname = progname;
dargs.dbenv = dbenv;
- if (pthread_create(&disp_thr, NULL, display_loop, (gpointer)&dargs)) {
+ if (pthread_create(&disp_thr, NULL, display_loop, (void *)&dargs)) {
dbenv->err(dbenv, errno, "display_loop pthread_create failed");
goto err;
}
cargs.dbenv = dbenv;
cargs.machtab = machtab;
- if (pthread_create(&check_thr, NULL, check_loop, (gpointer)&cargs)) {
+ if (pthread_create(&check_thr, NULL, check_loop, (void *)&cargs)) {
dbenv->err(dbenv, errno, "check_thread pthread_create failed");
goto err;
}
@@ -86,14 +86,14 @@ err: rval = EXIT_FAILURE;
* to identify itself (that would be a call to rep_start). If that fails,
* we trigger an election.
*/
-static gpointer
+static void *
check_loop(args)
- gpointer args;
+ void *args;
{
DB_ENV *dbenv;
DBT dbt;
checkloop_args *cargs;
- gint count, n, pri;
+ int count, n, pri;
machtab_t *machtab;
u_int32_t timeout;
@@ -125,19 +125,19 @@ check_loop(args)
sleep(IDLE_INTERVAL);
}
- return ((gpointer)EXIT_SUCCESS);
+ return ((void *)EXIT_SUCCESS);
}
-static gpointer
+static void *
display_loop(args)
- gpointer args;
+ void *args;
{
DB *dbp;
DB_ENV *dbenv;
DBC *dbc;
- const gchar *progname;
+ const char *progname;
disploop_args *dargs;
- gint ret, rval;
+ int ret, rval;
dargs = (disploop_args *)args;
progname = dargs->progname;
@@ -154,7 +154,7 @@ display_loop(args)
if (dbp == NULL) {
if ((ret = db_create(&dbp, dbenv, 0)) != 0) {
dbenv->err(dbenv, ret, "db_create");
- return ((gpointer)EXIT_FAILURE);
+ return ((void *)EXIT_FAILURE);
}
if ((ret = dbp->open(dbp, NULL,
@@ -209,10 +209,10 @@ err: rval = EXIT_FAILURE;
if (dbp != NULL && (ret = dbp->close(dbp, 0)) != 0) {
dbenv->err(dbenv, ret, "DB->close");
- return ((gpointer)EXIT_FAILURE);
+ return ((void *)EXIT_FAILURE);
}
- return ((gpointer)rval);
+ return ((void *)rval);
}
static int
@@ -222,8 +222,8 @@ print_stocks(dbc)
DBT key, data;
#define MAXKEYSIZE 10
#define MAXDATASIZE 20
- gchar keybuf[MAXKEYSIZE + 1], databuf[MAXDATASIZE + 1];
- gint ret;
+ char keybuf[MAXKEYSIZE + 1], databuf[MAXDATASIZE + 1];
+ int ret;
u_int32_t keysize, datasize;
memset(&key, 0, sizeof(key));
diff --git a/libdb/examples_c/ex_repquote/ex_rq_main.c b/libdb/examples_c/ex_repquote/ex_rq_main.c
index d7dbbb0..3980361 100644
--- a/libdb/examples_c/ex_repquote/ex_rq_main.c
+++ b/libdb/examples_c/ex_repquote/ex_rq_main.c
@@ -23,20 +23,20 @@
/*
* Process globals (we could put these in the machtab I suppose.
*/
-gint master_eid;
-gchar *myaddr;
+int master_eid;
+char *myaddr;
-static gint env_init __P((const gchar *, const gchar *, DB_ENV **, machtab_t *,
+static int env_init __P((const char *, const char *, DB_ENV **, machtab_t *,
u_int32_t));
-static void usage __P((const gchar *));
+static void usage __P((const char *));
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
+ extern char *optarg;
+ extern int optind;
DB_ENV *dbenv;
DBT local;
enum { MASTER, CLIENT, UNKNOWN } whoami;
@@ -46,10 +46,10 @@ main(argc, argv)
pthread_t all_thr, conn_thr;
repsite_t site, *sitep, self, *selfp;
struct sigaction sigact;
- gint maxsites, nsites, ret, priority, totalsites;
- gchar *c, ch;
- const gchar *home, *progname;
- gpointer astatus, *cstatus;
+ int maxsites, nsites, ret, priority, totalsites;
+ char *c, ch;
+ const char *home, *progname;
+ void *astatus, *cstatus;
master_eid = DB_EID_INVALID;
@@ -252,7 +252,7 @@ err: if (machtab != NULL)
*/
static void
usage(progname)
- const gchar *progname;
+ const char *progname;
{
fprintf(stderr, "usage: %s ", progname);
fprintf(stderr, "[-CM][-h home][-o host:port][-m host:port]%s",
@@ -261,16 +261,16 @@ usage(progname)
}
/* Open and configure an environment. */
-gint
+int
env_init(progname, home, dbenvp, machtab, flags)
- const gchar *progname, *home;
+ const char *progname, *home;
DB_ENV **dbenvp;
machtab_t *machtab;
u_int32_t flags;
{
DB_ENV *dbenv;
- gint ret;
- gchar *prefix;
+ int ret;
+ char *prefix;
if ((prefix = malloc(strlen(progname) + 2)) == NULL) {
fprintf(stderr,
diff --git a/libdb/examples_c/ex_repquote/ex_rq_master.c b/libdb/examples_c/ex_repquote/ex_rq_master.c
index 2533446..080e372 100644
--- a/libdb/examples_c/ex_repquote/ex_rq_master.c
+++ b/libdb/examples_c/ex_repquote/ex_rq_master.c
@@ -21,16 +21,16 @@
#include "ex_repquote.h"
-static gpointer master_loop __P((gpointer));
+static void *master_loop __P((void *));
#define BUFSIZE 1024
-gint
+int
domaster(dbenv, progname)
DB_ENV *dbenv;
- const gchar *progname;
+ const char *progname;
{
- gint ret, t_ret;
+ int ret, t_ret;
pthread_t interface_thr;
pthread_attr_t attr;
@@ -43,7 +43,7 @@ domaster(dbenv, progname)
goto err;
if ((ret = pthread_create(&interface_thr,
- &attr, master_loop, (gpointer)dbenv)) != 0)
+ &attr, master_loop, (void *)dbenv)) != 0)
goto err;
err: if ((t_ret = pthread_attr_destroy(&attr)) != 0 && ret == 0)
@@ -52,16 +52,16 @@ err: if ((t_ret = pthread_attr_destroy(&attr)) != 0 && ret == 0)
return (ret);
}
-static gpointer
+static void *
master_loop(dbenvv)
- gpointer dbenvv;
+ void *dbenvv;
{
DB *dbp;
DB_ENV *dbenv;
DB_TXN *txn;
DBT key, data;
- gchar buf[BUFSIZE], *rbuf;
- gint ret;
+ char buf[BUFSIZE], *rbuf;
+ int ret;
dbp = NULL;
txn = NULL;
@@ -81,7 +81,7 @@ master_loop(dbenvv)
return (ret);
#endif
if ((ret = db_create(&dbp, dbenv, 0)) != 0)
- return ((gpointer)ret);
+ return ((void *)ret);
if ((ret = dbenv->txn_begin(dbenv, NULL, &txn, 0)) != 0)
goto err;
@@ -161,5 +161,5 @@ err: if (txn != NULL)
if (dbp != NULL)
(void)dbp->close(dbp, DB_NOSYNC);
- return ((gpointer)ret);
+ return ((void *)ret);
}
diff --git a/libdb/examples_c/ex_repquote/ex_rq_net.c b/libdb/examples_c/ex_repquote/ex_rq_net.c
index 046a30f..bfadf0c 100644
--- a/libdb/examples_c/ex_repquote/ex_rq_net.c
+++ b/libdb/examples_c/ex_repquote/ex_rq_net.c
@@ -28,8 +28,8 @@
#include "ex_repquote.h"
-gint machtab_add __P((machtab_t *, int, u_int32_t, int, gint *));
-ssize_t readn __P((int, gpointer , size_t));
+int machtab_add __P((machtab_t *, int, u_int32_t, int, int *));
+ssize_t readn __P((int, void *, size_t));
/*
* This file defines the communication infrastructure for the ex_repquote
@@ -66,28 +66,28 @@ ssize_t readn __P((int, gpointer , size_t));
struct __machtab {
LIST_HEAD(__machlist, __member) machlist;
- gint nextid;
+ int nextid;
pthread_mutex_t mtmutex;
u_int32_t timeout_time;
- gint current;
- gint max;
- gint nsites;
- gint priority;
+ int current;
+ int max;
+ int nsites;
+ int priority;
};
/* Data structure that describes each entry in the machtab. */
struct __member {
u_int32_t hostaddr; /* Host IP address. */
- gint port; /* Port number. */
- gint eid; /* Application-specific machine id. */
- gint fd; /* File descriptor for the socket. */
+ int port; /* Port number. */
+ int eid; /* Application-specific machine id. */
+ int fd; /* File descriptor for the socket. */
LIST_ENTRY(__member) links;
/* For linked list of all members we know of. */
};
-static gint quote_send_broadcast __P((machtab_t *,
+static int quote_send_broadcast __P((machtab_t *,
const DBT *, const DBT *, u_int32_t));
-static gint quote_send_one __P((const DBT *, const DBT *, int, u_int32_t));
+static int quote_send_one __P((const DBT *, const DBT *, int, u_int32_t));
/*
* machtab_init --
@@ -96,12 +96,12 @@ static gint quote_send_one __P((const DBT *, const DBT *, int, u_int32_t));
* number we've ever had on the list at one time. We probably
* want to make that smarter.
*/
-gint
+int
machtab_init(machtabp, pri, nsites)
machtab_t **machtabp;
- gint pri, nsites;
+ int pri, nsites;
{
- gint ret;
+ int ret;
machtab_t *machtab;
if ((machtab = malloc(sizeof(machtab_t))) == NULL)
@@ -128,14 +128,14 @@ machtab_init(machtabp, pri, nsites)
* Add a file descriptor to the table of machines, returning
* a new machine ID.
*/
-gint
+int
machtab_add(machtab, fd, hostaddr, port, idp)
machtab_t *machtab;
- gint fd;
+ int fd;
u_int32_t hostaddr;
- gint port, *idp;
+ int port, *idp;
{
- gint ret;
+ int ret;
member_t *m, *member;
if ((member = malloc(sizeof(member_t))) == NULL)
@@ -178,14 +178,14 @@ machtab_add(machtab, fd, hostaddr, port, idp)
* machtab_getinfo --
* Return host and port information for a particular machine id.
*/
-gint
+int
machtab_getinfo(machtab, eid, hostp, portp)
machtab_t *machtab;
- gint eid;
+ int eid;
u_int32_t *hostp;
- gint *portp;
+ int *portp;
{
- gint ret;
+ int ret;
member_t *member;
if ((ret = pthread_mutex_lock(&machtab->mtmutex)) != 0)
@@ -212,13 +212,13 @@ machtab_getinfo(machtab, eid, hostp, portp)
* whether we need to lock the machtab or not (0 indicates we do not
* need to lock; non-zero indicates that we do need to lock).
*/
-gint
+int
machtab_rem(machtab, eid, lock)
machtab_t *machtab;
- gint eid;
- gint lock;
+ int eid;
+ int lock;
{
- gint found, ret;
+ int found, ret;
member_t *member;
ret = 0;
@@ -249,7 +249,7 @@ machtab_rem(machtab, eid, lock)
void
machtab_parm(machtab, nump, prip, timeoutp)
machtab_t *machtab;
- gint *nump, *prip;
+ int *nump, *prip;
u_int32_t *timeoutp;
{
if (machtab->nsites == 0)
@@ -266,12 +266,12 @@ machtab_parm(machtab, nump, prip, timeoutp)
* a file descriptor for the socket, ready for an accept() call
* in a thread that we're happy to let block.
*/
-gint
+int
listen_socket_init(progname, port)
- const gchar *progname;
- gint port;
+ const char *progname;
+ int port;
{
- gint s;
+ int s;
struct protoent *proto;
struct sockaddr_in si;
@@ -304,15 +304,15 @@ err: fprintf(stderr, "%s: %s", progname, strerror(errno));
* Accept a connection on a socket. This is essentially just a wrapper
* for accept(3).
*/
-gint
+int
listen_socket_accept(machtab, progname, s, eidp)
machtab_t *machtab;
- const gchar *progname;
- gint s, *eidp;
+ const char *progname;
+ int s, *eidp;
{
struct sockaddr_in si;
- gint si_len;
- gint host, ns, port, ret;
+ int si_len;
+ int host, ns, port, ret;
COMPQUIET(progname, NULL);
@@ -339,15 +339,15 @@ err: close(ns);
* Listen on the specified port, and return a file descriptor
* when we have accepted a connection on it.
*/
-gint
+int
get_accepted_socket(progname, port)
- const gchar *progname;
- gint port;
+ const char *progname;
+ int port;
{
struct protoent *proto;
struct sockaddr_in si;
- gint si_len;
- gint s, ns;
+ int si_len;
+ int s, ns;
if ((proto = getprotobyname("tcp")) == NULL)
return (-1);
@@ -385,13 +385,13 @@ err: fprintf(stderr, "%s: %s", progname, strerror(errno));
* open to this machine, then don't create another one, return the eid
* of the connection (in *eidp) and set is_open to 1. Return 0.
*/
-gint
+int
get_connected_socket(machtab, progname, remotehost, port, is_open, eidp)
machtab_t *machtab;
- const gchar *progname, *remotehost;
- gint port, *is_open, *eidp;
+ const char *progname, *remotehost;
+ int port, *is_open, *eidp;
{
- gint ret, s;
+ int ret, s;
struct hostent *hp;
struct protoent *proto;
struct sockaddr_in si;
@@ -411,7 +411,7 @@ get_connected_socket(machtab, progname, remotehost, port, is_open, eidp)
if ((s = socket(AF_INET, SOCK_STREAM, proto->p_proto)) < 0)
return (-1);
memset(&si, 0, sizeof(si));
- memcpy((gchar *)&si.sin_addr, hp->h_addr, hp->h_length);
+ memcpy((char *)&si.sin_addr, hp->h_addr, hp->h_length);
addr = ntohl(si.sin_addr.s_addr);
ret = machtab_add(machtab, s, addr, port, eidp);
if (ret == EEXIST) {
@@ -443,9 +443,9 @@ get_connected_socket(machtab, progname, remotehost, port, is_open, eidp)
* This function is called in a loop by both clients and masters, and
* the resulting DBTs are manually dispatched to DB_ENV->rep_process_message().
*/
-gint
+int
get_next_message(fd, rec, control)
- gint fd;
+ int fd;
DBT *rec, *control;
{
size_t nr;
@@ -510,13 +510,13 @@ get_next_message(fd, rec, control)
*/
ssize_t
readn(fd, vptr, n)
- gint fd;
- gpointer vptr;
+ int fd;
+ void *vptr;
size_t n;
{
size_t nleft;
ssize_t nread;
- gchar *ptr;
+ char *ptr;
ptr = vptr;
nleft = n;
@@ -544,14 +544,14 @@ readn(fd, vptr, n)
* quote_send --
* The f_send function for DB_ENV->set_rep_transport.
*/
-gint
+int
quote_send(dbenv, control, rec, eid, flags)
DB_ENV *dbenv;
const DBT *control, *rec;
- gint eid;
+ int eid;
u_int32_t flags;
{
- gint fd, n, ret, t_ret;
+ int fd, n, ret, t_ret;
machtab_t *machtab;
member_t *m;
@@ -608,7 +608,7 @@ quote_send_broadcast(machtab, rec, control, flags)
const DBT *rec, *control;
u_int32_t flags;
{
- gint ret, sent;
+ int ret, sent;
member_t *m, *next;
if ((ret = pthread_mutex_lock(&machtab->mtmutex)) != 0)
@@ -642,11 +642,11 @@ quote_send_broadcast(machtab, rec, control, flags)
static int
quote_send_one(rec, control, fd, flags)
const DBT *rec, *control;
- gint fd;
+ int fd;
u_int32_t flags;
{
- gint retry;
+ int retry;
ssize_t bytes_left, nw;
u_int8_t *wp;
diff --git a/libdb/examples_c/ex_repquote/ex_rq_util.c b/libdb/examples_c/ex_repquote/ex_rq_util.c
index b026ef7..40ef235 100644
--- a/libdb/examples_c/ex_repquote/ex_rq_util.c
+++ b/libdb/examples_c/ex_repquote/ex_rq_util.c
@@ -20,9 +20,9 @@
#include "ex_repquote.h"
-static gint connect_site __P((DB_ENV *, machtab_t *, const gchar *,
- repsite_t *, gint *, gint *));
-gpointer elect_thread __P((gpointer));
+static int connect_site __P((DB_ENV *, machtab_t *, const char *,
+ repsite_t *, int *, int *));
+void * elect_thread __P((void *));
typedef struct {
DB_ENV *dbenv;
@@ -31,9 +31,9 @@ typedef struct {
typedef struct {
DB_ENV *dbenv;
- const gchar *progname;
- const gchar *home;
- gint fd;
+ const char *progname;
+ const char *home;
+ int fd;
u_int32_t eid;
machtab_t *tab;
} hm_loop_args;
@@ -43,22 +43,22 @@ typedef struct {
* master to accept messages from a client as well as by clients
* to communicate with other clients.
*/
-gpointer
+void *
hm_loop(args)
- gpointer args;
+ void *args;
{
DB_ENV *dbenv;
DBT rec, control;
- const gchar *c, *home, *progname;
- gint fd, eid, n, newm;
- gint open, pri, r, ret, t_ret, tmpid;
+ const char *c, *home, *progname;
+ int fd, eid, n, newm;
+ int open, pri, r, ret, t_ret, tmpid;
elect_args *ea;
hm_loop_args *ha;
machtab_t *tab;
pthread_t elect_thr;
repsite_t self;
u_int32_t timeout;
- gpointer status;
+ void *status;
ea = NULL;
@@ -134,7 +134,7 @@ hm_loop(args)
if (strncmp(myaddr, rec.data, rec.size) == 0)
break;
- self.host = (gchar *)rec.data;
+ self.host = (char *)rec.data;
self.host = strtok(self.host, ":");
if ((c = strtok(NULL, ":")) == NULL) {
dbenv->errx(dbenv, "Bad host specification");
@@ -167,7 +167,7 @@ hm_loop(args)
ea->dbenv = dbenv;
ea->machtab = tab;
ret = pthread_create(&elect_thr,
- NULL, elect_thread, (gpointer)ea);
+ NULL, elect_thread, (void *)ea);
break;
case DB_REP_NEWMASTER:
/* Check if it's us. */
@@ -194,7 +194,7 @@ out: if ((t_ret = machtab_rem(tab, eid, 1)) != 0 && ret == 0)
if (ea != NULL)
(void)pthread_join(elect_thr, &status);
- return ((gpointer)ret);
+ return ((void *)ret);
}
/*
@@ -202,13 +202,13 @@ out: if ((t_ret = machtab_rem(tab, eid, 1)) != 0 && ret == 0)
* on a socket and then spawns off child threads to handle each new
* connection.
*/
-gpointer
+void *
connect_thread(args)
- gpointer args;
+ void *args;
{
DB_ENV *dbenv;
- const gchar *home, *progname;
- gint fd, i, eid, ns, port, ret;
+ const char *home, *progname;
+ int fd, i, eid, ns, port, ret;
hm_loop_args *ha;
connect_args *cargs;
machtab_t *machtab;
@@ -225,7 +225,7 @@ connect_thread(args)
port = cargs->port;
if ((ret = pthread_attr_init(&attr)) != 0)
- return ((gpointer)EXIT_FAILURE);
+ return ((void *)EXIT_FAILURE);
if ((ret =
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED)) != 0)
@@ -255,7 +255,7 @@ connect_thread(args)
ha->tab = machtab;
ha->dbenv = dbenv;
if ((ret = pthread_create(&hm_thrs[i++], &attr,
- hm_loop, (gpointer)ha)) != 0)
+ hm_loop, (void *)ha)) != 0)
goto err;
ha = NULL;
}
@@ -265,22 +265,22 @@ connect_thread(args)
ret = ENOMEM;
err: pthread_attr_destroy(&attr);
- return (ret == 0 ? (gpointer)EXIT_SUCCESS : (gpointer)EXIT_FAILURE);
+ return (ret == 0 ? (void *)EXIT_SUCCESS : (void *)EXIT_FAILURE);
}
/*
* Open a connection to everyone that we've been told about. If we
* cannot open some connections, keep trying.
*/
-gpointer
+void *
connect_all(args)
- gpointer args;
+ void *args;
{
DB_ENV *dbenv;
all_args *aa;
- const gchar *home, *progname;
+ const char *home, *progname;
hm_loop_args *ha;
- gint failed, i, eid, nsites, open, ret, *success;
+ int failed, i, eid, nsites, open, ret, *success;
machtab_t *machtab;
repsite_t *sites;
@@ -333,19 +333,19 @@ connect_all(args)
}
err: free(success);
- return (ret ? (gpointer)EXIT_FAILURE : (gpointer)EXIT_SUCCESS);
+ return (ret ? (void *)EXIT_FAILURE : (void *)EXIT_SUCCESS);
}
-gint
+int
connect_site(dbenv, machtab, progname, site, is_open, eidp)
DB_ENV *dbenv;
machtab_t *machtab;
- const gchar *progname;
+ const char *progname;
repsite_t *site;
- gint *is_open;
- gint *eidp;
+ int *is_open;
+ int *eidp;
{
- gint ret, s;
+ int ret, s;
hm_loop_args *ha;
pthread_t hm_thr;
@@ -368,7 +368,7 @@ connect_site(dbenv, machtab, progname, site, is_open, eidp)
ha->dbenv = dbenv;
if ((ret = pthread_create(&hm_thr, NULL,
- hm_loop, (gpointer)ha)) != 0) {
+ hm_loop, (void *)ha)) != 0) {
dbenv->err(dbenv, ret, "connect site");
goto err1;
}
@@ -384,13 +384,13 @@ err:
* We need to spawn off a new thread in which to hold an election in
* case we are the only thread listening on for messages.
*/
-gpointer
+void *
elect_thread(args)
- gpointer args;
+ void *args;
{
DB_ENV *dbenv;
elect_args *eargs;
- gint n, ret, pri;
+ int n, ret, pri;
machtab_t *machtab;
u_int32_t timeout;
@@ -408,5 +408,5 @@ elect_thread(args)
if (master_eid == SELF_EID)
ret = dbenv->rep_start(dbenv, NULL, DB_REP_MASTER);
- return ((gpointer)(ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE));
+ return ((void *)(ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE));
}
diff --git a/libdb/examples_c/ex_thread.c b/libdb/examples_c/ex_thread.c
index d0a15e9..191d593 100644
--- a/libdb/examples_c/ex_thread.c
+++ b/libdb/examples_c/ex_thread.c
@@ -19,7 +19,7 @@
#include <time.h>
#ifdef _WIN32
-extern gint getopt(int, gchar * const *, const gchar *);
+extern int getopt(int, char * const *, const char *);
#else
#include <unistd.h>
#endif
@@ -30,17 +30,17 @@ extern gint getopt(int, gchar * const *, const gchar *);
* NB: This application is written using POSIX 1003.1b-1993 pthreads
* interfaces, which may not be portable to your system.
*/
-extern gint sched_yield __P((void)); /* Pthread yield function. */
+extern int sched_yield __P((void)); /* Pthread yield function. */
-int db_init __P((const gchar *));
-void *deadlock __P((gpointer));
-void fatal __P((const gchar *, int, int));
+int db_init __P((const char *));
+void *deadlock __P((void *));
+void fatal __P((const char *, int, int));
void onint __P((int));
-int main __P((int, gchar *[]));
+int main __P((int, char *[]));
int reader __P((int));
void stats __P((void));
-void *trickle __P((gpointer));
-void *tstart __P((gpointer));
+void *trickle __P((void *));
+void *tstart __P((void *));
int usage __P((void));
void word __P((void));
int writer __P((int));
@@ -48,13 +48,13 @@ int writer __P((int));
int quit; /* Interrupt handling flag. */
struct _statistics {
- gint aborted; /* Write. */
- gint aborts; /* Read/write. */
- gint adds; /* Write. */
- gint deletes; /* Write. */
- gint txns; /* Write. */
- gint found; /* Read. */
- gint notfound; /* Read. */
+ int aborted; /* Write. */
+ int aborts; /* Read/write. */
+ int adds; /* Write. */
+ int deletes; /* Write. */
+ int txns; /* Write. */
+ int found; /* Read. */
+ int notfound; /* Read. */
} *perf;
const char
@@ -77,7 +77,7 @@ int nwriters; /* -w */
DB *dbp; /* Database handle. */
DB_ENV *dbenv; /* Database environment. */
int nthreads; /* Total threads. */
-gchar **list; /* Word list. */
+char **list; /* Word list. */
/*
* ex_thread --
@@ -89,18 +89,18 @@ gchar **list; /* Word list. */
* % mkdir TESTDIR
* % ex_thread -h TESTDIR
*/
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint errno, optind;
+ extern char *optarg;
+ extern int errno, optind;
DB_TXN *txnp;
pthread_t *tids;
- gint ch, i, ret;
- const gchar *home;
- gpointer retp;
+ int ch, i, ret;
+ const char *home;
+ void *retp;
txnp = NULL;
nlist = 1000;
@@ -188,7 +188,7 @@ main(argc, argv)
/* Create reader/writer threads. */
for (i = 0; i < nreaders + nwriters; ++i)
if ((ret =
- pthread_create(&tids[i], NULL, tstart, (gpointer)i)) != 0)
+ pthread_create(&tids[i], NULL, tstart, (void *)i)) != 0)
fatal("pthread_create", ret > 0 ? ret : errno, 1);
/* Create buffer pool trickle thread. */
@@ -215,13 +215,13 @@ err: if (txnp != NULL)
return (EXIT_SUCCESS);
}
-gint
+int
reader(id)
- gint id;
+ int id;
{
DBT key, data;
- gint n, ret;
- gchar buf[64];
+ int n, ret;
+ char buf[64];
/*
* DBT's must use local memory or malloc'd memory if the DB handle
@@ -259,22 +259,22 @@ reader(id)
break;
default:
sprintf(buf,
- "reader %d: dbp->get: %s", id, (gchar *)key.data);
+ "reader %d: dbp->get: %s", id, (char *)key.data);
fatal(buf, ret, 0);
}
}
return (0);
}
-gint
+int
writer(id)
- gint id;
+ int id;
{
DBT key, data;
DB_TXN *tid;
time_t now, then;
- gint n, ret;
- gchar buf[256], dbuf[10000];
+ int n, ret;
+ char buf[256], dbuf[10000];
time(&now);
then = now;
@@ -407,8 +407,8 @@ commit: /* The transaction finished, commit it. */
void
stats()
{
- gint id;
- gchar *p, buf[8192];
+ int id;
+ char *p, buf[8192];
p = buf + sprintf(buf, "-------------\n");
for (id = 0; id < nreaders + nwriters;)
@@ -431,11 +431,11 @@ stats()
* db_init --
* Initialize the environment.
*/
-gint
+int
db_init(home)
- const gchar *home;
+ const char *home;
{
- gint ret;
+ int ret;
if ((ret = db_env_create(&dbenv, 0)) != 0) {
fprintf(stderr,
@@ -467,9 +467,9 @@ db_init(home)
* tstart --
* Thread start function for readers and writers.
*/
-gpointer
+void *
tstart(arg)
- gpointer arg;
+ void *arg;
{
pthread_t tid;
u_int id;
@@ -496,9 +496,9 @@ tstart(arg)
* deadlock --
* Thread start function for DB_ENV->lock_detect.
*/
-gpointer
+void *
deadlock(arg)
- gpointer arg;
+ void *arg;
{
struct timeval t;
pthread_t tid;
@@ -525,13 +525,13 @@ deadlock(arg)
* trickle --
* Thread start function for memp_trickle.
*/
-gpointer
+void *
trickle(arg)
- gpointer arg;
+ void *arg;
{
pthread_t tid;
- gint wrote;
- gchar buf[64];
+ int wrote;
+ char buf[64];
arg = arg; /* XXX: shut the compiler up. */
tid = pthread_self();
@@ -562,13 +562,13 @@ void
word()
{
FILE *fp;
- gint cnt;
- gchar buf[256];
+ int cnt;
+ char buf[256];
if ((fp = fopen(WORDLIST, "r")) == NULL)
fatal(WORDLIST, errno, 1);
- if ((list = malloc(nlist * sizeof(gchar *))) == NULL)
+ if ((list = malloc(nlist * sizeof(char *))) == NULL)
fatal(NULL, errno, 1);
for (cnt = 0; cnt < nlist; ++cnt) {
@@ -586,8 +586,8 @@ word()
*/
void
fatal(msg, err, syserr)
- const gchar *msg;
- gint err, syserr;
+ const char *msg;
+ int err, syserr;
{
fprintf(stderr, "%s: ", progname);
if (msg != NULL) {
@@ -607,7 +607,7 @@ fatal(msg, err, syserr)
* usage --
* Usage message.
*/
-gint
+int
usage()
{
(void)fprintf(stderr,
@@ -622,7 +622,7 @@ usage()
*/
void
onint(signo)
- gint signo;
+ int signo;
{
signo = 0; /* Quiet compiler. */
quit = 1;
diff --git a/libdb/examples_c/ex_tpcb.c b/libdb/examples_c/ex_tpcb.c
index 6513af0..6667c2c 100644
--- a/libdb/examples_c/ex_tpcb.c
+++ b/libdb/examples_c/ex_tpcb.c
@@ -15,7 +15,7 @@
#include <time.h>
#ifdef _WIN32
-extern gint getopt(int, gchar * const *, const gchar *);
+extern int getopt(int, char * const *, const char *);
#else
#include <unistd.h>
#endif
@@ -24,18 +24,18 @@ extern gint getopt(int, gchar * const *, const gchar *);
typedef enum { ACCOUNT, BRANCH, TELLER } FTYPE;
-DB_ENV *db_init __P((const gchar *, const gchar *, int, int, u_int32_t));
+DB_ENV *db_init __P((const char *, const char *, int, int, u_int32_t));
int hpopulate __P((DB *, int, int, int, int));
-int populate __P((DB *, u_int32_t, u_int32_t, int, const gchar *));
+int populate __P((DB *, u_int32_t, u_int32_t, int, const char *));
u_int32_t random_id __P((FTYPE, int, int, int));
u_int32_t random_int __P((u_int32_t, u_int32_t));
int tp_populate __P((DB_ENV *, int, int, int, int, int));
int tp_run __P((DB_ENV *, int, int, int, int, int));
int tp_txn __P((DB_ENV *, DB *, DB *, DB *, DB *, int, int, int, int));
-int invarg __P((const gchar *, int, const gchar *));
-int main __P((int, gchar *[]));
-int usage __P((const gchar *));
+int invarg __P((const char *, int, const char *));
+int main __P((int, char *[]));
+int usage __P((const char *));
/*
* This program implements a basic TPC/B driver program. To create the
@@ -102,17 +102,17 @@ typedef struct _histrec {
u_int8_t pad[RECLEN - 4 * sizeof(u_int32_t)];
} histrec;
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gchar *optarg;
- extern gint optind;
+ extern char *optarg;
+ extern int optind;
DB_ENV *dbenv;
- gint accounts, branches, seed, tellers, history;
- gint ch, iflag, mpool, ntxns, ret, txn_no_sync, verbose;
- const gchar *home, *progname;
+ int accounts, branches, seed, tellers, history;
+ int ch, iflag, mpool, ntxns, ret, txn_no_sync, verbose;
+ const char *home, *progname;
home = "TESTDIR";
progname = "ex_tpcb";
@@ -206,22 +206,22 @@ main(argc, argv)
return (EXIT_SUCCESS);
}
-gint
+int
invarg(progname, arg, str)
- const gchar *progname;
- gint arg;
- const gchar *str;
+ const char *progname;
+ int arg;
+ const char *str;
{
(void)fprintf(stderr,
"%s: invalid argument for -%c: %s\n", progname, arg, str);
return (EXIT_FAILURE);
}
-gint
+int
usage(progname)
- const gchar *progname;
+ const char *progname;
{
- const gchar *a1, *a2;
+ const char *a1, *a2;
a1 = "[-fv] [-a accounts] [-b branches]\n";
a2 = "\t[-c cache_size] [-h home] [-S seed] [-s history] [-t tellers]";
@@ -237,13 +237,13 @@ usage(progname)
*/
DB_ENV *
db_init(home, prefix, cachesize, initializing, flags)
- const gchar *home, *prefix;
- gint cachesize, initializing;
+ const char *home, *prefix;
+ int cachesize, initializing;
u_int32_t flags;
{
DB_ENV *dbenv;
u_int32_t local_flags;
- gint ret;
+ int ret;
if ((ret = db_env_create(&dbenv, 0)) != 0) {
dbenv->err(dbenv, ret, "db_env_create");
@@ -272,16 +272,16 @@ db_init(home, prefix, cachesize, initializing, flags)
* Initialize the database to the specified number of accounts, branches,
* history records, and tellers.
*/
-gint
+int
tp_populate(env, accounts, branches, history, tellers, verbose)
DB_ENV *env;
- gint accounts, branches, history, tellers, verbose;
+ int accounts, branches, history, tellers, verbose;
{
DB *dbp;
u_int32_t balance, idnum, oflags;
u_int32_t end_anum, end_bnum, end_tnum;
u_int32_t start_anum, start_bnum, start_tnum;
- gint ret;
+ int ret;
idnum = BEGID;
balance = 500000;
@@ -388,16 +388,16 @@ tp_populate(env, accounts, branches, history, tellers, verbose)
return (0);
}
-gint
+int
populate(dbp, start_id, balance, nrecs, msg)
DB *dbp;
u_int32_t start_id, balance;
- gint nrecs;
- const gchar *msg;
+ int nrecs;
+ const char *msg;
{
DBT kdbt, ddbt;
defrec drec;
- gint i, ret;
+ int i, ret;
kdbt.flags = 0;
kdbt.data = &drec.id;
@@ -420,15 +420,15 @@ populate(dbp, start_id, balance, nrecs, msg)
return (0);
}
-gint
+int
hpopulate(dbp, history, accounts, branches, tellers)
DB *dbp;
- gint history, accounts, branches, tellers;
+ int history, accounts, branches, tellers;
{
DBT kdbt, ddbt;
histrec hrec;
db_recno_t key;
- gint i, ret;
+ int i, ret;
memset(&kdbt, 0, sizeof(kdbt));
memset(&ddbt, 0, sizeof(ddbt));
@@ -456,7 +456,7 @@ random_int(lo, hi)
u_int32_t lo, hi;
{
u_int32_t ret;
- gint t;
+ int t;
#ifndef RAND_MAX
#define RAND_MAX 0x7fffffff
@@ -471,7 +471,7 @@ random_int(lo, hi)
u_int32_t
random_id(type, accounts, branches, tellers)
FTYPE type;
- gint accounts, branches, tellers;
+ int accounts, branches, tellers;
{
u_int32_t min, max, num;
@@ -493,14 +493,14 @@ random_id(type, accounts, branches, tellers)
return (random_int(min, max));
}
-gint
+int
tp_run(dbenv, n, accounts, branches, tellers, verbose)
DB_ENV *dbenv;
- gint n, accounts, branches, tellers, verbose;
+ int n, accounts, branches, tellers, verbose;
{
DB *adb, *bdb, *hdb, *tdb;
double gtps, itps;
- gint failed, ifailed, ret, txns;
+ int failed, ifailed, ret, txns;
time_t starttime, curtime, lasttime;
adb = bdb = hdb = tdb = NULL;
@@ -584,11 +584,11 @@ err: if (adb != NULL)
/*
* XXX Figure out the appropriate way to pick out IDs.
*/
-gint
+int
tp_txn(dbenv, adb, bdb, tdb, hdb, accounts, branches, tellers, verbose)
DB_ENV *dbenv;
DB *adb, *bdb, *tdb, *hdb;
- gint accounts, branches, tellers, verbose;
+ int accounts, branches, tellers, verbose;
{
DBC *acurs, *bcurs, *tcurs;
DBT d_dbt, d_histdbt, k_dbt, k_histdbt;
@@ -596,7 +596,7 @@ tp_txn(dbenv, adb, bdb, tdb, hdb, accounts, branches, tellers, verbose)
db_recno_t key;
defrec rec;
histrec hrec;
- gint account, branch, teller, ret;
+ int account, branch, teller, ret;
t = NULL;
acurs = bcurs = tcurs = NULL;
diff --git a/libdb/fileops/fileops_auto.c b/libdb/fileops/fileops_auto.c
index 74d9dfc..f38640b 100644
--- a/libdb/fileops/fileops_auto.c
+++ b/libdb/fileops/fileops_auto.c
@@ -19,10 +19,10 @@
#include "dbinc/fop.h"
/*
- * PUBLIC: gint __fop_create_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __fop_create_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, const DBT *, u_int32_t, u_int32_t));
*/
-gint
+int
__fop_create_log(dbenv, txnid, ret_lsnp, flags,
name, appname, mode)
DB_ENV *dbenv;
@@ -38,7 +38,7 @@ __fop_create_log(dbenv, txnid, ret_lsnp, flags,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
rectype = DB___fop_create;
@@ -119,19 +119,19 @@ __fop_create_log(dbenv, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __fop_create_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __fop_create_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__fop_create_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -152,21 +152,21 @@ __fop_create_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __fop_create_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __fop_create_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__fop_create_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__fop_create_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -195,18 +195,18 @@ __fop_create_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __fop_create_read __P((DB_ENV *, gpointer , __fop_create_args **));
+ * PUBLIC: int __fop_create_read __P((DB_ENV *, void *, __fop_create_args **));
*/
-gint
+int
__fop_create_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__fop_create_args **argpp;
{
__fop_create_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__fop_create_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -243,10 +243,10 @@ __fop_create_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __fop_remove_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __fop_remove_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, const DBT *, const DBT *, u_int32_t));
*/
-gint
+int
__fop_remove_log(dbenv, txnid, ret_lsnp, flags,
name, fid, appname)
DB_ENV *dbenv;
@@ -262,7 +262,7 @@ __fop_remove_log(dbenv, txnid, ret_lsnp, flags,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
rectype = DB___fop_remove;
@@ -350,19 +350,19 @@ __fop_remove_log(dbenv, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __fop_remove_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __fop_remove_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__fop_remove_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -383,21 +383,21 @@ __fop_remove_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __fop_remove_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __fop_remove_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__fop_remove_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__fop_remove_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -431,18 +431,18 @@ __fop_remove_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __fop_remove_read __P((DB_ENV *, gpointer , __fop_remove_args **));
+ * PUBLIC: int __fop_remove_read __P((DB_ENV *, void *, __fop_remove_args **));
*/
-gint
+int
__fop_remove_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__fop_remove_args **argpp;
{
__fop_remove_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__fop_remove_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -481,11 +481,11 @@ __fop_remove_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __fop_write_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __fop_write_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, const DBT *, u_int32_t, u_int32_t, const DBT *,
* PUBLIC: u_int32_t));
*/
-gint
+int
__fop_write_log(dbenv, txnid, ret_lsnp, flags,
name, appname, offset, page, flag)
DB_ENV *dbenv;
@@ -503,7 +503,7 @@ __fop_write_log(dbenv, txnid, ret_lsnp, flags,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
rectype = DB___fop_write;
@@ -601,19 +601,19 @@ __fop_write_log(dbenv, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __fop_write_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __fop_write_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__fop_write_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -634,21 +634,21 @@ __fop_write_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __fop_write_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __fop_write_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__fop_write_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__fop_write_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -684,18 +684,18 @@ __fop_write_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __fop_write_read __P((DB_ENV *, gpointer , __fop_write_args **));
+ * PUBLIC: int __fop_write_read __P((DB_ENV *, void *, __fop_write_args **));
*/
-gint
+int
__fop_write_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__fop_write_args **argpp;
{
__fop_write_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__fop_write_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -742,10 +742,10 @@ __fop_write_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __fop_rename_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __fop_rename_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, const DBT *, const DBT *, const DBT *, u_int32_t));
*/
-gint
+int
__fop_rename_log(dbenv, txnid, ret_lsnp, flags,
oldname, newname, fileid, appname)
DB_ENV *dbenv;
@@ -762,7 +762,7 @@ __fop_rename_log(dbenv, txnid, ret_lsnp, flags,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
rectype = DB___fop_rename;
@@ -862,19 +862,19 @@ __fop_rename_log(dbenv, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __fop_rename_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __fop_rename_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__fop_rename_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -895,21 +895,21 @@ __fop_rename_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __fop_rename_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __fop_rename_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__fop_rename_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__fop_rename_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -949,18 +949,18 @@ __fop_rename_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __fop_rename_read __P((DB_ENV *, gpointer , __fop_rename_args **));
+ * PUBLIC: int __fop_rename_read __P((DB_ENV *, void *, __fop_rename_args **));
*/
-gint
+int
__fop_rename_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__fop_rename_args **argpp;
{
__fop_rename_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__fop_rename_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -1005,11 +1005,11 @@ __fop_rename_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __fop_file_remove_log __P((DB_ENV *, DB_TXN *,
+ * PUBLIC: int __fop_file_remove_log __P((DB_ENV *, DB_TXN *,
* PUBLIC: DB_LSN *, u_int32_t, const DBT *, const DBT *, const DBT *,
* PUBLIC: u_int32_t, u_int32_t));
*/
-gint
+int
__fop_file_remove_log(dbenv, txnid, ret_lsnp, flags,
real_fid, tmp_fid, name, appname, child)
DB_ENV *dbenv;
@@ -1027,7 +1027,7 @@ __fop_file_remove_log(dbenv, txnid, ret_lsnp, flags,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
rectype = DB___fop_file_remove;
@@ -1132,19 +1132,19 @@ __fop_file_remove_log(dbenv, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __fop_file_remove_getpgnos __P((DB_ENV *, DBT *,
- * PUBLIC: DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __fop_file_remove_getpgnos __P((DB_ENV *, DBT *,
+ * PUBLIC: DB_LSN *, db_recops, void *));
*/
-gint
+int
__fop_file_remove_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -1165,21 +1165,21 @@ __fop_file_remove_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __fop_file_remove_print __P((DB_ENV *, DBT *,
- * PUBLIC: DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __fop_file_remove_print __P((DB_ENV *, DBT *,
+ * PUBLIC: DB_LSN *, db_recops, void *));
*/
-gint
+int
__fop_file_remove_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__fop_file_remove_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -1220,19 +1220,19 @@ __fop_file_remove_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __fop_file_remove_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int __fop_file_remove_read __P((DB_ENV *, void *,
* PUBLIC: __fop_file_remove_args **));
*/
-gint
+int
__fop_file_remove_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__fop_file_remove_args **argpp;
{
__fop_file_remove_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__fop_file_remove_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -1281,16 +1281,16 @@ __fop_file_remove_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __fop_init_print __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __fop_init_print __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__fop_init_print(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__fop_create_print, DB___fop_create)) != 0)
@@ -1311,16 +1311,16 @@ __fop_init_print(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __fop_init_getpgnos __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __fop_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__fop_init_getpgnos(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__fop_create_getpgnos, DB___fop_create)) != 0)
@@ -1341,16 +1341,16 @@ __fop_init_getpgnos(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __fop_init_recover __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __fop_init_recover __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__fop_init_recover(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__fop_create_recover, DB___fop_create)) != 0)
diff --git a/libdb/fileops/fop_basic.c b/libdb/fileops/fop_basic.c
index 4bbd556..c039518 100644
--- a/libdb/fileops/fop_basic.c
+++ b/libdb/fileops/fop_basic.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -35,23 +35,23 @@ static const gchar revid[] = "$Id$";
* to create DB files now, potentially blobs, queue extents and anything
* else you wish to store in a file system object.
*
- * PUBLIC: gint __fop_create __P((DB_ENV *,
- * PUBLIC: DB_TXN *, DB_FH *, const gchar *, APPNAME, int));
+ * PUBLIC: int __fop_create __P((DB_ENV *,
+ * PUBLIC: DB_TXN *, DB_FH *, const char *, APPNAME, int));
*/
-gint
+int
__fop_create(dbenv, txn, fhp, name, appname, mode)
DB_ENV *dbenv;
DB_TXN *txn;
DB_FH *fhp;
- const gchar *name;
+ const char *name;
APPNAME appname;
- gint mode;
+ int mode;
{
DB_FH fh;
DB_LSN lsn;
DBT data;
- gchar *real_name;
- gint do_close, ret;
+ char *real_name;
+ int do_close, ret;
ret = 0;
real_name = NULL;
@@ -73,7 +73,7 @@ __fop_create(dbenv, txn, fhp, name, appname, mode)
if (DBENV_LOGGING(dbenv)) {
memset(&data, 0, sizeof(data));
- data.data = (gpointer)name;
+ data.data = (void *)name;
data.size = (u_int32_t)strlen(name) + 1;
if ((ret = __fop_create_log(dbenv,
txn, &lsn, DB_FLUSH, &data, (u_int32_t)appname, mode)) != 0)
@@ -98,21 +98,21 @@ DB_TEST_RECOVERY_LABEL
* __fop_remove --
* Remove a file system object.
*
- * PUBLIC: gint __fop_remove __P((DB_ENV *,
- * PUBLIC: DB_TXN *, u_int8_t *, const gchar *, APPNAME));
+ * PUBLIC: int __fop_remove __P((DB_ENV *,
+ * PUBLIC: DB_TXN *, u_int8_t *, const char *, APPNAME));
*/
-gint
+int
__fop_remove(dbenv, txn, fileid, name, appname)
DB_ENV *dbenv;
DB_TXN *txn;
u_int8_t *fileid;
- const gchar *name;
+ const char *name;
APPNAME appname;
{
DB_LSN lsn;
DBT fdbt, ndbt;
- gchar *real_name;
- gint ret;
+ char *real_name;
+ int ret;
real_name = NULL;
@@ -130,7 +130,7 @@ __fop_remove(dbenv, txn, fileid, name, appname)
fdbt.data = fileid;
fdbt.size = fileid == NULL ? 0 : DB_FILE_ID_LEN;
memset(&ndbt, 0, sizeof(ndbt));
- ndbt.data = (gpointer)name;
+ ndbt.data = (void *)name;
ndbt.size = (u_int32_t)strlen(name) + 1;
if ((ret = __fop_remove_log(dbenv,
txn, &lsn, 0, &ndbt, &fdbt, appname)) != 0)
@@ -157,14 +157,14 @@ err: if (real_name != NULL)
* handling, then we'll have to zero out regions on abort (and possibly
* log the before image of the data in the log record).
*
- * PUBLIC: gint __fop_write __P((DB_ENV *, DB_TXN *, const gchar *, APPNAME,
+ * PUBLIC: int __fop_write __P((DB_ENV *, DB_TXN *, const char *, APPNAME,
* PUBLIC: DB_FH *, u_int32_t, u_int8_t *, u_int32_t, u_int32_t));
*/
-gint
+int
__fop_write(dbenv, txn, name, appname, fhp, off, buf, size, istmp)
DB_ENV *dbenv;
DB_TXN *txn;
- const gchar *name;
+ const char *name;
APPNAME appname;
DB_FH *fhp;
u_int32_t off;
@@ -174,8 +174,8 @@ __fop_write(dbenv, txn, name, appname, fhp, off, buf, size, istmp)
DB_FH fh;
DB_LSN lsn;
DBT data, namedbt;
- gchar *real_name;
- gint ret, t_ret, we_opened;
+ char *real_name;
+ int ret, t_ret, we_opened;
size_t nbytes;
ret = 0;
@@ -191,7 +191,7 @@ __fop_write(dbenv, txn, name, appname, fhp, off, buf, size, istmp)
data.data = buf;
data.size = size;
memset(&namedbt, 0, sizeof(namedbt));
- namedbt.data = (gpointer)name;
+ namedbt.data = (void *)name;
namedbt.size = (u_int32_t)strlen(name) + 1;
if ((ret = __fop_write_log(dbenv,
txn, &lsn, 0, &namedbt, appname, off, &data, istmp)) != 0)
@@ -228,22 +228,22 @@ err: if (we_opened)
* __fop_rename --
* Change a file's name.
*
- * PUBLIC: gint __fop_rename __P((DB_ENV *,
- * PUBLIC: DB_TXN *, const gchar *, const gchar *, u_int8_t *, APPNAME));
+ * PUBLIC: int __fop_rename __P((DB_ENV *,
+ * PUBLIC: DB_TXN *, const char *, const char *, u_int8_t *, APPNAME));
*/
-gint
+int
__fop_rename(dbenv, txn, oldname, newname, fid, appname)
DB_ENV *dbenv;
DB_TXN *txn;
- const gchar *oldname;
- const gchar *newname;
+ const char *oldname;
+ const char *newname;
u_int8_t *fid;
APPNAME appname;
{
DB_LSN lsn;
DBT fiddbt, new, old;
- gint ret;
- gchar *n, *o;
+ int ret;
+ char *n, *o;
if ((ret = __db_appname(dbenv, appname, oldname, 0, NULL, &o)) != 0)
goto err;
@@ -254,9 +254,9 @@ __fop_rename(dbenv, txn, oldname, newname, fid, appname)
memset(&old, 0, sizeof(old));
memset(&new, 0, sizeof(new));
memset(&fiddbt, 0, sizeof(fiddbt));
- old.data = (gpointer)oldname;
+ old.data = (void *)oldname;
old.size = (u_int32_t)strlen(oldname) + 1;
- new.data = (gpointer)newname;
+ new.data = (void *)newname;
new.size = (u_int32_t)strlen(newname) + 1;
fiddbt.data = fid;
fiddbt.size = DB_FILE_ID_LEN;
diff --git a/libdb/fileops/fop_rec.c b/libdb/fileops/fop_rec.c
index 989cbd7..1b08fb6 100644
--- a/libdb/fileops/fop_rec.c
+++ b/libdb/fileops/fop_rec.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -27,21 +27,21 @@ static const gchar revid[] = "$Id$";
* __fop_create_recover --
* Recovery function for create.
*
- * PUBLIC: gint __fop_create_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __fop_create_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__fop_create_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
DB_FH fh;
__fop_create_args *argp;
- gchar *real_name;
- gint ret;
+ char *real_name;
+ int ret;
real_name = NULL;
COMPQUIET(info, NULL);
@@ -49,7 +49,7 @@ __fop_create_recover(dbenv, dbtp, lsnp, op, info)
REC_NOOP_INTRO(__fop_create_read);
if ((ret = __db_appname(dbenv, (APPNAME)argp->appname,
- (const gchar *)argp->name.data, 0, NULL, &real_name)) != 0)
+ (const char *)argp->name.data, 0, NULL, &real_name)) != 0)
goto out;
if (DB_UNDO(op))
@@ -71,20 +71,20 @@ out: if (real_name != NULL)
* __fop_remove_recover --
* Recovery function for remove.
*
- * PUBLIC: gint __fop_remove_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __fop_remove_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__fop_remove_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__fop_remove_args *argp;
- gchar *real_name;
- gint ret;
+ char *real_name;
+ int ret;
real_name = NULL;
COMPQUIET(info, NULL);
@@ -92,7 +92,7 @@ __fop_remove_recover(dbenv, dbtp, lsnp, op, info)
REC_NOOP_INTRO(__fop_remove_read);
if ((ret = __db_appname(dbenv, (APPNAME)argp->appname,
- (const gchar *)argp->name.data, 0, NULL, &real_name)) != 0)
+ (const char *)argp->name.data, 0, NULL, &real_name)) != 0)
goto out;
if (DB_REDO(op) && (ret = dbenv->memp_nameop(dbenv,
@@ -109,19 +109,19 @@ out: if (real_name != NULL)
* __fop_write_recover --
* Recovery function for writechunk.
*
- * PUBLIC: gint __fop_write_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __fop_write_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__fop_write_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__fop_write_args *argp;
- gint ret;
+ int ret;
COMPQUIET(info, NULL);
REC_PRINT(__fop_write_print);
@@ -142,21 +142,21 @@ __fop_write_recover(dbenv, dbtp, lsnp, op, info)
* __fop_rename_recover --
* Recovery function for rename.
*
- * PUBLIC: gint __fop_rename_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __fop_rename_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__fop_rename_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__fop_rename_args *argp;
DBMETA *meta;
- gchar *real_new, *real_old, *src;
- gint ret;
+ char *real_new, *real_old, *src;
+ int ret;
u_int8_t *fileid, mbuf[DBMETASIZE];
real_new = NULL;
@@ -170,10 +170,10 @@ __fop_rename_recover(dbenv, dbtp, lsnp, op, info)
fileid = argp->fileid.data;
if ((ret = __db_appname(dbenv, (APPNAME)argp->appname,
- (const gchar *)argp->newname.data, 0, NULL, &real_new)) != 0)
+ (const char *)argp->newname.data, 0, NULL, &real_new)) != 0)
goto out;
if ((ret = __db_appname(dbenv, (APPNAME)argp->appname,
- (const gchar *)argp->oldname.data, 0, NULL, &real_old)) != 0)
+ (const char *)argp->oldname.data, 0, NULL, &real_old)) != 0)
goto out;
/*
@@ -200,10 +200,10 @@ __fop_rename_recover(dbenv, dbtp, lsnp, op, info)
if (DB_UNDO(op))
(void)dbenv->memp_nameop(dbenv, fileid,
- (const gchar *)argp->oldname.data, real_new, real_old);
+ (const char *)argp->oldname.data, real_new, real_old);
if (DB_REDO(op))
(void)dbenv->memp_nameop(dbenv, fileid,
- (const gchar *)argp->newname.data, real_old, real_new);
+ (const char *)argp->newname.data, real_old, real_new);
done: *lsnp = argp->prev_lsn;
out: if (real_new != NULL)
@@ -222,21 +222,21 @@ out: if (real_new != NULL)
* exists and then set the status of the child transaction depending on
* what we find out.
*
- * PUBLIC: gint __fop_file_remove_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __fop_file_remove_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__fop_file_remove_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__fop_file_remove_args *argp;
DBMETA *meta;
- gchar *real_name;
- gint is_real, is_tmp, ret;
+ char *real_name;
+ int is_real, is_tmp, ret;
size_t len;
u_int8_t mbuf[DBMETASIZE];
u_int32_t cstat;
diff --git a/libdb/fileops/fop_util.c b/libdb/fileops/fop_util.c
index c3ea708..4c651bd 100644
--- a/libdb/fileops/fop_util.c
+++ b/libdb/fileops/fop_util.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -28,7 +28,7 @@ static const gchar revid[] = "$Id$";
#include "dbinc/log.h"
#include "dbinc/txn.h"
-static gint __fop_set_pgsize __P((DB *, DB_FH *, const gchar *));
+static int __fop_set_pgsize __P((DB *, DB_FH *, const char *));
/*
* Acquire the environment meta-data lock. The parameters are the
@@ -76,11 +76,11 @@ static gint __fop_set_pgsize __P((DB *, DB_FH *, const gchar *));
* do this as a lock_vec call that releases the enviroment lock before
* acquiring the handle lock.
*
- * PUBLIC: gint __fop_lock_handle __P((DB_ENV *,
+ * PUBLIC: int __fop_lock_handle __P((DB_ENV *,
* PUBLIC: DB *, u_int32_t, db_lockmode_t, DB_LOCK *, u_int32_t));
*
*/
-gint
+int
__fop_lock_handle(dbenv, dbp, locker, mode, elock, flags)
DB_ENV *dbenv;
DB *dbp;
@@ -92,7 +92,7 @@ __fop_lock_handle(dbenv, dbp, locker, mode, elock, flags)
DBT fileobj;
DB_LOCKREQ reqs[2], *ereq;
DB_LOCK_ILOCK lock_desc;
- gint ret;
+ int ret;
if (!LOCKING_ON(dbenv) || F_ISSET(dbp, DB_AM_COMPENSATE))
return (0);
@@ -156,24 +156,24 @@ __fop_lock_handle(dbenv, dbp, locker, mode, elock, flags)
* buffer cache or obtaining a lock (we use this unique fileid to lock
* as well as to identify like files in the cache).
*
- * PUBLIC: gint __fop_file_setup __P((DB *,
- * PUBLIC: DB_TXN *, const gchar *, int, u_int32_t, u_int32_t *));
+ * PUBLIC: int __fop_file_setup __P((DB *,
+ * PUBLIC: DB_TXN *, const char *, int, u_int32_t, u_int32_t *));
*/
-gint
+int
__fop_file_setup(dbp, txn, name, mode, flags, retidp)
DB *dbp;
DB_TXN *txn;
- const gchar *name;
- gint mode;
+ const char *name;
+ int mode;
u_int32_t flags, *retidp;
{
DB_ENV *dbenv;
DB_FH fh, *fhp;
DB_LOCK elock, tmp_lock;
DB_TXN *stxn;
- gchar *real_name, *real_tmpname, *tmpname;
+ char *real_name, *real_tmpname, *tmpname;
db_lockmode_t lmode;
- gint created_fhp, created_locker, ret, tmp_created, t_ret, truncating;
+ int created_fhp, created_locker, ret, tmp_created, t_ret, truncating;
size_t len;
u_int32_t locker, oflags;
u_int8_t mbuf[DBMETASIZE];
@@ -265,7 +265,7 @@ reopen: ret = __fop_read_meta(dbenv, real_name,
*/
if (ret != 0 &&
LF_ISSET(DB_FCNTL_LOCKING) && txn == NULL && len == 0) {
- tmpname = (gchar *)real_name;
+ tmpname = (char *)real_name;
real_name = NULL;
goto creat2;
}
@@ -332,7 +332,7 @@ do_trunc: if ((ret = __os_open(dbenv,
*/
tmp_lock = dbp->handle_lock;
truncating = 1;
- tmpname = (gchar *)name;
+ tmpname = (char *)name;
goto creat2;
}
@@ -489,11 +489,11 @@ static int
__fop_set_pgsize(dbp, fhp, name)
DB *dbp;
DB_FH *fhp;
- const gchar *name;
+ const char *name;
{
DB_ENV *dbenv;
u_int32_t iopsize;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
@@ -539,20 +539,20 @@ __fop_set_pgsize(dbp, fhp, name)
* page lock with a different type (DB_HANDLE_LOCK) for the long-term handle.
* locks.
*
- * PUBLIC: gint __fop_subdb_setup __P((DB *, DB_TXN *,
- * PUBLIC: const gchar *, const gchar *, int, u_int32_t));
+ * PUBLIC: int __fop_subdb_setup __P((DB *, DB_TXN *,
+ * PUBLIC: const char *, const char *, int, u_int32_t));
*/
-gint
+int
__fop_subdb_setup(dbp, txn, mname, name, mode, flags)
DB *dbp;
DB_TXN *txn;
- const gchar *mname, *name;
- gint mode;
+ const char *mname, *name;
+ int mode;
u_int32_t flags;
{
DB *mdbp;
DB_ENV *dbenv;
- gint do_remove, ret;
+ int do_remove, ret;
mdbp = NULL;
dbenv = dbp->dbenv;
@@ -669,21 +669,21 @@ DB_TEST_RECOVERY_LABEL
* __fop_remove_setup --
* Open handle appropriately and lock for removal of a database file.
*
- * PUBLIC: gint __fop_remove_setup __P((DB *,
- * PUBLIC: DB_TXN *, const gchar *, u_int32_t));
+ * PUBLIC: int __fop_remove_setup __P((DB *,
+ * PUBLIC: DB_TXN *, const char *, u_int32_t));
*/
-gint
+int
__fop_remove_setup(dbp, txn, name, flags)
DB *dbp;
DB_TXN *txn;
- const gchar *name;
+ const char *name;
u_int32_t flags;
{
DB_ENV *dbenv;
DB_FH *fhp;
DB_LOCK elock;
u_int8_t mbuf[DBMETASIZE];
- gint ret;
+ int ret;
COMPQUIET(flags, 0);
dbenv = dbp->dbenv;
@@ -744,23 +744,23 @@ err: (void)REL_ENVLOCK(dbenv, &elock);
* Read the meta-data page from a file and return it in buf. The
* open file handle is returned in fhp.
*
- * PUBLIC: gint __fop_read_meta __P((DB_ENV *, const gchar *,
+ * PUBLIC: int __fop_read_meta __P((DB_ENV *, const char *,
* PUBLIC: u_int8_t *, size_t, DB_FH *, int, size_t *, u_int32_t));
*/
-gint
+int
__fop_read_meta(dbenv, name, buf, size, fhp, errok, nbytesp, flags)
DB_ENV *dbenv;
- const gchar *name;
+ const char *name;
u_int8_t *buf;
size_t size;
DB_FH *fhp;
- gint errok;
+ int errok;
size_t *nbytesp;
u_int32_t flags;
{
DB_FH fh, *lfhp;
size_t nr;
- gint myfhp, ret;
+ int myfhp, ret;
nr = 0;
myfhp = 0;
@@ -802,14 +802,14 @@ err: /*
* we use for remove and rename (remove is simply a rename with a delayed
* remove).
*
- * PUBLIC: gint __fop_dummy __P((DB *,
- * PUBLIC: DB_TXN *, const gchar *, const gchar *, u_int32_t));
+ * PUBLIC: int __fop_dummy __P((DB *,
+ * PUBLIC: DB_TXN *, const char *, const char *, u_int32_t));
*/
-gint
+int
__fop_dummy(dbp, txn, old, new, flags)
DB *dbp;
DB_TXN *txn;
- const gchar *old, *new;
+ const char *old, *new;
u_int32_t flags;
{
DB *tmpdbp;
@@ -818,9 +818,9 @@ __fop_dummy(dbp, txn, old, new, flags)
DB_LSN lsn;
DBT fiddbt, namedbt, tmpdbt;
DB_TXN *stxn;
- gchar *back;
- gchar *realback, *realnew, *realold;
- gint ret, t_ret;
+ char *back;
+ char *realback, *realnew, *realold;
+ int ret, t_ret;
u_int8_t mbuf[DBMETASIZE];
u_int32_t locker, stxnid;
@@ -909,7 +909,7 @@ __fop_dummy(dbp, txn, old, new, flags)
fiddbt.size = DB_FILE_ID_LEN;
tmpdbt.data = tmpdbp->fileid;
tmpdbt.size = DB_FILE_ID_LEN;
- namedbt.data = (gpointer)old;
+ namedbt.data = (void *)old;
namedbt.size = (u_int32_t)strlen(old) + 1;
if ((t_ret =
__fop_file_remove_log(dbenv, txn, &lsn, 0, &fiddbt,
@@ -948,17 +948,17 @@ err: (void)REL_ENVLOCK(dbenv, &elock);
* and the subsequent calls in __db_rename do the work for the
* transactional case).
*
- * PUBLIC: gint __fop_dbrename __P((DB *, const gchar *, const gchar *));
+ * PUBLIC: int __fop_dbrename __P((DB *, const char *, const char *));
*/
-gint
+int
__fop_dbrename(dbp, old, new)
DB *dbp;
- const gchar *old, *new;
+ const char *old, *new;
{
DB_ENV *dbenv;
DB_LOCK elock;
- gchar *real_new, *real_old;
- gint ret, tret;
+ char *real_new, *real_old;
+ int ret, tret;
dbenv = dbp->dbenv;
real_new = NULL;
diff --git a/libdb/hash/hash.c b/libdb/hash/hash.c
index b2cef7b..8f22b58 100644
--- a/libdb/hash/hash.c
+++ b/libdb/hash/hash.c
@@ -43,7 +43,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -60,18 +60,18 @@ static const gchar revid[] = "$Id$";
#include "dbinc/hash.h"
#include "dbinc/lock.h"
-static gint __ham_bulk __P((DBC *, DBT *, u_int32_t));
-static gint __ham_c_close __P((DBC *, db_pgno_t, gint *));
-static gint __ham_c_del __P((DBC *));
-static gint __ham_c_destroy __P((DBC *));
-static gint __ham_c_get __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
-static gint __ham_c_put __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
-static gint __ham_c_writelock __P((DBC *));
-static gint __ham_dup_return __P((DBC *, DBT *, u_int32_t));
-static gint __ham_expand_table __P((DBC *));
-static gint __ham_lookup __P((DBC *,
+static int __ham_bulk __P((DBC *, DBT *, u_int32_t));
+static int __ham_c_close __P((DBC *, db_pgno_t, int *));
+static int __ham_c_del __P((DBC *));
+static int __ham_c_destroy __P((DBC *));
+static int __ham_c_get __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
+static int __ham_c_put __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
+static int __ham_c_writelock __P((DBC *));
+static int __ham_dup_return __P((DBC *, DBT *, u_int32_t));
+static int __ham_expand_table __P((DBC *));
+static int __ham_lookup __P((DBC *,
const DBT *, u_int32_t, db_lockmode_t, db_pgno_t *));
-static gint __ham_overwrite __P((DBC *, DBT *, u_int32_t));
+static int __ham_overwrite __P((DBC *, DBT *, u_int32_t));
/*
* __ham_quick_delete --
@@ -91,13 +91,13 @@ static gint __ham_overwrite __P((DBC *, DBT *, u_int32_t));
* set, or to the sole key/data pair when the key does not have a
* duplicate set, before the function is called.
*
- * PUBLIC: gint __ham_quick_delete __P((DBC *));
+ * PUBLIC: int __ham_quick_delete __P((DBC *));
*/
-gint
+int
__ham_quick_delete(dbc)
DBC *dbc;
{
- gint ret, t_ret;
+ int ret, t_ret;
if ((ret = __ham_get_meta(dbc)) != 0)
return (ret);
@@ -126,15 +126,15 @@ __ham_quick_delete(dbc)
* __ham_c_init --
* Initialize the hash-specific portion of a cursor.
*
- * PUBLIC: gint __ham_c_init __P((DBC *));
+ * PUBLIC: int __ham_c_init __P((DBC *));
*/
-gint
+int
__ham_c_init(dbc)
DBC *dbc;
{
DB_ENV *dbenv;
HASH_CURSOR *new_curs;
- gint ret;
+ int ret;
dbenv = dbc->dbp->dbenv;
if ((ret = __os_calloc(dbenv,
@@ -175,12 +175,12 @@ static int
__ham_c_close(dbc, root_pgno, rmroot)
DBC *dbc;
db_pgno_t root_pgno;
- gint *rmroot;
+ int *rmroot;
{
DB_MPOOLFILE *mpf;
HASH_CURSOR *hcp;
HKEYDATA *dp;
- gint doroot, gotmeta, ret, t_ret;
+ int doroot, gotmeta, ret, t_ret;
u_int32_t dirty;
COMPQUIET(rmroot, 0);
@@ -248,9 +248,9 @@ __ham_c_destroy(dbc)
* __ham_c_count --
* Return a count of on-page duplicates.
*
- * PUBLIC: gint __ham_c_count __P((DBC *, db_recno_t *));
+ * PUBLIC: int __ham_c_count __P((DBC *, db_recno_t *));
*/
-gint
+int
__ham_c_count(dbc, recnop)
DBC *dbc;
db_recno_t *recnop;
@@ -260,7 +260,7 @@ __ham_c_count(dbc, recnop)
HASH_CURSOR *hcp;
db_indx_t len;
db_recno_t recno;
- gint ret, t_ret;
+ int ret, t_ret;
u_int8_t *p, *pend;
dbp = dbc->dbp;
@@ -309,7 +309,7 @@ __ham_c_del(dbc)
DBT repldbt;
DB_MPOOLFILE *mpf;
HASH_CURSOR *hcp;
- gint ret, t_ret;
+ int ret, t_ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -368,9 +368,9 @@ out: if (hcp->page != NULL) {
* Duplicate a hash cursor, such that the new one holds appropriate
* locks for the position of the original.
*
- * PUBLIC: gint __ham_c_dup __P((DBC *, DBC *));
+ * PUBLIC: int __ham_c_dup __P((DBC *, DBC *));
*/
-gint
+int
__ham_c_dup(orig_dbc, new_dbc)
DBC *orig_dbc, *new_dbc;
{
@@ -418,7 +418,7 @@ __ham_c_get(dbc, key, data, flags, pgnop)
DB_MPOOLFILE *mpf;
HASH_CURSOR *hcp;
db_lockmode_t lock_type;
- gint get_key, ret, t_ret;
+ int get_key, ret, t_ret;
hcp = (HASH_CURSOR *)dbc->internal;
dbp = dbc->dbp;
@@ -603,8 +603,8 @@ __ham_bulk(dbc, data, flags)
int32_t *endp, key_off, *offp, *saveoff;
u_int32_t key_size, size, space;
u_int8_t *dbuf, *dp, *hk, *np, *tmp;
- gint is_dup, is_key;
- gint need_pg, next_key, no_dup, pagesize, ret, t_ret;
+ int is_dup, is_key;
+ int need_pg, next_key, no_dup, pagesize, ret, t_ret;
ret = 0;
key_off = 0;
@@ -973,7 +973,7 @@ __ham_c_put(dbc, key, data, flags, pgnop)
DBT tmp_val, *myval;
HASH_CURSOR *hcp;
u_int32_t nbytes;
- gint ret, t_ret;
+ int ret, t_ret;
/*
* The compiler doesn't realize that we only use this when ret is
@@ -1088,7 +1088,7 @@ __ham_expand_table(dbc)
PAGE *h;
db_pgno_t pgno, mpgno;
u_int32_t newalloc, new_bucket, old_bucket;
- gint dirty_meta, got_meta, logn, new_double, ret;
+ int dirty_meta, got_meta, logn, new_double, ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -1269,7 +1269,7 @@ __ham_dup_return(dbc, val, flags)
db_pgno_t pgno;
u_int32_t off, tlen;
u_int8_t *hk, type;
- gint cmp, ret;
+ int cmp, ret;
db_indx_t len;
/* Check for duplicate and return the first one. */
@@ -1455,11 +1455,11 @@ __ham_overwrite(dbc, nval, flags)
DB_ENV *dbenv;
HASH_CURSOR *hcp;
DBT *myval, tmp_val, tmp_val2;
- gpointer newrec;
+ void *newrec;
u_int8_t *hk, *p;
u_int32_t len, nondup_size;
db_indx_t newsize;
- gint ret;
+ int ret;
dbp = dbc->dbp;
dbenv = dbp->dbenv;
@@ -1664,7 +1664,7 @@ __ham_lookup(dbc, key, sought, mode, pgnop)
HASH_CURSOR *hcp;
db_pgno_t pgno;
u_int32_t tlen;
- gint match, ret;
+ int match, ret;
u_int8_t *hk, *dk;
dbp = dbc->dbp;
@@ -1741,18 +1741,18 @@ found_key: F_SET(hcp, H_OK);
* Initialize a dbt using some possibly already allocated storage
* for items.
*
- * PUBLIC: gint __ham_init_dbt __P((DB_ENV *,
- * PUBLIC: DBT *, u_int32_t, gpointer *, u_int32_t *));
+ * PUBLIC: int __ham_init_dbt __P((DB_ENV *,
+ * PUBLIC: DBT *, u_int32_t, void **, u_int32_t *));
*/
-gint
+int
__ham_init_dbt(dbenv, dbt, size, bufp, sizep)
DB_ENV *dbenv;
DBT *dbt;
u_int32_t size;
- gpointer *bufp;
+ void **bufp;
u_int32_t *sizep;
{
- gint ret;
+ int ret;
memset(dbt, 0, sizeof(*dbt));
if (*sizep < size) {
@@ -1777,14 +1777,14 @@ __ham_init_dbt(dbenv, dbt, size, bufp, sizep)
* added (add == 1) or deleted (add == 0).
* dup indicates if the addition occurred into a duplicate set.
*
- * PUBLIC: gint __ham_c_update
+ * PUBLIC: int __ham_c_update
* PUBLIC: __P((DBC *, u_int32_t, int, int));
*/
-gint
+int
__ham_c_update(dbc, len, add, is_dup)
DBC *dbc;
u_int32_t len;
- gint add, is_dup;
+ int add, is_dup;
{
DB *dbp, *ldbp;
DBC *cp;
@@ -1792,7 +1792,7 @@ __ham_c_update(dbc, len, add, is_dup)
DB_LSN lsn;
DB_TXN *my_txn;
HASH_CURSOR *hcp, *lcp;
- gint found, ret;
+ int found, ret;
u_int32_t order;
dbp = dbc->dbp;
@@ -1965,9 +1965,9 @@ __ham_c_update(dbc, len, add, is_dup)
* cursors on a split. The latter is so we can update cursors when we
* move items off page.
*
- * PUBLIC: gint __ham_get_clist __P((DB *, db_pgno_t, u_int32_t, DBC ***));
+ * PUBLIC: int __ham_get_clist __P((DB *, db_pgno_t, u_int32_t, DBC ***));
*/
-gint
+int
__ham_get_clist(dbp, pgno, indx, listp)
DB *dbp;
db_pgno_t pgno;
@@ -1977,7 +1977,7 @@ __ham_get_clist(dbp, pgno, indx, listp)
DB *ldbp;
DBC *cp;
DB_ENV *dbenv;
- gint nalloc, nused, ret;
+ int nalloc, nused, ret;
/*
* Assume that finding anything is the exception, so optimize for
@@ -2039,7 +2039,7 @@ __ham_c_writelock(dbc)
DB_ENV *dbenv;
DB_LOCK tmp_lock;
HASH_CURSOR *hcp;
- gint ret;
+ int ret;
/*
* All we need do is acquire the lock and let the off-page
diff --git a/libdb/hash/hash_auto.c b/libdb/hash/hash_auto.c
index f4ae9d3..918797b 100644
--- a/libdb/hash/hash_auto.c
+++ b/libdb/hash/hash_auto.c
@@ -19,11 +19,11 @@
#include "dbinc/txn.h"
/*
- * PUBLIC: gint __ham_insdel_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __ham_insdel_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, u_int32_t, db_pgno_t, u_int32_t, DB_LSN *,
* PUBLIC: const DBT *, const DBT *));
*/
-gint
+int
__ham_insdel_log(dbp, txnid, ret_lsnp, flags,
opcode, pgno, ndx, pagelsn, key,
data)
@@ -44,7 +44,7 @@ __ham_insdel_log(dbp, txnid, ret_lsnp, flags,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -160,16 +160,16 @@ __ham_insdel_log(dbp, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __ham_insdel_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __ham_insdel_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__ham_insdel_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -206,21 +206,21 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __ham_insdel_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __ham_insdel_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__ham_insdel_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__ham_insdel_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -259,18 +259,18 @@ __ham_insdel_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __ham_insdel_read __P((DB_ENV *, gpointer , __ham_insdel_args **));
+ * PUBLIC: int __ham_insdel_read __P((DB_ENV *, void *, __ham_insdel_args **));
*/
-gint
+int
__ham_insdel_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__ham_insdel_args **argpp;
{
__ham_insdel_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__ham_insdel_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -324,11 +324,11 @@ __ham_insdel_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __ham_newpage_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __ham_newpage_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *,
* PUBLIC: db_pgno_t, DB_LSN *));
*/
-gint
+int
__ham_newpage_log(dbp, txnid, ret_lsnp, flags,
opcode, prev_pgno, prevlsn, new_pgno, pagelsn,
next_pgno, nextlsn)
@@ -349,7 +349,7 @@ __ham_newpage_log(dbp, txnid, ret_lsnp, flags,
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -460,16 +460,16 @@ __ham_newpage_log(dbp, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __ham_newpage_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __ham_newpage_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__ham_newpage_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -528,19 +528,19 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __ham_newpage_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __ham_newpage_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__ham_newpage_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__ham_newpage_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -572,19 +572,19 @@ __ham_newpage_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __ham_newpage_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int __ham_newpage_read __P((DB_ENV *, void *,
* PUBLIC: __ham_newpage_args **));
*/
-gint
+int
__ham_newpage_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__ham_newpage_args **argpp;
{
__ham_newpage_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__ham_newpage_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -636,10 +636,10 @@ __ham_newpage_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __ham_splitdata_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __ham_splitdata_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, u_int32_t, db_pgno_t, const DBT *, DB_LSN *));
*/
-gint
+int
__ham_splitdata_log(dbp, txnid, ret_lsnp, flags, opcode, pgno, pageimage, pagelsn)
DB *dbp;
DB_TXN *txnid;
@@ -656,7 +656,7 @@ __ham_splitdata_log(dbp, txnid, ret_lsnp, flags, opcode, pgno, pageimage, pagels
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -755,16 +755,16 @@ __ham_splitdata_log(dbp, txnid, ret_lsnp, flags, opcode, pgno, pageimage, pagels
}
/*
- * PUBLIC: gint __ham_splitdata_getpgnos __P((DB_ENV *, DBT *,
- * PUBLIC: DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __ham_splitdata_getpgnos __P((DB_ENV *, DBT *,
+ * PUBLIC: DB_LSN *, db_recops, void *));
*/
-gint
+int
__ham_splitdata_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -801,21 +801,21 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __ham_splitdata_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __ham_splitdata_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__ham_splitdata_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__ham_splitdata_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -847,19 +847,19 @@ __ham_splitdata_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __ham_splitdata_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int __ham_splitdata_read __P((DB_ENV *, void *,
* PUBLIC: __ham_splitdata_args **));
*/
-gint
+int
__ham_splitdata_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__ham_splitdata_args **argpp;
{
__ham_splitdata_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__ham_splitdata_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -903,11 +903,11 @@ __ham_splitdata_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __ham_replace_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __ham_replace_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_pgno_t, u_int32_t, DB_LSN *, int32_t, const DBT *,
* PUBLIC: const DBT *, u_int32_t));
*/
-gint
+int
__ham_replace_log(dbp, txnid, ret_lsnp, flags, pgno, ndx, pagelsn, off, olditem,
newitem, makedup)
DB *dbp;
@@ -928,7 +928,7 @@ __ham_replace_log(dbp, txnid, ret_lsnp, flags, pgno, ndx, pagelsn, off, olditem,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -1049,16 +1049,16 @@ __ham_replace_log(dbp, txnid, ret_lsnp, flags, pgno, ndx, pagelsn, off, olditem,
}
/*
- * PUBLIC: gint __ham_replace_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __ham_replace_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__ham_replace_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -1095,21 +1095,21 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __ham_replace_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __ham_replace_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__ham_replace_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__ham_replace_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -1149,19 +1149,19 @@ __ham_replace_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __ham_replace_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int __ham_replace_read __P((DB_ENV *, void *,
* PUBLIC: __ham_replace_args **));
*/
-gint
+int
__ham_replace_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__ham_replace_args **argpp;
{
__ham_replace_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__ham_replace_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -1219,11 +1219,11 @@ __ham_replace_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __ham_copypage_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __ham_copypage_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t,
* PUBLIC: DB_LSN *, const DBT *));
*/
-gint
+int
__ham_copypage_log(dbp, txnid, ret_lsnp, flags, pgno, pagelsn, next_pgno, nextlsn, nnext_pgno,
nnextlsn, page)
DB *dbp;
@@ -1244,7 +1244,7 @@ __ham_copypage_log(dbp, txnid, ret_lsnp, flags, pgno, pagelsn, next_pgno, nextls
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -1362,16 +1362,16 @@ __ham_copypage_log(dbp, txnid, ret_lsnp, flags, pgno, pagelsn, next_pgno, nextls
}
/*
- * PUBLIC: gint __ham_copypage_getpgnos __P((DB_ENV *, DBT *,
- * PUBLIC: DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __ham_copypage_getpgnos __P((DB_ENV *, DBT *,
+ * PUBLIC: DB_LSN *, db_recops, void *));
*/
-gint
+int
__ham_copypage_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -1426,21 +1426,21 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __ham_copypage_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __ham_copypage_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__ham_copypage_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__ham_copypage_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -1477,19 +1477,19 @@ __ham_copypage_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __ham_copypage_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int __ham_copypage_read __P((DB_ENV *, void *,
* PUBLIC: __ham_copypage_args **));
*/
-gint
+int
__ham_copypage_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__ham_copypage_args **argpp;
{
__ham_copypage_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__ham_copypage_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -1543,11 +1543,11 @@ __ham_copypage_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __ham_metagroup_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __ham_metagroup_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *,
* PUBLIC: db_pgno_t, DB_LSN *, u_int32_t));
*/
-gint
+int
__ham_metagroup_log(dbp, txnid, ret_lsnp, flags, bucket, mmpgno, mmetalsn, mpgno, metalsn,
pgno, pagelsn, newalloc)
DB *dbp;
@@ -1568,7 +1568,7 @@ __ham_metagroup_log(dbp, txnid, ret_lsnp, flags, bucket, mmpgno, mmetalsn, mpgno
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -1684,16 +1684,16 @@ __ham_metagroup_log(dbp, txnid, ret_lsnp, flags, bucket, mmpgno, mmetalsn, mpgno
}
/*
- * PUBLIC: gint __ham_metagroup_getpgnos __P((DB_ENV *, DBT *,
- * PUBLIC: DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __ham_metagroup_getpgnos __P((DB_ENV *, DBT *,
+ * PUBLIC: DB_LSN *, db_recops, void *));
*/
-gint
+int
__ham_metagroup_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -1748,19 +1748,19 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __ham_metagroup_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __ham_metagroup_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__ham_metagroup_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__ham_metagroup_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -1793,19 +1793,19 @@ __ham_metagroup_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __ham_metagroup_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int __ham_metagroup_read __P((DB_ENV *, void *,
* PUBLIC: __ham_metagroup_args **));
*/
-gint
+int
__ham_metagroup_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__ham_metagroup_args **argpp;
{
__ham_metagroup_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__ham_metagroup_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -1861,10 +1861,10 @@ __ham_metagroup_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __ham_groupalloc_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __ham_groupalloc_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_pgno_t));
*/
-gint
+int
__ham_groupalloc_log(dbp, txnid, ret_lsnp, flags, meta_lsn, start_pgno, num, free)
DB *dbp;
DB_TXN *txnid;
@@ -1880,7 +1880,7 @@ __ham_groupalloc_log(dbp, txnid, ret_lsnp, flags, meta_lsn, start_pgno, num, fre
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -1972,16 +1972,16 @@ __ham_groupalloc_log(dbp, txnid, ret_lsnp, flags, meta_lsn, start_pgno, num, fre
}
/*
- * PUBLIC: gint __ham_groupalloc_getpgnos __P((DB_ENV *, DBT *,
- * PUBLIC: DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __ham_groupalloc_getpgnos __P((DB_ENV *, DBT *,
+ * PUBLIC: DB_LSN *, db_recops, void *));
*/
-gint
+int
__ham_groupalloc_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -2018,19 +2018,19 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __ham_groupalloc_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __ham_groupalloc_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__ham_groupalloc_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__ham_groupalloc_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -2057,19 +2057,19 @@ __ham_groupalloc_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __ham_groupalloc_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int __ham_groupalloc_read __P((DB_ENV *, void *,
* PUBLIC: __ham_groupalloc_args **));
*/
-gint
+int
__ham_groupalloc_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__ham_groupalloc_args **argpp;
{
__ham_groupalloc_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__ham_groupalloc_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -2111,11 +2111,11 @@ __ham_groupalloc_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __ham_curadj_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __ham_curadj_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_pgno_t, u_int32_t, u_int32_t, u_int32_t, int, int,
* PUBLIC: u_int32_t));
*/
-gint
+int
__ham_curadj_log(dbp, txnid, ret_lsnp, flags, pgno, indx, len, dup_off, add,
is_dup, order)
DB *dbp;
@@ -2126,8 +2126,8 @@ __ham_curadj_log(dbp, txnid, ret_lsnp, flags, pgno, indx, len, dup_off, add,
u_int32_t indx;
u_int32_t len;
u_int32_t dup_off;
- gint add;
- gint is_dup;
+ int add;
+ int is_dup;
u_int32_t order;
{
DBT logrec;
@@ -2135,7 +2135,7 @@ __ham_curadj_log(dbp, txnid, ret_lsnp, flags, pgno, indx, len, dup_off, add,
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -2240,19 +2240,19 @@ __ham_curadj_log(dbp, txnid, ret_lsnp, flags, pgno, indx, len, dup_off, add,
}
/*
- * PUBLIC: gint __ham_curadj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __ham_curadj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__ham_curadj_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -2273,19 +2273,19 @@ __ham_curadj_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __ham_curadj_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __ham_curadj_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__ham_curadj_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__ham_curadj_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -2314,18 +2314,18 @@ __ham_curadj_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __ham_curadj_read __P((DB_ENV *, gpointer , __ham_curadj_args **));
+ * PUBLIC: int __ham_curadj_read __P((DB_ENV *, void *, __ham_curadj_args **));
*/
-gint
+int
__ham_curadj_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__ham_curadj_args **argpp;
{
__ham_curadj_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__ham_curadj_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -2380,11 +2380,11 @@ __ham_curadj_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __ham_chgpg_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __ham_chgpg_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_ham_mode, db_pgno_t, db_pgno_t, u_int32_t,
* PUBLIC: u_int32_t));
*/
-gint
+int
__ham_chgpg_log(dbp, txnid, ret_lsnp, flags, mode, old_pgno, new_pgno, old_indx, new_indx)
DB *dbp;
DB_TXN *txnid;
@@ -2401,7 +2401,7 @@ __ham_chgpg_log(dbp, txnid, ret_lsnp, flags, mode, old_pgno, new_pgno, old_indx,
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -2496,19 +2496,19 @@ __ham_chgpg_log(dbp, txnid, ret_lsnp, flags, mode, old_pgno, new_pgno, old_indx,
}
/*
- * PUBLIC: gint __ham_chgpg_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __ham_chgpg_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__ham_chgpg_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -2529,19 +2529,19 @@ __ham_chgpg_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __ham_chgpg_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __ham_chgpg_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__ham_chgpg_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__ham_chgpg_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -2568,18 +2568,18 @@ __ham_chgpg_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __ham_chgpg_read __P((DB_ENV *, gpointer , __ham_chgpg_args **));
+ * PUBLIC: int __ham_chgpg_read __P((DB_ENV *, void *, __ham_chgpg_args **));
*/
-gint
+int
__ham_chgpg_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__ham_chgpg_args **argpp;
{
__ham_chgpg_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__ham_chgpg_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -2626,16 +2626,16 @@ __ham_chgpg_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __ham_init_print __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __ham_init_print __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__ham_init_print(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__ham_insdel_print, DB___ham_insdel)) != 0)
@@ -2668,16 +2668,16 @@ __ham_init_print(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __ham_init_getpgnos __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __ham_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__ham_init_getpgnos(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__ham_insdel_getpgnos, DB___ham_insdel)) != 0)
@@ -2710,16 +2710,16 @@ __ham_init_getpgnos(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __ham_init_recover __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __ham_init_recover __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__ham_init_recover(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__ham_insdel_recover, DB___ham_insdel)) != 0)
diff --git a/libdb/hash/hash_conv.c b/libdb/hash/hash_conv.c
index 64e0625..073aecc 100644
--- a/libdb/hash/hash_conv.c
+++ b/libdb/hash/hash_conv.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,14 +24,14 @@ static const gchar revid[] = "$Id$";
* Convert host-specific page layout from the host-independent format
* stored on disk.
*
- * PUBLIC: gint __ham_pgin __P((DB_ENV *, DB *, db_pgno_t, gpointer , DBT *));
+ * PUBLIC: int __ham_pgin __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
*/
-gint
+int
__ham_pgin(dbenv, dummydbp, pg, pp, cookie)
DB_ENV *dbenv;
DB *dummydbp;
db_pgno_t pg;
- gpointer pp;
+ void *pp;
DBT *cookie;
{
DB_PGINFO *pginfo;
@@ -63,14 +63,14 @@ __ham_pgin(dbenv, dummydbp, pg, pp, cookie)
* Convert host-specific page layout to the host-independent format
* stored on disk.
*
- * PUBLIC: gint __ham_pgout __P((DB_ENV *, DB *, db_pgno_t, gpointer , DBT *));
+ * PUBLIC: int __ham_pgout __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
*/
-gint
+int
__ham_pgout(dbenv, dummydbp, pg, pp, cookie)
DB_ENV *dbenv;
DB *dummydbp;
db_pgno_t pg;
- gpointer pp;
+ void *pp;
DBT *cookie;
{
DB_PGINFO *pginfo;
@@ -89,14 +89,14 @@ __ham_pgout(dbenv, dummydbp, pg, pp, cookie)
* __ham_mswap --
* Swap the bytes on the hash metadata page.
*
- * PUBLIC: gint __ham_mswap __P((gpointer));
+ * PUBLIC: int __ham_mswap __P((void *));
*/
-gint
+int
__ham_mswap(pg)
- gpointer pg;
+ void *pg;
{
u_int8_t *p;
- gint i;
+ int i;
__db_metaswap(pg);
diff --git a/libdb/hash/hash_dup.c b/libdb/hash/hash_dup.c
index c041863..102fab5 100644
--- a/libdb/hash/hash_dup.c
+++ b/libdb/hash/hash_dup.c
@@ -38,7 +38,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
/*
@@ -59,11 +59,11 @@ static const gchar revid[] = "$Id$";
#include "dbinc/hash.h"
#include "dbinc/btree.h"
-static gint __ham_c_chgpg __P((DBC *,
+static int __ham_c_chgpg __P((DBC *,
db_pgno_t, u_int32_t, db_pgno_t, u_int32_t));
-static gint __ham_check_move __P((DBC *, u_int32_t));
-static gint __ham_dcursor __P((DBC *, db_pgno_t, u_int32_t));
-static gint __ham_move_offpage __P((DBC *, PAGE *, u_int32_t, db_pgno_t));
+static int __ham_check_move __P((DBC *, u_int32_t));
+static int __ham_dcursor __P((DBC *, db_pgno_t, u_int32_t));
+static int __ham_move_offpage __P((DBC *, PAGE *, u_int32_t, db_pgno_t));
/*
* Called from hash_access to add a duplicate key. nval is the new
@@ -78,9 +78,9 @@ static gint __ham_move_offpage __P((DBC *, PAGE *, u_int32_t, db_pgno_t));
* Case 4: The element is large enough to push the duplicate set onto a
* separate page.
*
- * PUBLIC: gint __ham_add_dup __P((DBC *, DBT *, u_int32_t, db_pgno_t *));
+ * PUBLIC: int __ham_add_dup __P((DBC *, DBT *, u_int32_t, db_pgno_t *));
*/
-gint
+int
__ham_add_dup(dbc, nval, flags, pgnop)
DBC *dbc;
DBT *nval;
@@ -92,7 +92,7 @@ __ham_add_dup(dbc, nval, flags, pgnop)
DB_MPOOLFILE *mpf;
HASH_CURSOR *hcp;
u_int32_t add_bytes, new_size;
- gint cmp, ret;
+ int cmp, ret;
u_int8_t *hk;
dbp = dbc->dbp;
@@ -237,9 +237,9 @@ __ham_add_dup(dbc, nval, flags, pgnop)
/*
* Convert an on-page set of duplicates to an offpage set of duplicates.
*
- * PUBLIC: gint __ham_dup_convert __P((DBC *));
+ * PUBLIC: int __ham_dup_convert __P((DBC *));
*/
-gint
+int
__ham_dup_convert(dbc)
DBC *dbc;
{
@@ -253,7 +253,7 @@ __ham_dup_convert(dbc)
HOFFPAGE ho;
PAGE *dp;
db_indx_t i, len, off;
- gint c, ret, t_ret;
+ int c, ret, t_ret;
u_int8_t *p, *pend;
dbp = dbc->dbp;
@@ -393,19 +393,19 @@ err: if (ret == 0)
* information set appropriately. If the incoming dbt is a partial, assume
* we are creating a new entry and make sure that we do any initial padding.
*
- * PUBLIC: gint __ham_make_dup __P((DB_ENV *,
- * PUBLIC: const DBT *, DBT *d, gpointer *, u_int32_t *));
+ * PUBLIC: int __ham_make_dup __P((DB_ENV *,
+ * PUBLIC: const DBT *, DBT *d, void **, u_int32_t *));
*/
-gint
+int
__ham_make_dup(dbenv, notdup, duplicate, bufp, sizep)
DB_ENV *dbenv;
const DBT *notdup;
DBT *duplicate;
- gpointer *bufp;
+ void **bufp;
u_int32_t *sizep;
{
db_indx_t tsize, item_size;
- gint ret;
+ int ret;
u_int8_t *p;
item_size = (db_indx_t)notdup->size;
@@ -457,7 +457,7 @@ __ham_check_move(dbc, add_len)
db_pgno_t next_pgno;
u_int32_t new_datalen, old_len, rectype;
u_int8_t *hk;
- gint ret;
+ int ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -647,7 +647,7 @@ __ham_move_offpage(dbc, pagep, ndx, pgno)
db_indx_t i, *inp;
int32_t shrink;
u_int8_t *src;
- gint ret;
+ int ret;
dbp = dbc->dbp;
od.type = H_OFFDUP;
@@ -694,20 +694,20 @@ __ham_move_offpage(dbc, pagep, ndx, pgno)
* we exit with the cursor set appropriately.
*
* PUBLIC: void __ham_dsearch
- * PUBLIC: __P((DBC *, DBT *, u_int32_t *, gint *, u_int32_t));
+ * PUBLIC: __P((DBC *, DBT *, u_int32_t *, int *, u_int32_t));
*/
void
__ham_dsearch(dbc, dbt, offp, cmpp, flags)
DBC *dbc;
DBT *dbt;
u_int32_t *offp, flags;
- gint *cmpp;
+ int *cmpp;
{
DB *dbp;
HASH_CURSOR *hcp;
DBT cur;
db_indx_t i, len;
- gint (*func) __P((DB *, const DBT *, const DBT *));
+ int (*func) __P((DB *, const DBT *, const DBT *));
u_int8_t *data;
dbp = dbc->dbp;
@@ -786,7 +786,7 @@ __ham_dcursor(dbc, pgno, indx)
DB *dbp;
HASH_CURSOR *hcp;
BTREE_CURSOR *dcp;
- gint ret;
+ int ret;
dbp = dbc->dbp;
hcp = (HASH_CURSOR *)dbc->internal;
@@ -840,7 +840,7 @@ __ham_c_chgpg(dbc, old_pgno, old_index, new_pgno, new_index)
DB_TXN *my_txn;
DBC *cp;
HASH_CURSOR *hcp;
- gint found, ret;
+ int found, ret;
dbp = dbc->dbp;
dbenv = dbp->dbenv;
diff --git a/libdb/hash/hash_func.c b/libdb/hash/hash_func.c
index de47adf..3d0509a 100644
--- a/libdb/hash/hash_func.c
+++ b/libdb/hash/hash_func.c
@@ -43,7 +43,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -56,14 +56,14 @@ static const gchar revid[] = "$Id$";
* __ham_func2 --
* Phong Vo's linear congruential hash.
*
- * PUBLIC: u_int32_t __ham_func2 __P((DB *, gconstpointer , u_int32_t));
+ * PUBLIC: u_int32_t __ham_func2 __P((DB *, const void *, u_int32_t));
*/
#define DCHARHASH(h, c) ((h) = 0x63c63cd9*(h) + 0x9c39c33d + (c))
u_int32_t
__ham_func2(dbp, key, len)
DB *dbp;
- gconstpointer key;
+ const void *key;
u_int32_t len;
{
const u_int8_t *e, *k;
@@ -93,12 +93,12 @@ __ham_func2(dbp, key, len)
* iteration, perform 8 HASHC's so we handle all 8 bytes. Essentially, this
* saves us 7 cmp & branch instructions.
*
- * PUBLIC: u_int32_t __ham_func3 __P((DB *, gconstpointer , u_int32_t));
+ * PUBLIC: u_int32_t __ham_func3 __P((DB *, const void *, u_int32_t));
*/
u_int32_t
__ham_func3(dbp, key, len)
DB *dbp;
- gconstpointer key;
+ const void *key;
u_int32_t len;
{
const u_int8_t *k;
@@ -144,12 +144,12 @@ __ham_func3(dbp, key, len)
* slightly worse than __ham_func5 on strings, it performs horribly on
* numbers.
*
- * PUBLIC: u_int32_t __ham_func4 __P((DB *, gconstpointer , u_int32_t));
+ * PUBLIC: u_int32_t __ham_func4 __P((DB *, const void *, u_int32_t));
*/
u_int32_t
__ham_func4(dbp, key, len)
DB *dbp;
- gconstpointer key;
+ const void *key;
u_int32_t len;
{
const u_int8_t *k;
@@ -205,12 +205,12 @@ __ham_func4(dbp, key, len)
* This hash produces the fewest collisions of any function that we've seen so
* far, and works well on both numbers and strings.
*
- * PUBLIC: u_int32_t __ham_func5 __P((DB *, gconstpointer , u_int32_t));
+ * PUBLIC: u_int32_t __ham_func5 __P((DB *, const void *, u_int32_t));
*/
u_int32_t
__ham_func5(dbp, key, len)
DB *dbp;
- gconstpointer key;
+ const void *key;
u_int32_t len;
{
const u_int8_t *k, *e;
@@ -231,15 +231,15 @@ __ham_func5(dbp, key, len)
/*
* __ham_test --
*
- * PUBLIC: u_int32_t __ham_test __P((DB *, gconstpointer , u_int32_t));
+ * PUBLIC: u_int32_t __ham_test __P((DB *, const void *, u_int32_t));
*/
u_int32_t
__ham_test(dbp, key, len)
DB *dbp;
- gconstpointer key;
+ const void *key;
u_int32_t len;
{
COMPQUIET(dbp, NULL);
COMPQUIET(len, 0);
- return ((u_int32_t)*(gchar *)key);
+ return ((u_int32_t)*(char *)key);
}
diff --git a/libdb/hash/hash_meta.c b/libdb/hash/hash_meta.c
index 32e0bfc..cdf1087 100644
--- a/libdb/hash/hash_meta.c
+++ b/libdb/hash/hash_meta.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,9 +24,9 @@ static const gchar revid[] = "$Id$";
/*
* Acquire the meta-data page.
*
- * PUBLIC: gint __ham_get_meta __P((DBC *));
+ * PUBLIC: int __ham_get_meta __P((DBC *));
*/
-gint
+int
__ham_get_meta(dbc)
DBC *dbc;
{
@@ -35,7 +35,7 @@ __ham_get_meta(dbc)
DB_MPOOLFILE *mpf;
HASH *hashp;
HASH_CURSOR *hcp;
- gint ret;
+ int ret;
dbp = dbc->dbp;
dbenv = dbp->dbenv;
@@ -63,9 +63,9 @@ __ham_get_meta(dbc)
/*
* Release the meta-data page.
*
- * PUBLIC: gint __ham_release_meta __P((DBC *));
+ * PUBLIC: int __ham_release_meta __P((DBC *));
*/
-gint
+int
__ham_release_meta(dbc)
DBC *dbc;
{
@@ -90,9 +90,9 @@ __ham_release_meta(dbc)
/*
* Mark the meta-data page dirty.
*
- * PUBLIC: gint __ham_dirty_meta __P((DBC *));
+ * PUBLIC: int __ham_dirty_meta __P((DBC *));
*/
-gint
+int
__ham_dirty_meta(dbc)
DBC *dbc;
{
@@ -101,7 +101,7 @@ __ham_dirty_meta(dbc)
DB_LOCK _tmp;
HASH *hashp;
HASH_CURSOR *hcp;
- gint ret;
+ int ret;
dbp = dbc->dbp;
hashp = dbp->h_internal;
diff --git a/libdb/hash/hash_method.c b/libdb/hash/hash_method.c
index aa8cf4b..7fd7618 100644
--- a/libdb/hash/hash_method.c
+++ b/libdb/hash/hash_method.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -19,23 +19,23 @@ static const gchar revid[] = "$Id$";
#include "dbinc/db_page.h"
#include "dbinc/hash.h"
-static gint __ham_set_h_ffactor __P((DB *, u_int32_t));
-static gint __ham_set_h_hash
- __P((DB *, u_int32_t(*)(DB *, gconstpointer , u_int32_t)));
-static gint __ham_set_h_nelem __P((DB *, u_int32_t));
+static int __ham_set_h_ffactor __P((DB *, u_int32_t));
+static int __ham_set_h_hash
+ __P((DB *, u_int32_t(*)(DB *, const void *, u_int32_t)));
+static int __ham_set_h_nelem __P((DB *, u_int32_t));
/*
* __ham_db_create --
* Hash specific initialization of the DB structure.
*
- * PUBLIC: gint __ham_db_create __P((DB *));
+ * PUBLIC: int __ham_db_create __P((DB *));
*/
-gint
+int
__ham_db_create(dbp)
DB *dbp;
{
HASH *hashp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbp->dbenv,
sizeof(HASH), &dbp->h_internal)) != 0)
@@ -55,9 +55,9 @@ __ham_db_create(dbp)
}
/*
- * PUBLIC: gint __ham_db_close __P((DB *));
+ * PUBLIC: int __ham_db_close __P((DB *));
*/
-gint
+int
__ham_db_close(dbp)
DB *dbp;
{
@@ -94,7 +94,7 @@ __ham_set_h_ffactor(dbp, h_ffactor)
static int
__ham_set_h_hash(dbp, func)
DB *dbp;
- u_int32_t (*func) __P((DB *, gconstpointer , u_int32_t));
+ u_int32_t (*func) __P((DB *, const void *, u_int32_t));
{
HASH *hashp;
diff --git a/libdb/hash/hash_open.c b/libdb/hash/hash_open.c
index e91a370..0159ab1 100644
--- a/libdb/hash/hash_open.c
+++ b/libdb/hash/hash_open.c
@@ -43,7 +43,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -69,14 +69,14 @@ static db_pgno_t __ham_init_meta __P((DB *, HMETA *, db_pgno_t, DB_LSN *));
/*
* __ham_open --
*
- * PUBLIC: gint __ham_open __P((DB *,
- * PUBLIC: DB_TXN *, const gchar * name, db_pgno_t, u_int32_t));
+ * PUBLIC: int __ham_open __P((DB *,
+ * PUBLIC: DB_TXN *, const char * name, db_pgno_t, u_int32_t));
*/
-gint
+int
__ham_open(dbp, txn, name, base_pgno, flags)
DB *dbp;
DB_TXN *txn;
- const gchar *name;
+ const char *name;
db_pgno_t base_pgno;
u_int32_t flags;
{
@@ -85,7 +85,7 @@ __ham_open(dbp, txn, name, base_pgno, flags)
DB_MPOOLFILE *mpf;
HASH_CURSOR *hcp;
HASH *hashp;
- gint ret, t_ret;
+ int ret, t_ret;
COMPQUIET(name, NULL);
dbenv = dbp->dbenv;
@@ -155,17 +155,17 @@ err1: if ((t_ret = dbc->c_close(dbc)) != 0 && ret == 0)
/*
* __ham_metachk --
*
- * PUBLIC: gint __ham_metachk __P((DB *, const gchar *, HMETA *));
+ * PUBLIC: int __ham_metachk __P((DB *, const char *, HMETA *));
*/
-gint
+int
__ham_metachk(dbp, name, hashm)
DB *dbp;
- const gchar *name;
+ const char *name;
HMETA *hashm;
{
DB_ENV *dbenv;
u_int32_t vers;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
@@ -269,7 +269,7 @@ __ham_init_meta(dbp, meta, pgno, lsnp)
{
HASH *hashp;
db_pgno_t nbuckets;
- gint i;
+ int i;
int32_t l2;
hashp = dbp->h_internal;
@@ -344,14 +344,14 @@ __ham_init_meta(dbp, meta, pgno, lsnp)
* memory or calls mpf->get), 2) the initialization, and 3) the "put page"
* chunk which either does a fop write or an mpf->put.
*
- * PUBLIC: gint __ham_new_file __P((DB *, DB_TXN *, DB_FH *, const gchar *));
+ * PUBLIC: int __ham_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
*/
-gint
+int
__ham_new_file(dbp, txn, fhp, name)
DB *dbp;
DB_TXN *txn;
DB_FH *fhp;
- const gchar *name;
+ const char *name;
{
DB_ENV *dbenv;
DB_LSN lsn;
@@ -360,9 +360,9 @@ __ham_new_file(dbp, txn, fhp, name)
DBT pdbt;
HMETA *meta;
PAGE *page;
- gint ret;
+ int ret;
db_pgno_t lpgno;
- gpointer buf;
+ void *buf;
dbenv = dbp->dbenv;
mpf = dbp->mpf;
@@ -444,9 +444,9 @@ err: if (name != NULL)
* __ham_new_subdb --
* Create the necessary pages to begin a new subdatabase.
*
- * PUBLIC: gint __ham_new_subdb __P((DB *, DB *, DB_TXN *));
+ * PUBLIC: int __ham_new_subdb __P((DB *, DB *, DB_TXN *));
*/
-gint
+int
__ham_new_subdb(mdbp, dbp, txn)
DB *mdbp, *dbp;
DB_TXN *txn;
@@ -459,7 +459,7 @@ __ham_new_subdb(mdbp, dbp, txn)
DBMETA *mmeta;
HMETA *meta;
PAGE *h;
- gint i, ret, t_ret;
+ int i, ret, t_ret;
db_pgno_t lpgno, mpgno;
dbenv = mdbp->dbenv;
diff --git a/libdb/hash/hash_page.c b/libdb/hash/hash_page.c
index 42d1be3..790323f 100644
--- a/libdb/hash/hash_page.c
+++ b/libdb/hash/hash_page.c
@@ -43,7 +43,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
/*
@@ -65,13 +65,13 @@ static const gchar revid[] = "$Id$";
#include "dbinc/hash.h"
#include "dbinc/lock.h"
-static gint __ham_c_delpg
+static int __ham_c_delpg
__P((DBC *, db_pgno_t, db_pgno_t, u_int32_t, db_ham_mode, u_int32_t *));
/*
- * PUBLIC: gint __ham_item __P((DBC *, db_lockmode_t, db_pgno_t *));
+ * PUBLIC: int __ham_item __P((DBC *, db_lockmode_t, db_pgno_t *));
*/
-gint
+int
__ham_item(dbc, mode, pgnop)
DBC *dbc;
db_lockmode_t mode;
@@ -80,7 +80,7 @@ __ham_item(dbc, mode, pgnop)
DB *dbp;
HASH_CURSOR *hcp;
db_pgno_t next_pgno;
- gint ret;
+ int ret;
dbp = dbc->dbp;
hcp = (HASH_CURSOR *)dbc->internal;
@@ -140,16 +140,16 @@ recheck:
}
/*
- * PUBLIC: gint __ham_item_reset __P((DBC *));
+ * PUBLIC: int __ham_item_reset __P((DBC *));
*/
-gint
+int
__ham_item_reset(dbc)
DBC *dbc;
{
DB *dbp;
DB_MPOOLFILE *mpf;
HASH_CURSOR *hcp;
- gint ret;
+ int ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -203,16 +203,16 @@ __ham_item_init(dbc)
/*
* Returns the last item in a bucket.
*
- * PUBLIC: gint __ham_item_last __P((DBC *, db_lockmode_t, db_pgno_t *));
+ * PUBLIC: int __ham_item_last __P((DBC *, db_lockmode_t, db_pgno_t *));
*/
-gint
+int
__ham_item_last(dbc, mode, pgnop)
DBC *dbc;
db_lockmode_t mode;
db_pgno_t *pgnop;
{
HASH_CURSOR *hcp;
- gint ret;
+ int ret;
hcp = (HASH_CURSOR *)dbc->internal;
if ((ret = __ham_item_reset(dbc)) != 0)
@@ -225,16 +225,16 @@ __ham_item_last(dbc, mode, pgnop)
}
/*
- * PUBLIC: gint __ham_item_first __P((DBC *, db_lockmode_t, db_pgno_t *));
+ * PUBLIC: int __ham_item_first __P((DBC *, db_lockmode_t, db_pgno_t *));
*/
-gint
+int
__ham_item_first(dbc, mode, pgnop)
DBC *dbc;
db_lockmode_t mode;
db_pgno_t *pgnop;
{
HASH_CURSOR *hcp;
- gint ret;
+ int ret;
hcp = (HASH_CURSOR *)dbc->internal;
if ((ret = __ham_item_reset(dbc)) != 0)
@@ -251,9 +251,9 @@ __ham_item_first(dbc, mode, pgnop)
* bigkeys, just returns the page number and index of the bigkey
* pointer pair.
*
- * PUBLIC: gint __ham_item_prev __P((DBC *, db_lockmode_t, db_pgno_t *));
+ * PUBLIC: int __ham_item_prev __P((DBC *, db_lockmode_t, db_pgno_t *));
*/
-gint
+int
__ham_item_prev(dbc, mode, pgnop)
DBC *dbc;
db_lockmode_t mode;
@@ -262,7 +262,7 @@ __ham_item_prev(dbc, mode, pgnop)
DB *dbp;
HASH_CURSOR *hcp;
db_pgno_t next_pgno;
- gint ret;
+ int ret;
hcp = (HASH_CURSOR *)dbc->internal;
dbp = dbc->dbp;
@@ -369,16 +369,16 @@ __ham_item_prev(dbc, mode, pgnop)
/*
* Sets the cursor to the next key/data pair on a page.
*
- * PUBLIC: gint __ham_item_next __P((DBC *, db_lockmode_t, db_pgno_t *));
+ * PUBLIC: int __ham_item_next __P((DBC *, db_lockmode_t, db_pgno_t *));
*/
-gint
+int
__ham_item_next(dbc, mode, pgnop)
DBC *dbc;
db_lockmode_t mode;
db_pgno_t *pgnop;
{
HASH_CURSOR *hcp;
- gint ret;
+ int ret;
hcp = (HASH_CURSOR *)dbc->internal;
@@ -457,7 +457,7 @@ __ham_putitem(dbp, p, dbt, type)
DB *dbp;
PAGE *p;
const DBT *dbt;
- gint type;
+ int type;
{
u_int16_t n, off;
db_indx_t *inp;
@@ -533,12 +533,12 @@ __ham_reputpair(dbp, p, ndx, key, data)
}
/*
- * PUBLIC: gint __ham_del_pair __P((DBC *, int));
+ * PUBLIC: int __ham_del_pair __P((DBC *, int));
*/
-gint
+int
__ham_del_pair(dbc, reclaim_page)
DBC *dbc;
- gint reclaim_page;
+ int reclaim_page;
{
DB *dbp;
DBT data_dbt, key_dbt;
@@ -549,7 +549,7 @@ __ham_del_pair(dbc, reclaim_page)
db_ham_mode op;
db_indx_t ndx;
db_pgno_t chg_pgno, pgno, tmp_pgno;
- gint ret, t_ret;
+ int ret, t_ret;
u_int32_t order;
dbp = dbc->dbp;
@@ -819,9 +819,9 @@ err: /* Clean up any pages. */
* Given the key data indicated by the cursor, replace part/all of it
* according to the fields in the dbt.
*
- * PUBLIC: gint __ham_replpair __P((DBC *, DBT *, u_int32_t));
+ * PUBLIC: int __ham_replpair __P((DBC *, DBT *, u_int32_t));
*/
-gint
+int
__ham_replpair(dbc, dbt, make_dup)
DBC *dbc;
DBT *dbt;
@@ -834,9 +834,9 @@ __ham_replpair(dbc, dbt, make_dup)
HASH_CURSOR *hcp;
int32_t change; /* XXX: Possible overflow. */
u_int32_t dup_flag, len, memsize;
- gint beyond_eor, is_big, ret, type;
+ int beyond_eor, is_big, ret, type;
u_int8_t *beg, *dest, *end, *hk, *src;
- gpointer memp;
+ void *memp;
/*
* Big item replacements are handled in generic code.
@@ -1010,7 +1010,7 @@ __ham_onpage_replace(dbp, pagep, ndx, off, change, dbt)
int32_t len;
size_t pgsize;
u_int8_t *src, *dest;
- gint zero_me;
+ int zero_me;
pgsize = dbp->pgsize;
inp = P_INP(dbp, pagep);
@@ -1046,9 +1046,9 @@ __ham_onpage_replace(dbp, pagep, ndx, off, change, dbt)
}
/*
- * PUBLIC: gint __ham_split_page __P((DBC *, u_int32_t, u_int32_t));
+ * PUBLIC: int __ham_split_page __P((DBC *, u_int32_t, u_int32_t));
*/
-gint
+int
__ham_split_page(dbc, obucket, nbucket)
DBC *dbc;
u_int32_t obucket, nbucket;
@@ -1065,8 +1065,8 @@ __ham_split_page(dbc, obucket, nbucket)
db_indx_t n;
db_pgno_t bucket_pgno, npgno, next_pgno;
u_int32_t big_len, len;
- gint found, i, ret, t_ret;
- gpointer big_buf;
+ int found, i, ret, t_ret;
+ void *big_buf;
dbp = dbc->dbp;
dbenv = dbp->dbenv;
@@ -1277,13 +1277,13 @@ err: if (old_pagep != NULL)
* to which we just added something. This allows us to link overflow
* pages and return the new page having correctly put the last page.
*
- * PUBLIC: gint __ham_add_el __P((DBC *, const DBT *, const DBT *, int));
+ * PUBLIC: int __ham_add_el __P((DBC *, const DBT *, const DBT *, int));
*/
-gint
+int
__ham_add_el(dbc, key, val, type)
DBC *dbc;
const DBT *key, *val;
- gint type;
+ int type;
{
const DBT *pkey, *pdata;
DB *dbp;
@@ -1294,8 +1294,8 @@ __ham_add_el(dbc, key, val, type)
HOFFPAGE doff, koff;
db_pgno_t next_pgno, pgno;
u_int32_t data_size, key_size, pairsize, rectype;
- gint do_expand, is_keybig, is_databig, ret;
- gint key_type, data_type;
+ int do_expand, is_keybig, is_databig, ret;
+ int key_type, data_type;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -1447,7 +1447,7 @@ __ham_copy_item(dbp, src_page, src_ndx, dest_page)
{
u_int32_t len;
size_t pgsize;
- gpointer src, *dest;
+ void *src, *dest;
db_indx_t *inp;
pgsize = dbp->pgsize;
@@ -1473,20 +1473,20 @@ __ham_copy_item(dbp, src_page, src_ndx, dest_page)
* pointer on success
* NULL on error
*
- * PUBLIC: gint __ham_add_ovflpage __P((DBC *, PAGE *, int, PAGE **));
+ * PUBLIC: int __ham_add_ovflpage __P((DBC *, PAGE *, int, PAGE **));
*/
-gint
+int
__ham_add_ovflpage(dbc, pagep, release, pp)
DBC *dbc;
PAGE *pagep;
- gint release;
+ int release;
PAGE **pp;
{
DB *dbp;
DB_LSN new_lsn;
DB_MPOOLFILE *mpf;
PAGE *new_pagep;
- gint ret;
+ int ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -1516,9 +1516,9 @@ __ham_add_ovflpage(dbc, pagep, release, pp)
}
/*
- * PUBLIC: gint __ham_get_cpage __P((DBC *, db_lockmode_t));
+ * PUBLIC: int __ham_get_cpage __P((DBC *, db_lockmode_t));
*/
-gint
+int
__ham_get_cpage(dbc, mode)
DBC *dbc;
db_lockmode_t mode;
@@ -1527,7 +1527,7 @@ __ham_get_cpage(dbc, mode)
DB_LOCK tmp_lock;
DB_MPOOLFILE *mpf;
HASH_CURSOR *hcp;
- gint ret;
+ int ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -1592,19 +1592,19 @@ __ham_get_cpage(dbc, mode)
* If the flag is set to H_ISDUP, then we are talking about the
* duplicate page, not the main page.
*
- * PUBLIC: gint __ham_next_cpage __P((DBC *, db_pgno_t, int));
+ * PUBLIC: int __ham_next_cpage __P((DBC *, db_pgno_t, int));
*/
-gint
+int
__ham_next_cpage(dbc, pgno, dirty)
DBC *dbc;
db_pgno_t pgno;
- gint dirty;
+ int dirty;
{
DB *dbp;
DB_MPOOLFILE *mpf;
HASH_CURSOR *hcp;
PAGE *p;
- gint ret;
+ int ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -1629,16 +1629,16 @@ __ham_next_cpage(dbc, pgno, dirty)
* __ham_lock_bucket --
* Get the lock on a particular bucket.
*
- * PUBLIC: gint __ham_lock_bucket __P((DBC *, db_lockmode_t));
+ * PUBLIC: int __ham_lock_bucket __P((DBC *, db_lockmode_t));
*/
-gint
+int
__ham_lock_bucket(dbc, mode)
DBC *dbc;
db_lockmode_t mode;
{
HASH_CURSOR *hcp;
db_pgno_t pgno;
- gint gotmeta, ret;
+ int gotmeta, ret;
hcp = (HASH_CURSOR *)dbc->internal;
gotmeta = hcp->hdr == NULL ? 1 : 0;
@@ -1758,7 +1758,7 @@ __ham_c_delpg(dbc, old_pgno, new_pgno, num_ent, op, orderp)
DB_TXN *my_txn;
DBC *cp;
HASH_CURSOR *hcp;
- gint found, ret;
+ int found, ret;
db_indx_t indx;
u_int32_t order;
diff --git a/libdb/hash/hash_rec.c b/libdb/hash/hash_rec.c
index adb211b..5cddc95 100644
--- a/libdb/hash/hash_rec.c
+++ b/libdb/hash/hash_rec.c
@@ -43,7 +43,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -58,21 +58,21 @@ static const gchar revid[] = "$Id$";
#include "dbinc/hash.h"
#include "dbinc/log.h"
-static gint __ham_alloc_pages __P((DB *, __ham_groupalloc_args *, DB_LSN *));
+static int __ham_alloc_pages __P((DB *, __ham_groupalloc_args *, DB_LSN *));
/*
* __ham_insdel_recover --
*
- * PUBLIC: gint __ham_insdel_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __ham_insdel_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__ham_insdel_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__ham_insdel_args *argp;
DB *file_dbp;
@@ -80,7 +80,7 @@ __ham_insdel_recover(dbenv, dbtp, lsnp, op, info)
DB_MPOOLFILE *mpf;
PAGE *pagep;
u_int32_t flags, opcode;
- gint cmp_n, cmp_p, ret, type;
+ int cmp_n, cmp_p, ret, type;
pagep = NULL;
COMPQUIET(info, NULL);
@@ -172,16 +172,16 @@ out: if (pagep != NULL)
* This log message is used when we add/remove overflow pages. This
* message takes care of the pointer chains, not the data on the pages.
*
- * PUBLIC: gint __ham_newpage_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __ham_newpage_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__ham_newpage_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__ham_newpage_args *argp;
DB *file_dbp;
@@ -189,7 +189,7 @@ __ham_newpage_recover(dbenv, dbtp, lsnp, op, info)
DB_MPOOLFILE *mpf;
PAGE *pagep;
u_int32_t flags;
- gint cmp_n, cmp_p, ret;
+ int cmp_n, cmp_p, ret;
pagep = NULL;
COMPQUIET(info, NULL);
@@ -343,16 +343,16 @@ out: if (pagep != NULL)
* page. You can think of them as special cases of the more general
* insdel log message.
*
- * PUBLIC: gint __ham_replace_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __ham_replace_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__ham_replace_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__ham_replace_args *argp;
DB *file_dbp;
@@ -362,7 +362,7 @@ __ham_replace_recover(dbenv, dbtp, lsnp, op, info)
PAGE *pagep;
u_int32_t flags;
int32_t grow;
- gint cmp_n, cmp_p, ret;
+ int cmp_n, cmp_p, ret;
u_int8_t *hk;
pagep = NULL;
@@ -436,16 +436,16 @@ out: if (pagep != NULL)
/*
* __ham_splitdata_recover --
*
- * PUBLIC: gint __ham_splitdata_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __ham_splitdata_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__ham_splitdata_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__ham_splitdata_args *argp;
DB *file_dbp;
@@ -453,7 +453,7 @@ __ham_splitdata_recover(dbenv, dbtp, lsnp, op, info)
DB_MPOOLFILE *mpf;
PAGE *pagep;
u_int32_t flags;
- gint cmp_n, cmp_p, ret;
+ int cmp_n, cmp_p, ret;
pagep = NULL;
COMPQUIET(info, NULL);
@@ -524,16 +524,16 @@ out: if (pagep != NULL)
* __ham_copypage_recover --
* Recovery function for copypage.
*
- * PUBLIC: gint __ham_copypage_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __ham_copypage_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__ham_copypage_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__ham_copypage_args *argp;
DB *file_dbp;
@@ -541,7 +541,7 @@ __ham_copypage_recover(dbenv, dbtp, lsnp, op, info)
DB_MPOOLFILE *mpf;
PAGE *pagep;
u_int32_t flags;
- gint cmp_n, cmp_p, ret;
+ int cmp_n, cmp_p, ret;
pagep = NULL;
COMPQUIET(info, NULL);
@@ -672,16 +672,16 @@ out: if (pagep != NULL)
* __ham_metagroup_recover --
* Recovery function for metagroup.
*
- * PUBLIC: gint __ham_metagroup_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __ham_metagroup_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__ham_metagroup_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__ham_metagroup_args *argp;
HASH_CURSOR *hcp;
@@ -692,7 +692,7 @@ __ham_metagroup_recover(dbenv, dbtp, lsnp, op, info)
PAGE *pagep;
db_pgno_t pgno;
u_int32_t flags, mmeta_flags;
- gint cmp_n, cmp_p, did_recover, groupgrow, ret;
+ int cmp_n, cmp_p, did_recover, groupgrow, ret;
COMPQUIET(info, NULL);
mmeta_flags = 0;
@@ -840,16 +840,16 @@ out: if (mmeta != NULL)
* __ham_groupalloc_recover --
* Recover the batch creation of a set of pages for a new database.
*
- * PUBLIC: gint __ham_groupalloc_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __ham_groupalloc_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__ham_groupalloc_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__ham_groupalloc_args *argp;
DBMETA *mmeta;
@@ -858,7 +858,7 @@ __ham_groupalloc_recover(dbenv, dbtp, lsnp, op, info)
DBC *dbc;
PAGE *pagep;
db_pgno_t pgno;
- gint cmp_n, cmp_p, modified, ret;
+ int cmp_n, cmp_p, modified, ret;
mmeta = NULL;
modified = 0;
@@ -953,7 +953,7 @@ __ham_alloc_pages(dbp, argp, lsnp)
DB_MPOOLFILE *mpf;
PAGE *pagep;
db_pgno_t pgno;
- gint ret;
+ int ret;
mpf = dbp->mpf;
@@ -990,22 +990,22 @@ reinit_page:
* __ham_curadj_recover --
* Undo cursor adjustments if a subtransaction fails.
*
- * PUBLIC: gint __ham_curadj_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __ham_curadj_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__ham_curadj_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__ham_curadj_args *argp;
DB_MPOOLFILE *mpf;
DB *file_dbp;
DBC *dbc;
- gint ret;
+ int ret;
HASH_CURSOR *hcp;
COMPQUIET(info, NULL);
@@ -1037,23 +1037,23 @@ out: REC_CLOSE;
* __ham_chgpg_recover --
* Undo cursor adjustments if a subtransaction fails.
*
- * PUBLIC: gint __ham_chgpg_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __ham_chgpg_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__ham_chgpg_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__ham_chgpg_args *argp;
BTREE_CURSOR *opdcp;
DB_MPOOLFILE *mpf;
DB *file_dbp, *ldbp;
DBC *dbc;
- gint ret;
+ int ret;
DBC *cp;
HASH_CURSOR *lcp;
u_int32_t order, indx;
diff --git a/libdb/hash/hash_reclaim.c b/libdb/hash/hash_reclaim.c
index 4099f4c..444d32e 100644
--- a/libdb/hash/hash_reclaim.c
+++ b/libdb/hash/hash_reclaim.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -31,16 +31,16 @@ static const gchar revid[] = "$Id$";
* need to go to a model where we maintain the free list with chunks of
* contiguous pages as well.
*
- * PUBLIC: gint __ham_reclaim __P((DB *, DB_TXN *txn));
+ * PUBLIC: int __ham_reclaim __P((DB *, DB_TXN *txn));
*/
-gint
+int
__ham_reclaim(dbp, txn)
DB *dbp;
DB_TXN *txn;
{
DBC *dbc;
HASH_CURSOR *hcp;
- gint ret;
+ int ret;
/* Open up a cursor that we'll use for traversing. */
if ((ret = dbp->cursor(dbp, txn, &dbc, 0)) != 0)
@@ -70,9 +70,9 @@ err: if (hcp->hdr != NULL)
* Reclaim the pages from a subdatabase and return them to the
* parent free list.
*
- * PUBLIC: gint __ham_truncate __P((DB *, DB_TXN *txn, u_int32_t *));
+ * PUBLIC: int __ham_truncate __P((DB *, DB_TXN *txn, u_int32_t *));
*/
-gint
+int
__ham_truncate(dbp, txn, countp)
DB *dbp;
DB_TXN *txn;
@@ -81,7 +81,7 @@ __ham_truncate(dbp, txn, countp)
DBC *dbc;
HASH_CURSOR *hcp;
db_trunc_param trunc;
- gint ret;
+ int ret;
/* Open up a cursor that we'll use for traversing. */
if ((ret = dbp->cursor(dbp, txn, &dbc, 0)) != 0)
diff --git a/libdb/hash/hash_stat.c b/libdb/hash/hash_stat.c
index bf903da..9858595 100644
--- a/libdb/hash/hash_stat.c
+++ b/libdb/hash/hash_stat.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -22,18 +22,18 @@ static const gchar revid[] = "$Id$";
#include "dbinc/btree.h"
#include "dbinc/hash.h"
-static gint __ham_stat_callback __P((DB *, PAGE *, gpointer , gint *));
+static int __ham_stat_callback __P((DB *, PAGE *, void *, int *));
/*
* __ham_stat --
* Gather/print the hash statistics
*
- * PUBLIC: gint __ham_stat __P((DB *, gpointer , u_int32_t));
+ * PUBLIC: int __ham_stat __P((DB *, void *, u_int32_t));
*/
-gint
+int
__ham_stat(dbp, spp, flags)
DB *dbp;
- gpointer spp;
+ void *spp;
u_int32_t flags;
{
DBC *dbc;
@@ -43,7 +43,7 @@ __ham_stat(dbp, spp, flags)
HASH_CURSOR *hcp;
PAGE *h;
db_pgno_t pgno;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
@@ -130,16 +130,16 @@ err: if (sp != NULL)
* Traverse an entire hash table. We use the callback so that we
* can use this both for stat collection and for deallocation.
*
- * PUBLIC: gint __ham_traverse __P((DBC *, db_lockmode_t,
- * PUBLIC: gint (*)(DB *, PAGE *, gpointer , gint *), gpointer , int));
+ * PUBLIC: int __ham_traverse __P((DBC *, db_lockmode_t,
+ * PUBLIC: int (*)(DB *, PAGE *, void *, int *), void *, int));
*/
-gint
+int
__ham_traverse(dbc, mode, callback, cookie, look_past_max)
DBC *dbc;
db_lockmode_t mode;
- gint (*callback) __P((DB *, PAGE *, gpointer , gint *));
- gpointer cookie;
- gint look_past_max;
+ int (*callback) __P((DB *, PAGE *, void *, int *));
+ void *cookie;
+ int look_past_max;
{
DB *dbp;
DBC *opd;
@@ -147,7 +147,7 @@ __ham_traverse(dbc, mode, callback, cookie, look_past_max)
HASH_CURSOR *hcp;
HKEYDATA *hk;
db_pgno_t pgno, opgno;
- gint did_put, i, ret, t_ret;
+ int did_put, i, ret, t_ret;
u_int32_t bucket, spares_entry;
dbp = dbc->dbp;
@@ -282,14 +282,14 @@ static int
__ham_stat_callback(dbp, pagep, cookie, putp)
DB *dbp;
PAGE *pagep;
- gpointer cookie;
- gint *putp;
+ void *cookie;
+ int *putp;
{
DB_HASH_STAT *sp;
DB_BTREE_STAT bstat;
db_indx_t indx, len, off, tlen, top;
u_int8_t *hk;
- gint ret;
+ int ret;
*putp = 0;
sp = cookie;
diff --git a/libdb/hash/hash_upgrade.c b/libdb/hash/hash_upgrade.c
index c3cc775..d08b7ef 100644
--- a/libdb/hash/hash_upgrade.c
+++ b/libdb/hash/hash_upgrade.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -26,12 +26,12 @@ static const gchar revid[] = "$Id$";
* __ham_30_hashmeta --
* Upgrade the database from version 4/5 to version 6.
*
- * PUBLIC: gint __ham_30_hashmeta __P((DB *, gchar *, u_int8_t *));
+ * PUBLIC: int __ham_30_hashmeta __P((DB *, char *, u_int8_t *));
*/
-gint
+int
__ham_30_hashmeta(dbp, real_name, obuf)
DB *dbp;
- gchar *real_name;
+ char *real_name;
u_int8_t *obuf;
{
DB_ENV *dbenv;
@@ -39,7 +39,7 @@ __ham_30_hashmeta(dbp, real_name, obuf)
HMETA30 newmeta;
u_int32_t *o_spares, *n_spares;
u_int32_t fillf, maxb, nelem;
- gint i, max_entry, ret;
+ int i, max_entry, ret;
dbenv = dbp->dbenv;
memset(&newmeta, 0, sizeof(newmeta));
@@ -115,20 +115,20 @@ __ham_30_hashmeta(dbp, real_name, obuf)
* Make sure that all hash pages belonging to the current
* hash doubling are within the bounds of the file.
*
- * PUBLIC: gint __ham_30_sizefix __P((DB *, DB_FH *, gchar *, u_int8_t *));
+ * PUBLIC: int __ham_30_sizefix __P((DB *, DB_FH *, char *, u_int8_t *));
*/
-gint
+int
__ham_30_sizefix(dbp, fhp, realname, metabuf)
DB *dbp;
DB_FH *fhp;
- gchar *realname;
+ char *realname;
u_int8_t *metabuf;
{
u_int8_t buf[DB_MAX_PGSIZE];
DB_ENV *dbenv;
HMETA30 *meta;
db_pgno_t last_actual, last_desired;
- gint ret;
+ int ret;
size_t nw;
u_int32_t pagesize;
@@ -171,17 +171,17 @@ __ham_30_sizefix(dbp, fhp, realname, metabuf)
* __ham_31_hashmeta --
* Upgrade the database from version 6 to version 7.
*
- * PUBLIC: gint __ham_31_hashmeta
- * PUBLIC: __P((DB *, gchar *, u_int32_t, DB_FH *, PAGE *, gint *));
+ * PUBLIC: int __ham_31_hashmeta
+ * PUBLIC: __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
*/
-gint
+int
__ham_31_hashmeta(dbp, real_name, flags, fhp, h, dirtyp)
DB *dbp;
- gchar *real_name;
+ char *real_name;
u_int32_t flags;
DB_FH *fhp;
PAGE *h;
- gint *dirtyp;
+ int *dirtyp;
{
HMETA31 *newmeta;
HMETA30 *oldmeta;
@@ -226,22 +226,22 @@ __ham_31_hashmeta(dbp, real_name, flags, fhp, h, dirtyp)
* __ham_31_hash --
* Upgrade the database hash leaf pages.
*
- * PUBLIC: gint __ham_31_hash
- * PUBLIC: __P((DB *, gchar *, u_int32_t, DB_FH *, PAGE *, gint *));
+ * PUBLIC: int __ham_31_hash
+ * PUBLIC: __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
*/
-gint
+int
__ham_31_hash(dbp, real_name, flags, fhp, h, dirtyp)
DB *dbp;
- gchar *real_name;
+ char *real_name;
u_int32_t flags;
DB_FH *fhp;
PAGE *h;
- gint *dirtyp;
+ int *dirtyp;
{
HKEYDATA *hk;
db_pgno_t pgno, tpgno;
db_indx_t indx;
- gint ret;
+ int ret;
COMPQUIET(flags, 0);
diff --git a/libdb/hash/hash_verify.c b/libdb/hash/hash_verify.c
index 62c051e..ebe3fea 100644
--- a/libdb/hash/hash_verify.c
+++ b/libdb/hash/hash_verify.c
@@ -10,7 +10,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,10 +25,10 @@ static const gchar revid[] = "$Id$";
#include "dbinc/btree.h"
#include "dbinc/hash.h"
-static gint __ham_dups_unsorted __P((DB *, u_int8_t *, u_int32_t));
-static gint __ham_vrfy_bucket __P((DB *, VRFY_DBINFO *, HMETA *, u_int32_t,
+static int __ham_dups_unsorted __P((DB *, u_int8_t *, u_int32_t));
+static int __ham_vrfy_bucket __P((DB *, VRFY_DBINFO *, HMETA *, u_int32_t,
u_int32_t));
-static gint __ham_vrfy_item __P((DB *,
+static int __ham_vrfy_item __P((DB *,
VRFY_DBINFO *, db_pgno_t, PAGE *, u_int32_t, u_int32_t));
/*
@@ -39,10 +39,10 @@ static gint __ham_vrfy_item __P((DB *,
* will need most everything again to verify each page and the
* amount of state here is significant.
*
- * PUBLIC: gint __ham_vrfy_meta __P((DB *, VRFY_DBINFO *, HMETA *,
+ * PUBLIC: int __ham_vrfy_meta __P((DB *, VRFY_DBINFO *, HMETA *,
* PUBLIC: db_pgno_t, u_int32_t));
*/
-gint
+int
__ham_vrfy_meta(dbp, vdp, m, pgno, flags)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -52,9 +52,9 @@ __ham_vrfy_meta(dbp, vdp, m, pgno, flags)
{
HASH *hashp;
VRFY_PAGEINFO *pip;
- gint i, ret, t_ret, isbad;
+ int i, ret, t_ret, isbad;
u_int32_t pwr, mbucket;
- u_int32_t (*hfunc) __P((DB *, gconstpointer , u_int32_t));
+ u_int32_t (*hfunc) __P((DB *, const void *, u_int32_t));
if ((ret = __db_vrfy_getpageinfo(vdp, pgno, &pip)) != 0)
return (ret);
@@ -180,10 +180,10 @@ err: if ((t_ret =
* __ham_vrfy --
* Verify hash page.
*
- * PUBLIC: gint __ham_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t,
+ * PUBLIC: int __ham_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t,
* PUBLIC: u_int32_t));
*/
-gint
+int
__ham_vrfy(dbp, vdp, h, pgno, flags)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -194,7 +194,7 @@ __ham_vrfy(dbp, vdp, h, pgno, flags)
VRFY_PAGEINFO *pip;
u_int32_t ent, himark, inpend;
db_indx_t *inp;
- gint isbad, ret, t_ret;
+ int isbad, ret, t_ret;
isbad = 0;
if ((ret = __db_vrfy_getpageinfo(vdp, pgno, &pip)) != 0)
@@ -277,7 +277,7 @@ __ham_vrfy_item(dbp, vdp, pgno, h, i, flags)
VRFY_CHILDINFO child;
VRFY_PAGEINFO *pip;
db_indx_t offset, len, dlen, elen;
- gint ret, t_ret;
+ int ret, t_ret;
u_int8_t *databuf;
if ((ret = __db_vrfy_getpageinfo(vdp, pgno, &pip)) != 0)
@@ -392,10 +392,10 @@ err: if ((t_ret =
* __ham_vrfy_structure --
* Verify the structure of a hash database.
*
- * PUBLIC: gint __ham_vrfy_structure __P((DB *, VRFY_DBINFO *, db_pgno_t,
+ * PUBLIC: int __ham_vrfy_structure __P((DB *, VRFY_DBINFO *, db_pgno_t,
* PUBLIC: u_int32_t));
*/
-gint
+int
__ham_vrfy_structure(dbp, vdp, meta_pgno, flags)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -407,7 +407,7 @@ __ham_vrfy_structure(dbp, vdp, meta_pgno, flags)
HMETA *m;
PAGE *h;
VRFY_PAGEINFO *pip;
- gint isbad, p, ret, t_ret;
+ int isbad, p, ret, t_ret;
db_pgno_t pgno;
u_int32_t bucket, spares_entry;
@@ -526,10 +526,10 @@ __ham_vrfy_bucket(dbp, vdp, m, bucket, flags)
HASH *hashp;
VRFY_CHILDINFO *child;
VRFY_PAGEINFO *mip, *pip;
- gint ret, t_ret, isbad, p;
+ int ret, t_ret, isbad, p;
db_pgno_t pgno, next_pgno;
DBC *cc;
- u_int32_t (*hfunc) __P((DB *, gconstpointer , u_int32_t));
+ u_int32_t (*hfunc) __P((DB *, const void *, u_int32_t));
isbad = 0;
pip = NULL;
@@ -714,11 +714,11 @@ err: if (cc != NULL && ((t_ret = __db_vrfy_ccclose(cc)) != 0) && ret == 0)
* __ham_vrfy_hashing --
* Verify that all items on a given hash page hash correctly.
*
- * PUBLIC: gint __ham_vrfy_hashing __P((DB *,
+ * PUBLIC: int __ham_vrfy_hashing __P((DB *,
* PUBLIC: u_int32_t, HMETA *, u_int32_t, db_pgno_t, u_int32_t,
- * PUBLIC: u_int32_t (*) __P((DB *, gconstpointer , u_int32_t))));
+ * PUBLIC: u_int32_t (*) __P((DB *, const void *, u_int32_t))));
*/
-gint
+int
__ham_vrfy_hashing(dbp, nentries, m, thisbucket, pgno, flags, hfunc)
DB *dbp;
u_int32_t nentries;
@@ -726,13 +726,13 @@ __ham_vrfy_hashing(dbp, nentries, m, thisbucket, pgno, flags, hfunc)
u_int32_t thisbucket;
db_pgno_t pgno;
u_int32_t flags;
- u_int32_t (*hfunc) __P((DB *, gconstpointer , u_int32_t));
+ u_int32_t (*hfunc) __P((DB *, const void *, u_int32_t));
{
DBT dbt;
DB_MPOOLFILE *mpf;
PAGE *h;
db_indx_t i;
- gint ret, t_ret, isbad;
+ int ret, t_ret, isbad;
u_int32_t hval, bucket;
mpf = dbp->mpf;
@@ -782,25 +782,25 @@ err: if (dbt.data != NULL)
* Safely dump out anything that looks like a key on an alleged
* hash page.
*
- * PUBLIC: gint __ham_salvage __P((DB *, VRFY_DBINFO *, db_pgno_t, PAGE *,
- * PUBLIC: gpointer , gint (*)(gpointer , gconstpointer ), u_int32_t));
+ * PUBLIC: int __ham_salvage __P((DB *, VRFY_DBINFO *, db_pgno_t, PAGE *,
+ * PUBLIC: void *, int (*)(void *, const void *), u_int32_t));
*/
-gint
+int
__ham_salvage(dbp, vdp, pgno, h, handle, callback, flags)
DB *dbp;
VRFY_DBINFO *vdp;
db_pgno_t pgno;
PAGE *h;
- gpointer handle;
- gint (*callback) __P((gpointer , gconstpointer ));
+ void *handle;
+ int (*callback) __P((void *, const void *));
u_int32_t flags;
{
DBT dbt, unkdbt;
db_pgno_t dpgno;
- gint ret, err_ret, t_ret;
+ int ret, err_ret, t_ret;
u_int32_t himark, tlen;
u_int8_t *hk;
- gpointer buf;
+ void *buf;
u_int32_t dlen, len, i;
memset(&dbt, 0, sizeof(DBT));
@@ -953,10 +953,10 @@ keydata: memcpy(buf, HKEYDATA_DATA(hk), len);
* Return the set of hash pages corresponding to the given
* known-good meta page.
*
- * PUBLIC: gint __ham_meta2pgset __P((DB *, VRFY_DBINFO *, HMETA *, u_int32_t,
+ * PUBLIC: int __ham_meta2pgset __P((DB *, VRFY_DBINFO *, HMETA *, u_int32_t,
* PUBLIC: DB *));
*/
-gint __ham_meta2pgset(dbp, vdp, hmeta, flags, pgset)
+int __ham_meta2pgset(dbp, vdp, hmeta, flags, pgset)
DB *dbp;
VRFY_DBINFO *vdp;
HMETA *hmeta;
@@ -967,7 +967,7 @@ gint __ham_meta2pgset(dbp, vdp, hmeta, flags, pgset)
PAGE *h;
db_pgno_t pgno;
u_int32_t bucket, totpgs;
- gint ret, val;
+ int ret, val;
/*
* We don't really need flags, but leave them for consistency with
@@ -1051,7 +1051,7 @@ __ham_dups_unsorted(dbp, buf, len)
{
DBT a, b;
db_indx_t offset, dlen;
- gint (*func) __P((DB *, const DBT *, const DBT *));
+ int (*func) __P((DB *, const DBT *, const DBT *));
memset(&a, 0, sizeof(DBT));
memset(&b, 0, sizeof(DBT));
diff --git a/libdb/hmac/hmac.c b/libdb/hmac/hmac.c
index 782c5e9..029b764 100644
--- a/libdb/hmac/hmac.c
+++ b/libdb/hmac/hmac.c
@@ -11,7 +11,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -53,7 +53,7 @@ __db_hmac(k, data, data_len, mac)
u_int8_t ipad[HMAC_BLOCK_SIZE];
u_int8_t opad[HMAC_BLOCK_SIZE];
u_int8_t tmp[HMAC_OUTPUT_SIZE];
- gint i;
+ int i;
memset(key, 0x00, HMAC_BLOCK_SIZE);
memset(ipad, 0x36, HMAC_BLOCK_SIZE);
@@ -90,7 +90,7 @@ __db_chksum(data, data_len, mac_key, store)
u_int8_t *mac_key;
u_int8_t *store;
{
- gint sumlen;
+ int sumlen;
u_int32_t hash4;
u_int8_t tmp[DB_MAC_KEY];
@@ -146,19 +146,19 @@ __db_derive_mac(passwd, plen, mac_key)
*
* Return 0 on success, >0 (errno) on error, -1 on checksum mismatch.
*
- * PUBLIC: gint __db_check_chksum __P((DB_ENV *,
- * PUBLIC: DB_CIPHER *, u_int8_t *, gpointer , size_t, int));
+ * PUBLIC: int __db_check_chksum __P((DB_ENV *,
+ * PUBLIC: DB_CIPHER *, u_int8_t *, void *, size_t, int));
*/
-gint
+int
__db_check_chksum(dbenv, db_cipher, chksum, data, data_len, is_hmac)
DB_ENV *dbenv;
DB_CIPHER *db_cipher;
u_int8_t *chksum;
- gpointer data;
+ void *data;
size_t data_len;
- gint is_hmac;
+ int is_hmac;
{
- gint ret;
+ int ret;
size_t sum_len;
u_int32_t hash4;
u_int8_t *mac_key, old[DB_MAC_KEY], new[DB_MAC_KEY];
diff --git a/libdb/hmac/sha1.c b/libdb/hmac/sha1.c
index b59793d..a17a613 100644
--- a/libdb/hmac/sha1.c
+++ b/libdb/hmac/sha1.c
@@ -1,7 +1,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
/*
SHA-1 in C
@@ -15,14 +15,14 @@ Still 100% Public Domain
Corrected a problem which generated improper hash values on 16 bit machines
Routine SHA1Update changed from
- void SHA1Update(SHA1_CTX* context, guchar * data, unsigned int
+ void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int
len)
to
- void SHA1Update(SHA1_CTX* context, guchar * data, unsigned
+ void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned
long len)
-The 'len' parameter was declared an gint which works fine on 32 bit machines.
-However, on 16 bit machines an gint is too small for the shifts being done
+The 'len' parameter was declared an int which works fine on 32 bit machines.
+However, on 16 bit machines an int is too small for the shifts being done
against
it. This caused the hash function to generate incorrect values if len was
greater than 8191 (8K - 1) due to the 'len << 3' on line 3 of SHA1Update().
@@ -32,11 +32,11 @@ be guaranteed to generate the wrong hash (e.g. Test Vector #3, a million
"a"s).
I also changed the declaration of variables i & j in SHA1Update to
-unsigned long from guint for the same reason.
+unsigned long from unsigned int for the same reason.
These changes should make no difference to any 32 bit implementations since
an
-gint and a long are the same size in those environments.
+int and a long are the same size in those environments.
--
I also corrected a few compiler warnings generated by Borland C.
@@ -104,11 +104,11 @@ A million repetitions of "a"
#ifdef VERBOSE /* SAK */
-static void __db_SHAPrintContext __P((SHA1_CTX *, gchar *));
+static void __db_SHAPrintContext __P((SHA1_CTX *, char *));
static void
__db_SHAPrintContext(context, msg)
SHA1_CTX *context;
- gchar *msg;
+ char *msg;
{
printf("%s (%d,%d) %x %x %x %x %x\n",
msg,
@@ -126,22 +126,22 @@ __db_SHAPrintContext(context, msg)
/*
* __db_SHA1Transform --
*
- * PUBLIC: void __db_SHA1Transform __P((u_int32_t *, guchar *));
+ * PUBLIC: void __db_SHA1Transform __P((u_int32_t *, unsigned char *));
*/
void
__db_SHA1Transform(state, buffer)
u_int32_t *state;
- guchar *buffer;
+ unsigned char *buffer;
{
u_int32_t a, b, c, d, e;
typedef union {
- guchar c[64];
+ unsigned char c[64];
u_int32_t l[16];
} CHAR64LONG16;
CHAR64LONG16* block;
-static gint is_bigendian = -1;
+static int is_bigendian = -1;
#ifdef SHA1HANDSOFF
- guchar workspace[64];
+ unsigned char workspace[64];
block = (CHAR64LONG16*)workspace;
memcpy(block, buffer, 64);
@@ -149,7 +149,7 @@ static gint is_bigendian = -1;
block = (CHAR64LONG16*)buffer;
#endif
if (is_bigendian == -1)
- is_bigendian = __db_isbigendian();
+ is_bigendian = __db_isbigendian();
/* Copy context->state[] to working vars */
a = state[0];
b = state[1];
@@ -216,13 +216,13 @@ __db_SHA1Init(context)
* __db_SHA1Update --
* Run your data through this.
*
- * PUBLIC: void __db_SHA1Update __P((SHA1_CTX *, guchar *,
+ * PUBLIC: void __db_SHA1Update __P((SHA1_CTX *, unsigned char *,
* PUBLIC: size_t));
*/
void
__db_SHA1Update(context, data, len)
SHA1_CTX *context;
- guchar *data;
+ unsigned char *data;
size_t len;
{
u_int32_t i, j; /* JHB */
@@ -255,23 +255,23 @@ u_int32_t i, j; /* JHB */
* __db_SHA1Final --
* Add padding and return the message digest.
*
- * PUBLIC: void __db_SHA1Final __P((guchar *, SHA1_CTX *));
+ * PUBLIC: void __db_SHA1Final __P((unsigned char *, SHA1_CTX *));
*/
void
__db_SHA1Final(digest, context)
- guchar *digest;
+ unsigned char *digest;
SHA1_CTX *context;
{
u_int32_t i; /* JHB */
-guchar finalcount[8];
+unsigned char finalcount[8];
for (i = 0; i < 8; i++) {
finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
>> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */
}
- __db_SHA1Update(context, (guchar *)"\200", 1);
+ __db_SHA1Update(context, (unsigned char *)"\200", 1);
while ((context->count[0] & 504) != 448) {
- __db_SHA1Update(context, (guchar *)"\0", 1);
+ __db_SHA1Update(context, (unsigned char *)"\0", 1);
}
__db_SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform()
*/
diff --git a/libdb/hsearch/hsearch.c b/libdb/hsearch/hsearch.c
index 2d7d7e5..5b6b42d 100644
--- a/libdb/hsearch/hsearch.c
+++ b/libdb/hsearch/hsearch.c
@@ -43,7 +43,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -64,17 +64,17 @@ static ENTRY retval;
*
* EXTERN: #if DB_DBM_HSEARCH != 0
*
- * EXTERN: gint __db_hcreate __P((size_t));
+ * EXTERN: int __db_hcreate __P((size_t));
* EXTERN: ENTRY *__db_hsearch __P((ENTRY, ACTION));
* EXTERN: void __db_hdestroy __P((void));
*
* EXTERN: #endif
*/
-gint
+int
__db_hcreate(nel)
size_t nel;
{
- gint ret;
+ int ret;
if ((ret = db_create(&dbp, NULL, 0)) != 0) {
__os_set_errno(ret);
@@ -101,7 +101,7 @@ __db_hsearch(item, action)
ACTION action;
{
DBT key, val;
- gint ret;
+ int ret;
if (dbp == NULL) {
__os_set_errno(EINVAL);
@@ -139,7 +139,7 @@ __db_hsearch(item, action)
__os_set_errno(ret);
return (NULL);
}
- item.data = (gchar *)val.data;
+ item.data = (char *)val.data;
break;
default:
__os_set_errno(EINVAL);
diff --git a/libdb/libdb_java/java_Db.c b/libdb/libdb_java/java_Db.c
index 6182ab0..d6dace9 100644
--- a/libdb/libdb_java/java_Db.c
+++ b/libdb/libdb_java/java_Db.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include <jni.h>
@@ -27,7 +27,7 @@ struct verify_callback_struct {
JNIEnv *env;
jobject streamobj;
jbyteArray bytes;
- gint nbytes;
+ int nbytes;
jmethodID writemid;
};
@@ -59,7 +59,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_Db_one_1time_1init
JNIEXPORT void JNICALL Java_com_sleepycat_db_Db__1init
(JNIEnv *jnienv, /*Db*/ jobject jthis, /*DbEnv*/ jobject jdbenv, jint flags)
{
- gint err;
+ int err;
DB *db;
DB_JAVAINFO *dbinfo;
DB_ENV *dbenv;
@@ -99,7 +99,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_Db__1associate
JNIEXPORT jint JNICALL Java_com_sleepycat_db_Db__1close
(JNIEnv *jnienv, /*Db*/ jobject jthis, jint flags)
{
- gint err;
+ int err;
DB *db;
DB_JAVAINFO *dbinfo;
@@ -179,7 +179,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_Db_bt_1prefix_1changed
JNIEXPORT jobject JNICALL Java_com_sleepycat_db_Db_cursor
(JNIEnv *jnienv, /*Db*/ jobject jthis, /*DbTxn*/ jobject txnid, jint flags)
{
- gint err;
+ int err;
DBC *dbc;
DB *db = get_DB(jnienv, jthis);
DB_TXN *dbtxnid = get_DB_TXN(jnienv, txnid);
@@ -195,7 +195,7 @@ JNIEXPORT jint JNICALL Java_com_sleepycat_db_Db_del
(JNIEnv *jnienv, /*Db*/ jobject jthis, /*DbTxn*/ jobject txnid,
/*Dbt*/ jobject key, jint dbflags)
{
- gint err;
+ int err;
DB_TXN *dbtxnid;
DB *db;
LOCKED_DBT lkey;
@@ -270,8 +270,8 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_Db_errx
JNIEXPORT jint JNICALL Java_com_sleepycat_db_Db_fd
(JNIEnv *jnienv, /*Db*/ jobject jthis)
{
- gint err;
- gint return_value = 0;
+ int err;
+ int return_value = 0;
DB *db = get_DB(jnienv, jthis);
if (!verify_non_null(jnienv, db))
@@ -286,7 +286,7 @@ JNIEXPORT jint JNICALL Java_com_sleepycat_db_Db_fd
JNIEXPORT void JNICALL Java_com_sleepycat_db_Db_set_1encrypt
(JNIEnv *jnienv, /*Db*/ jobject jthis, jstring jpasswd, jint flags)
{
- gint err;
+ int err;
DB *db;
LOCKED_STRING ls_passwd;
@@ -320,7 +320,7 @@ JNIEXPORT jint JNICALL Java_com_sleepycat_db_Db_get
(JNIEnv *jnienv, /*Db*/ jobject jthis, /*DbTxn*/ jobject txnid,
/*Dbt*/ jobject key, /*Dbt*/ jobject data, jint flags)
{
- gint err, op_flags, retry;
+ int err, op_flags, retry;
DB *db;
DB_ENV *dbenv;
OpKind keyop, dataop;
@@ -396,13 +396,13 @@ JNIEXPORT jobject JNICALL Java_com_sleepycat_db_Db_join
(JNIEnv *jnienv, /*Db*/ jobject jthis, /*Dbc[]*/ jobjectArray curslist,
jint flags)
{
- gint err;
+ int err;
DB *db;
- gint count;
+ int count;
DBC **newlist;
DBC *dbc;
- gint i;
- gint size;
+ int i;
+ int size;
db = get_DB(jnienv, jthis);
count = (*jnienv)->GetArrayLength(jnienv, curslist);
@@ -444,7 +444,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_Db_key_1range
(JNIEnv *jnienv, /*Db*/ jobject jthis, /*DbTxn*/ jobject txnid,
/*Dbt*/ jobject jkey, jobject /*DbKeyRange*/ range, jint flags)
{
- gint err;
+ int err;
DB *db;
DB_TXN *dbtxnid;
LOCKED_DBT lkey;
@@ -480,7 +480,7 @@ JNIEXPORT jint JNICALL Java_com_sleepycat_db_Db_pget
(JNIEnv *jnienv, /*Db*/ jobject jthis, /*DbTxn*/ jobject txnid,
/*Dbt*/ jobject key, /*Dbt*/ jobject rkey, /*Dbt*/ jobject data, jint flags)
{
- gint err, op_flags, retry;
+ int err, op_flags, retry;
DB *db;
DB_ENV *dbenv;
OpKind keyop, rkeyop, dataop;
@@ -550,7 +550,7 @@ JNIEXPORT jint JNICALL Java_com_sleepycat_db_Db_put
(JNIEnv *jnienv, /*Db*/ jobject jthis, /*DbTxn*/ jobject txnid,
/*Dbt*/ jobject key, /*Dbt*/ jobject data, jint flags)
{
- gint err;
+ int err;
DB *db;
DB_ENV *dbenv;
DB_TXN *dbtxnid;
@@ -597,7 +597,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_Db__1remove
(JNIEnv *jnienv, /*Db*/ jobject jthis,
jstring file, jstring database, jint flags)
{
- gint err;
+ int err;
DB *db;
DB_JAVAINFO *dbinfo;
LOCKED_STRING ls_file;
@@ -629,7 +629,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_Db__1rename
(JNIEnv *jnienv, /*Db*/ jobject jthis,
jstring file, jstring database, jstring newname, jint flags)
{
- gint err;
+ int err;
DB *db;
DB_JAVAINFO *dbinfo;
LOCKED_STRING ls_file;
@@ -675,7 +675,7 @@ JNIEXPORT void JNICALL
Java_com_sleepycat_db_Db_set_1re_1source
(JNIEnv *jnienv, /*Db*/ jobject jthis, jstring re_source)
{
- gint err;
+ int err;
DB *db;
db = get_DB(jnienv, jthis);
@@ -703,7 +703,7 @@ JNIEXPORT jobject JNICALL Java_com_sleepycat_db_Db_stat
jobject retval;
jclass dbclass;
size_t bytesize;
- gpointer statp;
+ void *statp;
bytesize = 0;
retval = NULL;
@@ -777,7 +777,7 @@ JNIEXPORT jboolean JNICALL Java_com_sleepycat_db_Db_get_1byteswapped
(JNIEnv *jnienv, /*Db*/ jobject jthis)
{
DB *db;
- gint err, isbyteswapped;
+ int err, isbyteswapped;
/* This value should never be seen, because of the exception. */
isbyteswapped = 0;
@@ -796,7 +796,7 @@ JNIEXPORT jint JNICALL Java_com_sleepycat_db_Db_get_1type
(JNIEnv *jnienv, /*Db*/ jobject jthis)
{
DB *db;
- gint err;
+ int err;
DBTYPE dbtype;
/* This value should never be seen, because of the exception. */
@@ -816,7 +816,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_Db__1open
(JNIEnv *jnienv, /*Db*/ jobject jthis, /*DbTxn*/ jobject txnid,
jstring file, jstring database, jint type, jint flags, jint mode)
{
- gint err;
+ int err;
DB *db;
DB_TXN *dbtxnid;
LOCKED_STRING ls_file;
@@ -846,7 +846,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_Db__1open
JNIEXPORT jint JNICALL Java_com_sleepycat_db_Db_truncate
(JNIEnv *jnienv, /*Db*/ jobject jthis, /*DbTxn*/ jobject jtxnid, jint flags)
{
- gint err;
+ int err;
DB *db;
u_int32_t count;
DB_TXN *dbtxnid;
@@ -865,7 +865,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_Db_upgrade
(JNIEnv *jnienv, /*Db*/ jobject jthis, jstring name,
jint flags)
{
- gint err;
+ int err;
DB *db = get_DB(jnienv, jthis);
LOCKED_STRING ls_name;
@@ -879,14 +879,14 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_Db_upgrade
locked_string_put(&ls_name, jnienv);
}
-static gint java_verify_callback(gpointer handle, gconstpointer str_arg)
+static int java_verify_callback(void *handle, const void *str_arg)
{
- gchar *str;
+ char *str;
struct verify_callback_struct *vc;
- gint len;
+ int len;
JNIEnv *jnienv;
- str = (gchar *)str_arg;
+ str = (char *)str_arg;
vc = (struct verify_callback_struct *)handle;
jnienv = vc->env;
len = strlen(str)+1;
@@ -912,7 +912,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_Db_verify
(JNIEnv *jnienv, /*Db*/ jobject jthis, jstring name,
jstring subdb, jobject stream, jint flags)
{
- gint err;
+ int err;
DB *db;
LOCKED_STRING ls_name;
LOCKED_STRING ls_subdb;
diff --git a/libdb/libdb_java/java_DbEnv.c b/libdb/libdb_java/java_DbEnv.c
index e4edaac..561ae90 100644
--- a/libdb/libdb_java/java_DbEnv.c
+++ b/libdb/libdb_java/java_DbEnv.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include <jni.h>
@@ -36,7 +36,7 @@ JAVADB_SET_METH(DbEnv, jint, lk_1max_1objects, DB_ENV, lk_max_objects)
JAVADB_SET_METH_STR(DbEnv, tmp_1dir, DB_ENV, tmp_dir)
JAVADB_SET_METH(DbEnv, jint, tx_1max, DB_ENV, tx_max)
-static void DbEnv_errcall_callback(const gchar *prefix, gchar *message)
+static void DbEnv_errcall_callback(const char *prefix, char *message)
{
JNIEnv *jnienv;
DB_ENV_JAVAINFO *envinfo = (DB_ENV_JAVAINFO *)prefix;
@@ -78,7 +78,7 @@ static void DbEnv_errcall_callback(const gchar *prefix, gchar *message)
static void DbEnv_initialize(JNIEnv *jnienv, DB_ENV *dbenv,
/*DbEnv*/ jobject jenv,
/*DbErrcall*/ jobject jerrcall,
- gint is_dbopen)
+ int is_dbopen)
{
DB_ENV_JAVAINFO *envinfo;
@@ -86,7 +86,7 @@ static void DbEnv_initialize(JNIEnv *jnienv, DB_ENV *dbenv,
DB_ASSERT(envinfo == NULL);
envinfo = dbjie_construct(jnienv, jenv, jerrcall, is_dbopen);
set_private_info(jnienv, name_DB_ENV, jenv, envinfo);
- dbenv->set_errpfx(dbenv, (const gchar *)envinfo);
+ dbenv->set_errpfx(dbenv, (const char*)envinfo);
dbenv->set_errcall(dbenv, DbEnv_errcall_callback);
dbenv->api2_internal = envinfo;
set_private_dbobj(jnienv, name_DB_ENV, jenv, dbenv);
@@ -129,7 +129,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv__1init
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jobject /*DbErrcall*/ jerrcall,
jint flags)
{
- gint err;
+ int err;
DB_ENV *dbenv;
err = db_env_create(&dbenv, flags);
@@ -153,7 +153,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv_open
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jstring db_home,
jint flags, jint mode)
{
- gint err;
+ int err;
DB_ENV *dbenv;
LOCKED_STRING ls_home;
DB_ENV_JAVAINFO *dbenvinfo;
@@ -181,7 +181,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv_remove
DB_ENV *dbenv;
DB_ENV_JAVAINFO *dbenvinfo;
LOCKED_STRING ls_home;
- gint err = 0;
+ int err = 0;
dbenv = get_DB_ENV(jnienv, jthis);
dbenvinfo = get_DB_ENV_JAVAINFO(jnienv, jthis);
@@ -204,7 +204,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv_remove
JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv__1close
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jint flags)
{
- gint err;
+ int err;
DB_ENV *dbenv;
DB_ENV_JAVAINFO *dbenvinfo;
@@ -230,7 +230,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv_dbremove
LOCKED_STRING ls_name, ls_subdb;
DB_ENV *dbenv;
DB_TXN *txn;
- gint err;
+ int err;
dbenv = get_DB_ENV(jnienv, jthis);
if (!verify_non_null(jnienv, dbenv))
@@ -258,7 +258,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv_dbrename
LOCKED_STRING ls_name, ls_subdb, ls_newname;
DB_ENV *dbenv;
DB_TXN *txn;
- gint err;
+ int err;
dbenv = get_DB_ENV(jnienv, jthis);
if (!verify_non_null(jnienv, dbenv))
@@ -322,7 +322,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv_errx
JNIEXPORT jstring JNICALL Java_com_sleepycat_db_DbEnv_strerror
(JNIEnv *jnienv, jclass jthis_class, jint ecode)
{
- const gchar *message;
+ const char *message;
COMPQUIET(jthis_class, NULL);
message = db_strerror(ecode);
@@ -336,7 +336,7 @@ JAVADB_METHOD(DbEnv_set_1cachesize,
JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv_set_1encrypt
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jstring jpasswd, jint flags)
{
- gint err;
+ int err;
DB_ENV *dbenv;
LOCKED_STRING ls_passwd;
@@ -371,10 +371,10 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv_set_1lk_1conflicts
{
DB_ENV *dbenv;
DB_ENV_JAVAINFO *dbenvinfo;
- gint err;
+ int err;
jsize i, len;
u_char *newarr;
- gint bytesize;
+ int bytesize;
dbenv = get_DB_ENV(jnienv, jthis);
dbenvinfo = get_DB_ENV_JAVAINFO(jnienv, jthis);
@@ -408,7 +408,7 @@ JNIEXPORT jint JNICALL
jint timeout)
{
DB_ENV *dbenv;
- gint err, id;
+ int err, id;
if (!verify_non_null(jnienv, jthis))
return (DB_EID_INVALID);
@@ -429,7 +429,7 @@ JNIEXPORT jint JNICALL
{
DB_ENV *dbenv;
LOCKED_DBT cdbt, rdbt;
- gint err, envid;
+ int err, envid;
if (!verify_non_null(jnienv, jthis) || !verify_non_null(jnienv, result))
return (-1);
@@ -469,7 +469,7 @@ JNIEXPORT void JNICALL
DB_ENV *dbenv;
DBT *dbtp;
LOCKED_DBT ldbt;
- gint err;
+ int err;
if (!verify_non_null(jnienv, jthis))
return;
@@ -494,7 +494,7 @@ out: if (cookie != NULL)
JNIEXPORT jobject JNICALL Java_com_sleepycat_db_DbEnv_rep_1stat
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jint flags)
{
- gint err;
+ int err;
DB_ENV *dbenv = get_DB_ENV(jnienv, jthis);
DB_REP_STAT *statp = NULL;
jobject retval = NULL;
@@ -522,7 +522,7 @@ Java_com_sleepycat_db_DbEnv_set_1rep_1limit
(JNIEnv *jnienv, /* DbEnv */ jobject jthis, jint gbytes, jint bytes)
{
DB_ENV *dbenv;
- gint err;
+ int err;
dbenv = get_DB_ENV(jnienv, jthis);
@@ -557,9 +557,9 @@ JNIEXPORT void JNICALL
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, /*DbClient*/ jobject jclient,
jstring jhost, jlong tsec, jlong ssec, jint flags)
{
- gint err;
+ int err;
DB_ENV *dbenv = get_DB_ENV(jnienv, jthis);
- const gchar *host = (*jnienv)->GetStringUTFChars(jnienv, jhost, NULL);
+ const char *host = (*jnienv)->GetStringUTFChars(jnienv, jhost, NULL);
if (jclient != NULL) {
report_exception(jnienv, "DbEnv.set_rpc_server client arg "
@@ -583,7 +583,7 @@ JNIEXPORT void JNICALL
Java_com_sleepycat_db_DbEnv__1set_1tx_1timestamp
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jlong seconds)
{
- gint err;
+ int err;
DB_ENV *dbenv = get_DB_ENV(jnienv, jthis);
time_t time = seconds;
@@ -641,7 +641,7 @@ JNIEXPORT jstring JNICALL Java_com_sleepycat_db_DbEnv_get_1version_1string
JNIEXPORT jint JNICALL Java_com_sleepycat_db_DbEnv_lock_1id
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis)
{
- gint err;
+ int err;
u_int32_t id;
DB_ENV *dbenv = get_DB_ENV(jnienv, jthis);
@@ -658,7 +658,7 @@ JAVADB_METHOD(DbEnv_lock_1id_1free, (JAVADB_ARGS, jint id), DB_ENV,
JNIEXPORT jobject JNICALL Java_com_sleepycat_db_DbEnv_lock_1stat
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jint flags)
{
- gint err;
+ int err;
DB_ENV *dbenv = get_DB_ENV(jnienv, jthis);
DB_LOCK_STAT *statp = NULL;
jobject retval = NULL;
@@ -684,9 +684,9 @@ err: __os_ufree(dbenv, statp);
JNIEXPORT jint JNICALL Java_com_sleepycat_db_DbEnv_lock_1detect
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jint atype, jint flags)
{
- gint err;
+ int err;
DB_ENV *dbenv = get_DB_ENV(jnienv, jthis);
- gint aborted;
+ int aborted;
if (!verify_non_null(jnienv, dbenv))
return (0);
@@ -699,7 +699,7 @@ JNIEXPORT /*DbLock*/ jobject JNICALL Java_com_sleepycat_db_DbEnv_lock_1get
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, /*u_int32_t*/ jint locker,
jint flags, /*const Dbt*/ jobject obj, /*db_lockmode_t*/ jint lock_mode)
{
- gint err;
+ int err;
DB_ENV *dbenv;
DB_LOCK *dblock;
LOCKED_DBT lobj;
@@ -747,16 +747,16 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv_lock_1vec
DB_LOCKREQ *failedreq;
DB_LOCK *lockp;
LOCKED_DBT *locked_dbts;
- gint err;
- gint alloc_err;
- gint i;
+ int err;
+ int alloc_err;
+ int i;
size_t bytesize;
size_t ldbtsize;
jobject jlockreq;
db_lockop_t op;
jobject jobj;
jobject jlock;
- gint completed;
+ int completed;
dbenv = get_DB_ENV(jnienv, jthis);
if (!verify_non_null(jnienv, dbenv))
@@ -931,7 +931,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv_lock_1vec
JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv_lock_1put
(JNIEnv *jnienv, jobject jthis, /*DbLock*/ jobject jlock)
{
- gint err;
+ int err;
DB_ENV *dbenv;
DB_LOCK *dblock;
@@ -959,8 +959,8 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv_lock_1put
JNIEXPORT jobjectArray JNICALL Java_com_sleepycat_db_DbEnv_log_1archive
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jint flags)
{
- gint err, len, i;
- gchar ** ret;
+ int err, len, i;
+ char** ret;
jclass stringClass;
jobjectArray strarray;
DB_ENV *dbenv;
@@ -1007,7 +1007,7 @@ JNIEXPORT jint JNICALL Java_com_sleepycat_db_DbEnv_log_1compare
JNIEXPORT jobject JNICALL Java_com_sleepycat_db_DbEnv_log_1cursor
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jint flags)
{
- gint err;
+ int err;
DB_LOGC *dblogc;
DB_ENV *dbenv = get_DB_ENV(jnienv, jthis);
@@ -1021,10 +1021,10 @@ JNIEXPORT jobject JNICALL Java_com_sleepycat_db_DbEnv_log_1cursor
JNIEXPORT jstring JNICALL Java_com_sleepycat_db_DbEnv_log_1file
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, /*DbLsn*/ jobject lsn)
{
- gint err;
+ int err;
DB_ENV *dbenv = get_DB_ENV(jnienv, jthis);
DB_LSN *dblsn = get_DB_LSN(jnienv, lsn);
- gchar filename[FILENAME_MAX+1] = "";
+ char filename[FILENAME_MAX+1] = "";
if (!verify_non_null(jnienv, dbenv))
return (NULL);
@@ -1043,7 +1043,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv_log_1put
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, /*DbLsn*/ jobject lsn,
/*DbDbt*/ jobject data, jint flags)
{
- gint err;
+ int err;
DB_ENV *dbenv;
DB_LSN *dblsn;
LOCKED_DBT ldata;
@@ -1069,7 +1069,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv_log_1put
JNIEXPORT jobject JNICALL Java_com_sleepycat_db_DbEnv_log_1stat
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jint flags)
{
- gint err;
+ int err;
DB_ENV *dbenv;
DB_LOG_STAT *statp;
jobject retval;
@@ -1098,7 +1098,7 @@ err: __os_ufree(dbenv, statp);
JNIEXPORT jobject JNICALL Java_com_sleepycat_db_DbEnv_memp_1stat
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jint flags)
{
- gint err;
+ int err;
jclass dbclass;
DB_ENV *dbenv;
DB_MPOOL_STAT *statp;
@@ -1127,7 +1127,7 @@ err: __os_ufree(dbenv, statp);
JNIEXPORT jobjectArray JNICALL Java_com_sleepycat_db_DbEnv_memp_1fstat
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jint flags)
{
- gint err, i, len;
+ int err, i, len;
jclass fstat_class;
DB_ENV *dbenv;
DB_MPOOL_FSTAT **fstatp;
@@ -1190,9 +1190,9 @@ err: __os_ufree(dbenv, fstatp);
JNIEXPORT jint JNICALL Java_com_sleepycat_db_DbEnv_memp_1trickle
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jint pct)
{
- gint err;
+ int err;
DB_ENV *dbenv = get_DB_ENV(jnienv, jthis);
- gint result = 0;
+ int result = 0;
if (verify_non_null(jnienv, dbenv)) {
err = dbenv->memp_trickle(dbenv, pct, &result);
@@ -1204,7 +1204,7 @@ JNIEXPORT jint JNICALL Java_com_sleepycat_db_DbEnv_memp_1trickle
JNIEXPORT jobject JNICALL Java_com_sleepycat_db_DbEnv_txn_1begin
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, /*DbTxn*/ jobject pid, jint flags)
{
- gint err;
+ int err;
DB_TXN *dbpid, *result;
DB_ENV *dbenv;
@@ -1243,12 +1243,12 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_DbEnv_app_1dispatch_1changed
JNIEXPORT jobjectArray JNICALL Java_com_sleepycat_db_DbEnv_txn_1recover
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jint count, jint flags)
{
- gint err;
+ int err;
DB_ENV *dbenv;
DB_PREPLIST *preps;
long retcount;
- gint i;
- gchar signature[128];
+ int i;
+ char signature[128];
size_t bytesize;
jobject retval;
jobject obj;
@@ -1328,15 +1328,15 @@ out: return (retval);
JNIEXPORT jobject JNICALL Java_com_sleepycat_db_DbEnv_txn_1stat
(JNIEnv *jnienv, /*DbEnv*/ jobject jthis, jint flags)
{
- gint err;
+ int err;
DB_ENV *dbenv;
DB_TXN_STAT *statp;
jobject retval, obj;
jclass dbclass, active_class;
- gchar active_signature[512];
+ char active_signature[512];
jfieldID arrid;
jobjectArray actives;
- guint i;
+ unsigned int i;
retval = NULL;
statp = NULL;
diff --git a/libdb/libdb_java/java_DbLock.c b/libdb/libdb_java/java_DbLock.c
index 50b1a27..51aca62 100644
--- a/libdb/libdb_java/java_DbLock.c
+++ b/libdb/libdb_java/java_DbLock.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include <jni.h>
diff --git a/libdb/libdb_java/java_DbLogc.c b/libdb/libdb_java/java_DbLogc.c
index 59f9c12..f42667d 100644
--- a/libdb/libdb_java/java_DbLogc.c
+++ b/libdb/libdb_java/java_DbLogc.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include <jni.h>
@@ -25,7 +25,7 @@ static const gchar revid[] = "$Id$";
JNIEXPORT void JNICALL Java_com_sleepycat_db_DbLogc_close
(JNIEnv *jnienv, jobject jthis, jint flags)
{
- gint err;
+ int err;
DB_LOGC *dblogc = get_DB_LOGC(jnienv, jthis);
if (!verify_non_null(jnienv, dblogc))
@@ -40,7 +40,7 @@ JNIEXPORT jint JNICALL Java_com_sleepycat_db_DbLogc_get
(JNIEnv *jnienv, jobject jthis,
/*DbLsn*/ jobject lsn, /*Dbt*/ jobject data, jint flags)
{
- gint err, retry;
+ int err, retry;
DB_LOGC *dblogc;
DB_LSN *dblsn;
LOCKED_DBT ldata;
diff --git a/libdb/libdb_java/java_DbLsn.c b/libdb/libdb_java/java_DbLsn.c
index 6ea3e18..f4d5d62 100644
--- a/libdb/libdb_java/java_DbLsn.c
+++ b/libdb/libdb_java/java_DbLsn.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include <jni.h>
diff --git a/libdb/libdb_java/java_DbTxn.c b/libdb/libdb_java/java_DbTxn.c
index 3e94379..0a8b2af 100644
--- a/libdb/libdb_java/java_DbTxn.c
+++ b/libdb/libdb_java/java_DbTxn.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include <jni.h>
@@ -29,7 +29,7 @@ JAVADB_METHOD(DbTxn_discard, (JAVADB_ARGS, jint flags), DB_TXN,
JNIEXPORT jint JNICALL Java_com_sleepycat_db_DbTxn_id
(JNIEnv *jnienv, jobject jthis)
{
- gint retval = 0;
+ int retval = 0;
DB_TXN *dbtxn = get_DB_TXN(jnienv, jthis);
if (!verify_non_null(jnienv, dbtxn))
return (-1);
@@ -42,7 +42,7 @@ JNIEXPORT jint JNICALL Java_com_sleepycat_db_DbTxn_id
JNIEXPORT void JNICALL Java_com_sleepycat_db_DbTxn_prepare
(JNIEnv *jnienv, jobject jthis, jbyteArray gid)
{
- gint err;
+ int err;
DB_TXN *dbtxn;
jbyte *c_array;
diff --git a/libdb/libdb_java/java_DbUtil.c b/libdb/libdb_java/java_DbUtil.c
index bbabde0..ed958dd 100644
--- a/libdb/libdb_java/java_DbUtil.c
+++ b/libdb/libdb_java/java_DbUtil.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include <jni.h>
diff --git a/libdb/libdb_java/java_DbXAResource.c b/libdb/libdb_java/java_DbXAResource.c
index 7039f8a..fba0900 100644
--- a/libdb/libdb_java/java_DbXAResource.c
+++ b/libdb/libdb_java/java_DbXAResource.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include <jni.h>
@@ -27,7 +27,7 @@ static const gchar revid[] = "$Id$";
JNIEXPORT void JNICALL Java_com_sleepycat_db_xa_DbXAResource__1init
(JNIEnv *jnienv, jobject jthis, jstring home, jint rmid, jint flags)
{
- gint err;
+ int err;
LOCKED_STRING ls_home;
jclass cl;
jmethodID mid;
@@ -35,7 +35,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_xa_DbXAResource__1init
COMPQUIET(jthis, NULL);
if (locked_string_get(&ls_home, jnienv, home) != 0)
goto out;
- if ((err = __db_xa_open((gchar *)ls_home.string,
+ if ((err = __db_xa_open((char *)ls_home.string,
rmid, flags)) != XA_OK) {
verify_return(jnienv, err, EXCEPTION_XA);
}
@@ -58,13 +58,13 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_xa_DbXAResource__1init
JNIEXPORT void JNICALL Java_com_sleepycat_db_xa_DbXAResource__1close
(JNIEnv *jnienv, jobject jthis, jstring home, jint rmid, jint flags)
{
- gint err;
+ int err;
LOCKED_STRING ls_home;
COMPQUIET(jthis, NULL);
if (locked_string_get(&ls_home, jnienv, home) != 0)
goto out;
- if ((err = __db_xa_close((gchar *)ls_home.string,
+ if ((err = __db_xa_close((char *)ls_home.string,
rmid, flags)) != XA_OK)
verify_return(jnienv, err, EXCEPTION_XA);
out:
@@ -77,7 +77,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_xa_DbXAResource__1commit
{
XID xid;
long flags;
- gint err;
+ int err;
COMPQUIET(jthis, NULL);
if (!get_XID(jnienv, jxid, &xid))
@@ -93,7 +93,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_xa_DbXAResource__1end
(JNIEnv *jnienv, jobject jthis, jobject jxid, jint rmid, jint flags)
{
XID xid;
- gint err;
+ int err;
COMPQUIET(jthis, NULL);
if (!get_XID(jnienv, jxid, &xid))
@@ -106,7 +106,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_xa_DbXAResource__1forget
(JNIEnv *jnienv, jobject jthis, jobject jxid, jint rmid)
{
XID xid;
- gint err;
+ int err;
COMPQUIET(jthis, NULL);
if (!get_XID(jnienv, jxid, &xid))
@@ -119,7 +119,7 @@ JNIEXPORT jint JNICALL Java_com_sleepycat_db_xa_DbXAResource__1prepare
(JNIEnv *jnienv, jobject jthis, jobject jxid, jint rmid)
{
XID xid;
- gint err;
+ int err;
COMPQUIET(jthis, NULL);
if (!get_XID(jnienv, jxid, &xid))
@@ -135,11 +135,11 @@ JNIEXPORT jobjectArray JNICALL Java_com_sleepycat_db_xa_DbXAResource__1recover
(JNIEnv *jnienv, jobject jthis, jint rmid, jint flags)
{
XID *xids;
- gint err;
- gint total;
- gint cnt;
- gint i;
- gint curflags;
+ int err;
+ int total;
+ int cnt;
+ int i;
+ int curflags;
size_t nbytes;
jclass xid_class;
jmethodID mid;
@@ -212,7 +212,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_xa_DbXAResource__1rollback
(JNIEnv *jnienv, jobject jthis, jobject jxid, jint rmid)
{
XID xid;
- gint err;
+ int err;
COMPQUIET(jthis, NULL);
if (!get_XID(jnienv, jxid, &xid))
@@ -225,7 +225,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_xa_DbXAResource__1start
(JNIEnv *jnienv, jobject jthis, jobject jxid, jint rmid, jint flags)
{
XID xid;
- gint err;
+ int err;
COMPQUIET(jthis, NULL);
if (!get_XID(jnienv, jxid, &xid))
@@ -240,11 +240,11 @@ JNIEXPORT jobject JNICALL Java_com_sleepycat_db_xa_DbXAResource_xa_1attach
{
XID xid;
XID *xidp;
- gint ret;
+ int ret;
DB_ENV *env;
DB_TXN *txn;
- gint rmid;
- gint *rmidp;
+ int rmid;
+ int *rmidp;
jobject jtxn;
jobject jenv;
jclass cl;
diff --git a/libdb/libdb_java/java_Dbc.c b/libdb/libdb_java/java_Dbc.c
index b69db1e..025da40 100644
--- a/libdb/libdb_java/java_Dbc.c
+++ b/libdb/libdb_java/java_Dbc.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include <jni.h>
@@ -25,7 +25,7 @@ static const gchar revid[] = "$Id$";
JNIEXPORT void JNICALL Java_com_sleepycat_db_Dbc_close
(JNIEnv *jnienv, jobject jthis)
{
- gint err;
+ int err;
DBC *dbc = get_DBC(jnienv, jthis);
if (!verify_non_null(jnienv, dbc))
@@ -39,7 +39,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_Dbc_close
JNIEXPORT jint JNICALL Java_com_sleepycat_db_Dbc_count
(JNIEnv *jnienv, jobject jthis, jint flags)
{
- gint err;
+ int err;
DBC *dbc = get_DBC(jnienv, jthis);
db_recno_t count;
@@ -56,7 +56,7 @@ JAVADB_METHOD_INT(Dbc_del, (JAVADB_ARGS, jint flags), DBC,
JNIEXPORT jobject JNICALL Java_com_sleepycat_db_Dbc_dup
(JNIEnv *jnienv, jobject jthis, jint flags)
{
- gint err;
+ int err;
DBC *dbc = get_DBC(jnienv, jthis);
DBC *dbc_ret = NULL;
@@ -73,7 +73,7 @@ JNIEXPORT jint JNICALL Java_com_sleepycat_db_Dbc_get
(JNIEnv *jnienv, jobject jthis,
/*Dbt*/ jobject key, /*Dbt*/ jobject data, jint flags)
{
- gint err, retry, op_flags;
+ int err, retry, op_flags;
DBC *dbc;
DB_ENV *dbenv;
LOCKED_DBT lkey, ldata;
@@ -143,7 +143,7 @@ JNIEXPORT jint JNICALL Java_com_sleepycat_db_Dbc_pget
(JNIEnv *jnienv, jobject jthis,
/*Dbt*/ jobject key, /*Dbt*/ jobject pkey, /*Dbt*/ jobject data, jint flags)
{
- gint err, retry, op_flags;
+ int err, retry, op_flags;
DBC *dbc;
DB_ENV *dbenv;
LOCKED_DBT lkey, lpkey, ldata;
@@ -220,7 +220,7 @@ JNIEXPORT jint JNICALL Java_com_sleepycat_db_Dbc_put
(JNIEnv *jnienv, jobject jthis,
/*Dbt*/ jobject key, /*Dbt*/ jobject data, jint flags)
{
- gint err;
+ int err;
DBC *dbc;
DB_ENV *dbenv;
LOCKED_DBT lkey, ldata;
diff --git a/libdb/libdb_java/java_Dbt.c b/libdb/libdb_java/java_Dbt.c
index 5207f5a..5d04c91 100644
--- a/libdb/libdb_java/java_Dbt.c
+++ b/libdb/libdb_java/java_Dbt.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include <jni.h>
@@ -33,7 +33,7 @@ JNIEXPORT jbyteArray JNICALL Java_com_sleepycat_db_Dbt_create_1data
{
DBT_JAVAINFO *db_this;
jbyteArray arr = NULL;
- gint len;
+ int len;
db_this = get_DBT_JAVAINFO(jnienv, jthis);
if (verify_non_null(jnienv, db_this)) {
diff --git a/libdb/libdb_java/java_info.c b/libdb/libdb_java/java_info.c
index c4c54ab..a0369d8 100644
--- a/libdb/libdb_java/java_info.c
+++ b/libdb/libdb_java/java_info.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include <jni.h>
@@ -23,7 +23,7 @@ static const gchar revid[] = "$Id$";
* Callback functions
*/
-static gint Db_assoc_callback(DB *db,
+static int Db_assoc_callback(DB *db,
const DBT *key,
const DBT *data,
DBT *retval)
@@ -36,7 +36,7 @@ static gint Db_assoc_callback(DB *db,
key, data, retval));
}
-static void Db_feedback_callback(DB *db, gint opcode, gint percent)
+static void Db_feedback_callback(DB *db, int opcode, int percent)
{
DB_JAVAINFO *dbinfo;
@@ -45,7 +45,7 @@ static void Db_feedback_callback(DB *db, gint opcode, gint percent)
dbji_call_feedback(dbinfo, db, dbinfo->jdbref, opcode, percent);
}
-static gint Db_append_recno_callback(DB *db, DBT *dbt, db_recno_t recno)
+static int Db_append_recno_callback(DB *db, DBT *dbt, db_recno_t recno)
{
DB_JAVAINFO *dbinfo;
@@ -53,7 +53,7 @@ static gint Db_append_recno_callback(DB *db, DBT *dbt, db_recno_t recno)
return (dbji_call_append_recno(dbinfo, db, dbinfo->jdbref, dbt, recno));
}
-static gint Db_bt_compare_callback(DB *db, const DBT *dbt1, const DBT *dbt2)
+static int Db_bt_compare_callback(DB *db, const DBT *dbt1, const DBT *dbt2)
{
DB_JAVAINFO *dbinfo;
@@ -69,7 +69,7 @@ static size_t Db_bt_prefix_callback(DB *db, const DBT *dbt1, const DBT *dbt2)
return (dbji_call_bt_prefix(dbinfo, db, dbinfo->jdbref, dbt1, dbt2));
}
-static gint Db_dup_compare_callback(DB *db, const DBT *dbt1, const DBT *dbt2)
+static int Db_dup_compare_callback(DB *db, const DBT *dbt1, const DBT *dbt2)
{
DB_JAVAINFO *dbinfo;
@@ -77,7 +77,7 @@ static gint Db_dup_compare_callback(DB *db, const DBT *dbt1, const DBT *dbt2)
return (dbji_call_dup_compare(dbinfo, db, dbinfo->jdbref, dbt1, dbt2));
}
-static u_int32_t Db_h_hash_callback(DB *db, gconstpointer data, u_int32_t len)
+static u_int32_t Db_h_hash_callback(DB *db, const void *data, u_int32_t len)
{
DB_JAVAINFO *dbinfo;
@@ -85,7 +85,7 @@ static u_int32_t Db_h_hash_callback(DB *db, gconstpointer data, u_int32_t len)
return (dbji_call_h_hash(dbinfo, db, dbinfo->jdbref, data, len));
}
-static void DbEnv_feedback_callback(DB_ENV *dbenv, gint opcode, gint percent)
+static void DbEnv_feedback_callback(DB_ENV *dbenv, int opcode, int percent)
{
DB_ENV_JAVAINFO *dbinfo;
@@ -94,9 +94,9 @@ static void DbEnv_feedback_callback(DB_ENV *dbenv, gint opcode, gint percent)
dbjie_call_feedback(dbinfo, dbenv, dbinfo->jenvref, opcode, percent);
}
-static gint DbEnv_rep_transport_callback(DB_ENV *dbenv,
+static int DbEnv_rep_transport_callback(DB_ENV *dbenv,
const DBT *control, const DBT *rec,
- gint envid, u_int32_t flags)
+ int envid, u_int32_t flags)
{
DB_ENV_JAVAINFO *dbinfo;
@@ -105,7 +105,7 @@ static gint DbEnv_rep_transport_callback(DB_ENV *dbenv,
dbinfo->jenvref, control, rec, envid, (int)flags));
}
-static gint DbEnv_app_dispatch_callback(DB_ENV *dbenv, DBT *dbt,
+static int DbEnv_app_dispatch_callback(DB_ENV *dbenv, DBT *dbt,
DB_LSN *lsn, db_recops recops)
{
DB_ENV_JAVAINFO *dbinfo;
@@ -124,7 +124,7 @@ DBT_JAVAINFO *
dbjit_construct()
{
DBT_JAVAINFO *dbjit;
- gint err;
+ int err;
/*XXX should return err*/
if ((err = __os_malloc(NULL, sizeof(DBT_JAVAINFO), &dbjit)) != 0)
@@ -152,10 +152,10 @@ DB_ENV_JAVAINFO *
dbjie_construct(JNIEnv *jnienv,
jobject jenv,
jobject default_errcall,
- gint is_dbopen)
+ int is_dbopen)
{
DB_ENV_JAVAINFO *dbjie;
- gint err;
+ int err;
/*XXX should return err*/
if ((err = __os_malloc(NULL, sizeof(DB_ENV_JAVAINFO), &dbjie)) != 0)
@@ -243,10 +243,10 @@ dbjie_get_jnienv(DB_ENV_JAVAINFO *dbjie)
* Different versions of the JNI disagree on the signature
* for AttachCurrentThread. The most recent documentation
* seems to say that (JNIEnv **) is correct, but newer
- * JNIs seem to use (gpointer *), oddly enough.
+ * JNIs seem to use (void **), oddly enough.
*/
#ifdef JNI_VERSION_1_2
- gpointer attachret = 0;
+ void *attachret = 0;
#else
JNIEnv *attachret = 0;
#endif
@@ -306,7 +306,7 @@ dbjie_set_conflict(DB_ENV_JAVAINFO *dbjie, u_char *newarr, size_t size)
void dbjie_set_feedback_object(DB_ENV_JAVAINFO *dbjie, JNIEnv *jnienv,
DB_ENV *dbenv, jobject jfeedback)
{
- gint err;
+ int err;
if (dbjie->feedback != NULL) {
DELETE_GLOBAL_REF(jnienv, dbjie->feedback);
@@ -327,7 +327,7 @@ void dbjie_set_feedback_object(DB_ENV_JAVAINFO *dbjie, JNIEnv *jnienv,
}
void dbjie_call_feedback(DB_ENV_JAVAINFO *dbjie, DB_ENV *dbenv, jobject jenv,
- gint opcode, gint percent)
+ int opcode, int percent)
{
JNIEnv *jnienv;
jclass feedback_class;
@@ -359,9 +359,9 @@ void dbjie_call_feedback(DB_ENV_JAVAINFO *dbjie, DB_ENV *dbenv, jobject jenv,
}
void dbjie_set_rep_transport_object(DB_ENV_JAVAINFO *dbjie, JNIEnv *jnienv,
- DB_ENV *dbenv, gint id, jobject jtransport)
+ DB_ENV *dbenv, int id, jobject jtransport)
{
- gint err;
+ int err;
if (dbjie->rep_transport != NULL)
DELETE_GLOBAL_REF(jnienv, dbjie->rep_transport);
@@ -373,9 +373,9 @@ void dbjie_set_rep_transport_object(DB_ENV_JAVAINFO *dbjie, JNIEnv *jnienv,
dbjie->rep_transport = NEW_GLOBAL_REF(jnienv, jtransport);
}
-gint dbjie_call_rep_transport(DB_ENV_JAVAINFO *dbjie, DB_ENV *dbenv,
+int dbjie_call_rep_transport(DB_ENV_JAVAINFO *dbjie, DB_ENV *dbenv,
jobject jenv, const DBT *control,
- const DBT *rec, gint flags, gint envid)
+ const DBT *rec, int flags, int envid)
{
JNIEnv *jnienv;
jclass rep_transport_class;
@@ -416,7 +416,7 @@ gint dbjie_call_rep_transport(DB_ENV_JAVAINFO *dbjie, DB_ENV *dbenv,
void dbjie_set_app_dispatch_object(DB_ENV_JAVAINFO *dbjie, JNIEnv *jnienv,
DB_ENV *dbenv, jobject japp_dispatch)
{
- gint err;
+ int err;
if (dbjie->app_dispatch != NULL) {
DELETE_GLOBAL_REF(jnienv, dbjie->app_dispatch);
@@ -436,8 +436,8 @@ void dbjie_set_app_dispatch_object(DB_ENV_JAVAINFO *dbjie, JNIEnv *jnienv,
dbjie->app_dispatch = NEW_GLOBAL_REF(jnienv, japp_dispatch);
}
-gint dbjie_call_app_dispatch(DB_ENV_JAVAINFO *dbjie, DB_ENV *dbenv, jobject jenv,
- DBT *dbt, DB_LSN *lsn, gint recops)
+int dbjie_call_app_dispatch(DB_ENV_JAVAINFO *dbjie, DB_ENV *dbenv, jobject jenv,
+ DBT *dbt, DB_LSN *lsn, int recops)
{
JNIEnv *jnienv;
jclass app_dispatch_class;
@@ -498,7 +498,7 @@ jint dbjie_is_dbopen(DB_ENV_JAVAINFO *dbjie)
DB_JAVAINFO *dbji_construct(JNIEnv *jnienv, jobject jdb, jint flags)
{
DB_JAVAINFO *dbji;
- gint err;
+ int err;
/*XXX should return err*/
if ((err = __os_malloc(NULL, sizeof(DB_JAVAINFO), &dbji)) != 0)
@@ -567,10 +567,10 @@ JNIEnv *dbji_get_jnienv(DB_JAVAINFO *dbji)
* Different versions of the JNI disagree on the signature
* for AttachCurrentThread. The most recent documentation
* seems to say that (JNIEnv **) is correct, but newer
- * JNIs seem to use (gpointer *), oddly enough.
+ * JNIs seem to use (void **), oddly enough.
*/
#ifdef JNI_VERSION_1_2
- gpointer attachret = 0;
+ void *attachret = 0;
#else
JNIEnv *attachret = 0;
#endif
@@ -632,7 +632,7 @@ void dbji_set_feedback_object(DB_JAVAINFO *dbji, JNIEnv *jnienv,
}
void dbji_call_feedback(DB_JAVAINFO *dbji, DB *db, jobject jdb,
- gint opcode, gint percent)
+ int opcode, int percent)
{
JNIEnv *jnienv;
@@ -689,7 +689,7 @@ void dbji_set_append_recno_object(DB_JAVAINFO *dbji, JNIEnv *jnienv,
dbji->append_recno = NEW_GLOBAL_REF(jnienv, jcallback);
}
-extern gint dbji_call_append_recno(DB_JAVAINFO *dbji, DB *db, jobject jdb,
+extern int dbji_call_append_recno(DB_JAVAINFO *dbji, DB *db, jobject jdb,
DBT *dbt, jint recno)
{
JNIEnv *jnienv;
@@ -698,7 +698,7 @@ extern gint dbji_call_append_recno(DB_JAVAINFO *dbji, DB *db, jobject jdb,
LOCKED_DBT lresult;
DB_ENV *dbenv;
u_char *bytearray;
- gint err;
+ int err;
jnienv = dbji_get_jnienv(dbji);
dbenv = db->dbenv;
@@ -761,10 +761,10 @@ extern gint dbji_call_append_recno(DB_JAVAINFO *dbji, DB *db, jobject jdb,
void dbji_set_assoc_object(DB_JAVAINFO *dbji, JNIEnv *jnienv,
DB *db, DB_TXN *txn, DB *second,
- jobject jcallback, gint flags)
+ jobject jcallback, int flags)
{
jclass assoc_class;
- gint err;
+ int err;
if (dbji->assoc_method_id == NULL) {
if ((assoc_class =
@@ -804,15 +804,15 @@ void dbji_set_assoc_object(DB_JAVAINFO *dbji, JNIEnv *jnienv,
dbji->assoc = NEW_GLOBAL_REF(jnienv, jcallback);
}
-extern gint dbji_call_assoc(DB_JAVAINFO *dbji, DB *db, jobject jdb,
+extern int dbji_call_assoc(DB_JAVAINFO *dbji, DB *db, jobject jdb,
const DBT *key, const DBT *value, DBT *result)
{
JNIEnv *jnienv;
jobject jresult;
LOCKED_DBT lresult;
DB_ENV *dbenv;
- gint err;
- gint sz;
+ int err;
+ int sz;
u_char *bytearray;
jint retval;
@@ -917,7 +917,7 @@ void dbji_set_bt_compare_object(DB_JAVAINFO *dbji, JNIEnv *jnienv,
dbji->bt_compare = NEW_GLOBAL_REF(jnienv, jcompare);
}
-gint dbji_call_bt_compare(DB_JAVAINFO *dbji, DB *db, jobject jdb,
+int dbji_call_bt_compare(DB_JAVAINFO *dbji, DB *db, jobject jdb,
const DBT *dbt1, const DBT *dbt2)
{
JNIEnv *jnienv;
@@ -1041,7 +1041,7 @@ void dbji_set_dup_compare_object(DB_JAVAINFO *dbji, JNIEnv *jnienv,
dbji->dup_compare = NEW_GLOBAL_REF(jnienv, jcompare);
}
-gint dbji_call_dup_compare(DB_JAVAINFO *dbji, DB *db, jobject jdb,
+int dbji_call_dup_compare(DB_JAVAINFO *dbji, DB *db, jobject jdb,
const DBT *dbt1, const DBT *dbt2)
{
JNIEnv *jnienv;
@@ -1101,8 +1101,8 @@ void dbji_set_h_hash_object(DB_JAVAINFO *dbji, JNIEnv *jnienv,
dbji->h_hash = NEW_GLOBAL_REF(jnienv, jhash);
}
-gint dbji_call_h_hash(DB_JAVAINFO *dbji, DB *db, jobject jdb,
- gconstpointer data, gint len)
+int dbji_call_h_hash(DB_JAVAINFO *dbji, DB *db, jobject jdb,
+ const void *data, int len)
{
JNIEnv *jnienv;
jbyteArray jdata;
@@ -1118,7 +1118,7 @@ gint dbji_call_h_hash(DB_JAVAINFO *dbji, DB *db, jobject jdb,
if ((jdata = (*jnienv)->NewByteArray(jnienv, len)) == NULL)
return (0); /* An exception has been posted by the JVM */
- (*jnienv)->SetByteArrayRegion(jnienv, jdata, 0, len, (gpointer)data);
+ (*jnienv)->SetByteArrayRegion(jnienv, jdata, 0, len, (void *)data);
return (*jnienv)->CallIntMethod(jnienv, dbji->h_hash,
dbji->h_hash_method_id,
jdb, jdata, len);
diff --git a/libdb/libdb_java/java_info.h b/libdb/libdb_java/java_info.h
index 08817aa..a3356a7 100644
--- a/libdb/libdb_java/java_info.h
+++ b/libdb/libdb_java/java_info.h
@@ -40,7 +40,7 @@ typedef struct _dbt_javainfo
jobject dbtref; /* the java Dbt object */
jbyteArray array; /* the java array object -
this is only valid during the API call */
- gint offset; /* offset into the Java array */
+ int offset; /* offset into the Java array */
#define DBT_JAVAINFO_LOCKED 0x01 /* a LOCKED_DBT has been created */
u_int32_t flags;
@@ -89,8 +89,8 @@ extern void dbjit_destroy(DBT_JAVAINFO *dbjit);
typedef struct _db_env_javainfo
{
JavaVM *javavm;
- gint is_dbopen;
- gchar *errpfx;
+ int is_dbopen;
+ char *errpfx;
jobject jenvref; /* global reference */
jobject default_errcall; /* global reference */
jobject errcall; /* global reference */
@@ -108,7 +108,7 @@ DB_ENV_JAVAINFO; /* used with all 'dbjie' functions */
extern DB_ENV_JAVAINFO *dbjie_construct(JNIEnv *jnienv,
jobject jenv,
jobject default_errcall,
- gint is_dbopen);
+ int is_dbopen);
/* release all objects held by this this one */
extern void dbjie_dealloc(DB_ENV_JAVAINFO *, JNIEnv *jnienv);
@@ -128,21 +128,21 @@ extern void dbjie_set_conflict(DB_ENV_JAVAINFO *, u_char *v, size_t sz);
extern void dbjie_set_feedback_object(DB_ENV_JAVAINFO *, JNIEnv *jnienv,
DB_ENV *dbenv, jobject value);
extern void dbjie_call_feedback(DB_ENV_JAVAINFO *, DB_ENV *dbenv, jobject jenv,
- gint opcode, gint percent);
+ int opcode, int percent);
extern void dbjie_set_recovery_init_object(DB_ENV_JAVAINFO *, JNIEnv *jnienv,
DB_ENV *dbenv, jobject value);
-extern gint dbjie_call_recovery_init(DB_ENV_JAVAINFO *, DB_ENV *dbenv,
+extern int dbjie_call_recovery_init(DB_ENV_JAVAINFO *, DB_ENV *dbenv,
jobject jenv);
extern void dbjie_set_rep_transport_object(DB_ENV_JAVAINFO *, JNIEnv *jnienv,
- DB_ENV *dbenv, gint id, jobject obj);
-extern gint dbjie_call_rep_transport(DB_ENV_JAVAINFO *, DB_ENV *dbenv,
+ DB_ENV *dbenv, int id, jobject obj);
+extern int dbjie_call_rep_transport(DB_ENV_JAVAINFO *, DB_ENV *dbenv,
jobject jenv, const DBT *control,
- const DBT *rec, gint envid, gint flags);
+ const DBT *rec, int envid, int flags);
extern void dbjie_set_app_dispatch_object(DB_ENV_JAVAINFO *, JNIEnv *jnienv,
DB_ENV *dbenv, jobject value);
-extern gint dbjie_call_app_dispatch(DB_ENV_JAVAINFO *,
+extern int dbjie_call_app_dispatch(DB_ENV_JAVAINFO *,
DB_ENV *dbenv, jobject jenv,
- DBT *dbt, DB_LSN *lsn, gint recops);
+ DBT *dbt, DB_LSN *lsn, int recops);
extern jobject dbjie_get_errcall(DB_ENV_JAVAINFO *) ;
extern jint dbjie_is_dbopen(DB_ENV_JAVAINFO *);
@@ -195,27 +195,27 @@ extern jint dbji_get_flags();
extern void dbji_set_feedback_object(DB_JAVAINFO *, JNIEnv *jnienv, DB *db, jobject value);
extern void dbji_call_feedback(DB_JAVAINFO *, DB *db, jobject jdb,
- gint opcode, gint percent);
+ int opcode, int percent);
extern void dbji_set_append_recno_object(DB_JAVAINFO *, JNIEnv *jnienv, DB *db, jobject value);
-extern gint dbji_call_append_recno(DB_JAVAINFO *, DB *db, jobject jdb,
+extern int dbji_call_append_recno(DB_JAVAINFO *, DB *db, jobject jdb,
DBT *dbt, jint recno);
extern void dbji_set_assoc_object(DB_JAVAINFO *, JNIEnv *jnienv,
DB *db, DB_TXN *txn, DB *second,
- jobject value, gint flags);
-extern gint dbji_call_assoc(DB_JAVAINFO *, DB *db, jobject jdb,
+ jobject value, int flags);
+extern int dbji_call_assoc(DB_JAVAINFO *, DB *db, jobject jdb,
const DBT *key, const DBT* data, DBT *result);
extern void dbji_set_bt_compare_object(DB_JAVAINFO *, JNIEnv *jnienv, DB *db, jobject value);
-extern gint dbji_call_bt_compare(DB_JAVAINFO *, DB *db, jobject jdb,
+extern int dbji_call_bt_compare(DB_JAVAINFO *, DB *db, jobject jdb,
const DBT *dbt1, const DBT *dbt2);
extern void dbji_set_bt_prefix_object(DB_JAVAINFO *, JNIEnv *jnienv, DB *db, jobject value);
extern size_t dbji_call_bt_prefix(DB_JAVAINFO *, DB *db, jobject jdb,
const DBT *dbt1, const DBT *dbt2);
extern void dbji_set_dup_compare_object(DB_JAVAINFO *, JNIEnv *jnienv, DB *db, jobject value);
-extern gint dbji_call_dup_compare(DB_JAVAINFO *, DB *db, jobject jdb,
+extern int dbji_call_dup_compare(DB_JAVAINFO *, DB *db, jobject jdb,
const DBT *dbt1, const DBT *dbt2);
extern void dbji_set_h_hash_object(DB_JAVAINFO *, JNIEnv *jnienv, DB *db, jobject value);
-extern gint dbji_call_h_hash(DB_JAVAINFO *, DB *db, jobject jdb,
- gconstpointer data, gint len);
+extern int dbji_call_h_hash(DB_JAVAINFO *, DB *db, jobject jdb,
+ const void *data, int len);
#endif /* !_JAVA_INFO_H_ */
diff --git a/libdb/libdb_java/java_locked.c b/libdb/libdb_java/java_locked.c
index 41a354f..7805f06 100644
--- a/libdb/libdb_java/java_locked.c
+++ b/libdb/libdb_java/java_locked.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include <jni.h>
@@ -22,7 +22,7 @@ static const gchar revid[] = "$Id$";
*
* Implementation of functions to manipulate LOCKED_DBT.
*/
-gint
+int
locked_dbt_get(LOCKED_DBT *ldbt, JNIEnv *jnienv, DB_ENV *dbenv,
jobject jdbt, OpKind kind)
{
@@ -261,7 +261,7 @@ locked_dbt_put(LOCKED_DBT *ldbt, JNIEnv *jnienv, DB_ENV *dbenv)
* Return 1 if these conditions are met, otherwise 0. This is used
* internally to simulate the operations needed for DB_DBT_REALLOC.
*/
-gint locked_dbt_realloc(LOCKED_DBT *ldbt, JNIEnv *jnienv, DB_ENV *dbenv)
+int locked_dbt_realloc(LOCKED_DBT *ldbt, JNIEnv *jnienv, DB_ENV *dbenv)
{
DBT *dbt;
@@ -301,7 +301,7 @@ gint locked_dbt_realloc(LOCKED_DBT *ldbt, JNIEnv *jnienv, DB_ENV *dbenv)
*
* Implementation of functions to manipulate LOCKED_STRING.
*/
-gint
+int
locked_string_get(LOCKED_STRING *ls, JNIEnv *jnienv, jstring jstr)
{
ls->jstr = jstr;
diff --git a/libdb/libdb_java/java_locked.h b/libdb/libdb_java/java_locked.h
index 5e6710b..60419ff 100644
--- a/libdb/libdb_java/java_locked.h
+++ b/libdb/libdb_java/java_locked.h
@@ -34,7 +34,7 @@ typedef struct _locked_dbt
{
/* these are accessed externally to locked_dbt_ functions */
DBT_JAVAINFO *javainfo;
- guint java_array_len;
+ unsigned int java_array_len;
jobject jdbt;
/* these are for used internally by locked_dbt_ functions */
@@ -49,19 +49,19 @@ typedef struct _locked_dbt
} LOCKED_DBT;
/* Fill the LOCKED_DBT struct and lock the Java byte array */
-extern gint locked_dbt_get(LOCKED_DBT *, JNIEnv *, DB_ENV *, jobject, OpKind);
+extern int locked_dbt_get(LOCKED_DBT *, JNIEnv *, DB_ENV *, jobject, OpKind);
/* unlock the Java byte array */
extern void locked_dbt_put(LOCKED_DBT *, JNIEnv *, DB_ENV *);
/* realloc the Java byte array */
-extern gint locked_dbt_realloc(LOCKED_DBT *, JNIEnv *, DB_ENV *);
+extern int locked_dbt_realloc(LOCKED_DBT *, JNIEnv *, DB_ENV *);
/*
* LOCKED_STRING
*
* A LOCKED_STRING exists temporarily to convert a java jstring object
- * to a gchar *. Because the memory for the gchar * string is
+ * to a char *. Because the memory for the char * string is
* managed by the JVM, it must be released when we are done
* looking at it. Typically, locked_string_get() is called at the
* beginning of a function for each jstring object, and locked_string_put
@@ -70,13 +70,13 @@ extern gint locked_dbt_realloc(LOCKED_DBT *, JNIEnv *, DB_ENV *);
typedef struct _locked_string
{
/* this accessed externally to locked_string_ functions */
- const gchar *string;
+ const char *string;
/* this is used internally by locked_string_ functions */
jstring jstr;
} LOCKED_STRING;
-extern gint locked_string_get(LOCKED_STRING *, JNIEnv *jnienv, jstring jstr);
+extern int locked_string_get(LOCKED_STRING *, JNIEnv *jnienv, jstring jstr);
extern void locked_string_put(LOCKED_STRING *, JNIEnv *jnienv); /* this unlocks and frees mem */
#endif /* !_JAVA_LOCKED_H_ */
diff --git a/libdb/libdb_java/java_stat_auto.c b/libdb/libdb_java/java_stat_auto.c
index 8840b67..c141223 100644
--- a/libdb/libdb_java/java_stat_auto.c
+++ b/libdb/libdb_java/java_stat_auto.c
@@ -1,6 +1,6 @@
/* DO NOT EDIT: automatically built by dist/s_java. */
#include "java_util.h"
-gint __jv_fill_bt_stat(JNIEnv *jnienv, jclass cl,
+int __jv_fill_bt_stat(JNIEnv *jnienv, jclass cl,
jobject jobj, struct __db_bt_stat *statp) {
JAVADB_STAT_INT(jnienv, cl, jobj, statp, bt_magic);
JAVADB_STAT_INT(jnienv, cl, jobj, statp, bt_version);
@@ -24,7 +24,7 @@ gint __jv_fill_bt_stat(JNIEnv *jnienv, jclass cl,
JAVADB_STAT_INT(jnienv, cl, jobj, statp, bt_over_pgfree);
return (0);
}
-gint __jv_fill_h_stat(JNIEnv *jnienv, jclass cl,
+int __jv_fill_h_stat(JNIEnv *jnienv, jclass cl,
jobject jobj, struct __db_h_stat *statp) {
JAVADB_STAT_INT(jnienv, cl, jobj, statp, hash_magic);
JAVADB_STAT_INT(jnienv, cl, jobj, statp, hash_version);
@@ -44,7 +44,7 @@ gint __jv_fill_h_stat(JNIEnv *jnienv, jclass cl,
JAVADB_STAT_INT(jnienv, cl, jobj, statp, hash_dup_free);
return (0);
}
-gint __jv_fill_lock_stat(JNIEnv *jnienv, jclass cl,
+int __jv_fill_lock_stat(JNIEnv *jnienv, jclass cl,
jobject jobj, struct __db_lock_stat *statp) {
JAVADB_STAT_INT(jnienv, cl, jobj, statp, st_id);
JAVADB_STAT_INT(jnienv, cl, jobj, statp, st_cur_maxid);
@@ -72,7 +72,7 @@ gint __jv_fill_lock_stat(JNIEnv *jnienv, jclass cl,
JAVADB_STAT_INT(jnienv, cl, jobj, statp, st_regsize);
return (0);
}
-gint __jv_fill_log_stat(JNIEnv *jnienv, jclass cl,
+int __jv_fill_log_stat(JNIEnv *jnienv, jclass cl,
jobject jobj, struct __db_log_stat *statp) {
JAVADB_STAT_INT(jnienv, cl, jobj, statp, st_magic);
JAVADB_STAT_INT(jnienv, cl, jobj, statp, st_version);
@@ -97,7 +97,7 @@ gint __jv_fill_log_stat(JNIEnv *jnienv, jclass cl,
JAVADB_STAT_INT(jnienv, cl, jobj, statp, st_mincommitperflush);
return (0);
}
-gint __jv_fill_mpool_stat(JNIEnv *jnienv, jclass cl,
+int __jv_fill_mpool_stat(JNIEnv *jnienv, jclass cl,
jobject jobj, struct __db_mpool_stat *statp) {
JAVADB_STAT_INT(jnienv, cl, jobj, statp, st_gbytes);
JAVADB_STAT_INT(jnienv, cl, jobj, statp, st_bytes);
@@ -131,7 +131,7 @@ gint __jv_fill_mpool_stat(JNIEnv *jnienv, jclass cl,
JAVADB_STAT_INT(jnienv, cl, jobj, statp, st_alloc_max_pages);
return (0);
}
-gint __jv_fill_qam_stat(JNIEnv *jnienv, jclass cl,
+int __jv_fill_qam_stat(JNIEnv *jnienv, jclass cl,
jobject jobj, struct __db_qam_stat *statp) {
JAVADB_STAT_INT(jnienv, cl, jobj, statp, qs_magic);
JAVADB_STAT_INT(jnienv, cl, jobj, statp, qs_version);
@@ -148,7 +148,7 @@ gint __jv_fill_qam_stat(JNIEnv *jnienv, jclass cl,
JAVADB_STAT_INT(jnienv, cl, jobj, statp, qs_cur_recno);
return (0);
}
-gint __jv_fill_rep_stat(JNIEnv *jnienv, jclass cl,
+int __jv_fill_rep_stat(JNIEnv *jnienv, jclass cl,
jobject jobj, struct __db_rep_stat *statp) {
JAVADB_STAT_INT(jnienv, cl, jobj, statp, st_status);
JAVADB_STAT_LSN(jnienv, cl, jobj, statp, st_next_lsn);
@@ -187,7 +187,7 @@ gint __jv_fill_rep_stat(JNIEnv *jnienv, jclass cl,
JAVADB_STAT_INT(jnienv, cl, jobj, statp, st_election_votes);
return (0);
}
-gint __jv_fill_txn_stat(JNIEnv *jnienv, jclass cl,
+int __jv_fill_txn_stat(JNIEnv *jnienv, jclass cl,
jobject jobj, struct __db_txn_stat *statp) {
JAVADB_STAT_LSN(jnienv, cl, jobj, statp, st_last_ckp);
JAVADB_STAT_LONG(jnienv, cl, jobj, statp, st_time_ckp);
diff --git a/libdb/libdb_java/java_stat_auto.h b/libdb/libdb_java/java_stat_auto.h
index e4512a5..20eecf1 100644
--- a/libdb/libdb_java/java_stat_auto.h
+++ b/libdb/libdb_java/java_stat_auto.h
@@ -1,9 +1,9 @@
/* DO NOT EDIT: automatically built by dist/s_java. */
-extern gint __jv_fill_bt_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_bt_stat *statp);
-extern gint __jv_fill_h_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_h_stat *statp);
-extern gint __jv_fill_lock_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_lock_stat *statp);
-extern gint __jv_fill_log_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_log_stat *statp);
-extern gint __jv_fill_mpool_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_mpool_stat *statp);
-extern gint __jv_fill_qam_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_qam_stat *statp);
-extern gint __jv_fill_rep_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_rep_stat *statp);
-extern gint __jv_fill_txn_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_txn_stat *statp);
+extern int __jv_fill_bt_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_bt_stat *statp);
+extern int __jv_fill_h_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_h_stat *statp);
+extern int __jv_fill_lock_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_lock_stat *statp);
+extern int __jv_fill_log_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_log_stat *statp);
+extern int __jv_fill_mpool_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_mpool_stat *statp);
+extern int __jv_fill_qam_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_qam_stat *statp);
+extern int __jv_fill_rep_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_rep_stat *statp);
+extern int __jv_fill_txn_stat(JNIEnv *jnienv, jclass cl, jobject jobj, struct __db_txn_stat *statp);
diff --git a/libdb/libdb_java/java_util.c b/libdb/libdb_java/java_util.c
index c26edc9..0e83c64 100644
--- a/libdb/libdb_java/java_util.c
+++ b/libdb/libdb_java/java_util.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include <jni.h>
@@ -21,48 +21,48 @@ static const gchar revid[] = "$Id$";
#define sys_nerr _sys_nerr
#endif
-const gchar * const name_DB = "Db";
-const gchar * const name_DB_BTREE_STAT = "DbBtreeStat";
-const gchar * const name_DBC = "Dbc";
-const gchar * const name_DB_DEADLOCK_EX = "DbDeadlockException";
-const gchar * const name_DB_ENV = "DbEnv";
-const gchar * const name_DB_EXCEPTION = "DbException";
-const gchar * const name_DB_HASH_STAT = "DbHashStat";
-const gchar * const name_DB_LOCK = "DbLock";
-const gchar * const name_DB_LOCK_STAT = "DbLockStat";
-const gchar * const name_DB_LOCKNOTGRANTED_EX = "DbLockNotGrantedException";
-const gchar * const name_DB_LOGC = "DbLogc";
-const gchar * const name_DB_LOG_STAT = "DbLogStat";
-const gchar * const name_DB_LSN = "DbLsn";
-const gchar * const name_DB_MEMORY_EX = "DbMemoryException";
-const gchar * const name_DB_MPOOL_FSTAT = "DbMpoolFStat";
-const gchar * const name_DB_MPOOL_STAT = "DbMpoolStat";
-const gchar * const name_DB_PREPLIST = "DbPreplist";
-const gchar * const name_DB_QUEUE_STAT = "DbQueueStat";
-const gchar * const name_DB_REP_STAT = "DbRepStat";
-const gchar * const name_DB_RUNRECOVERY_EX = "DbRunRecoveryException";
-const gchar * const name_DBT = "Dbt";
-const gchar * const name_DB_TXN = "DbTxn";
-const gchar * const name_DB_TXN_STAT = "DbTxnStat";
-const gchar * const name_DB_TXN_STAT_ACTIVE = "DbTxnStat$Active";
-const gchar * const name_DB_UTIL = "DbUtil";
-const gchar * const name_DbAppendRecno = "DbAppendRecno";
-const gchar * const name_DbBtreeCompare = "DbBtreeCompare";
-const gchar * const name_DbBtreePrefix = "DbBtreePrefix";
-const gchar * const name_DbDupCompare = "DbDupCompare";
-const gchar * const name_DbEnvFeedback = "DbEnvFeedback";
-const gchar * const name_DbErrcall = "DbErrcall";
-const gchar * const name_DbHash = "DbHash";
-const gchar * const name_DbLockRequest = "DbLockRequest";
-const gchar * const name_DbFeedback = "DbFeedback";
-const gchar * const name_DbRecoveryInit = "DbRecoveryInit";
-const gchar * const name_DbRepTransport = "DbRepTransport";
-const gchar * const name_DbSecondaryKeyCreate = "DbSecondaryKeyCreate";
-const gchar * const name_DbTxnRecover = "DbTxnRecover";
-const gchar * const name_RepElectResult = "DbEnv$RepElectResult";
-const gchar * const name_RepProcessMessage = "DbEnv$RepProcessMessage";
-
-const gchar * const string_signature = "Ljava/lang/String;";
+const char * const name_DB = "Db";
+const char * const name_DB_BTREE_STAT = "DbBtreeStat";
+const char * const name_DBC = "Dbc";
+const char * const name_DB_DEADLOCK_EX = "DbDeadlockException";
+const char * const name_DB_ENV = "DbEnv";
+const char * const name_DB_EXCEPTION = "DbException";
+const char * const name_DB_HASH_STAT = "DbHashStat";
+const char * const name_DB_LOCK = "DbLock";
+const char * const name_DB_LOCK_STAT = "DbLockStat";
+const char * const name_DB_LOCKNOTGRANTED_EX = "DbLockNotGrantedException";
+const char * const name_DB_LOGC = "DbLogc";
+const char * const name_DB_LOG_STAT = "DbLogStat";
+const char * const name_DB_LSN = "DbLsn";
+const char * const name_DB_MEMORY_EX = "DbMemoryException";
+const char * const name_DB_MPOOL_FSTAT = "DbMpoolFStat";
+const char * const name_DB_MPOOL_STAT = "DbMpoolStat";
+const char * const name_DB_PREPLIST = "DbPreplist";
+const char * const name_DB_QUEUE_STAT = "DbQueueStat";
+const char * const name_DB_REP_STAT = "DbRepStat";
+const char * const name_DB_RUNRECOVERY_EX = "DbRunRecoveryException";
+const char * const name_DBT = "Dbt";
+const char * const name_DB_TXN = "DbTxn";
+const char * const name_DB_TXN_STAT = "DbTxnStat";
+const char * const name_DB_TXN_STAT_ACTIVE = "DbTxnStat$Active";
+const char * const name_DB_UTIL = "DbUtil";
+const char * const name_DbAppendRecno = "DbAppendRecno";
+const char * const name_DbBtreeCompare = "DbBtreeCompare";
+const char * const name_DbBtreePrefix = "DbBtreePrefix";
+const char * const name_DbDupCompare = "DbDupCompare";
+const char * const name_DbEnvFeedback = "DbEnvFeedback";
+const char * const name_DbErrcall = "DbErrcall";
+const char * const name_DbHash = "DbHash";
+const char * const name_DbLockRequest = "DbLockRequest";
+const char * const name_DbFeedback = "DbFeedback";
+const char * const name_DbRecoveryInit = "DbRecoveryInit";
+const char * const name_DbRepTransport = "DbRepTransport";
+const char * const name_DbSecondaryKeyCreate = "DbSecondaryKeyCreate";
+const char * const name_DbTxnRecover = "DbTxnRecover";
+const char * const name_RepElectResult = "DbEnv$RepElectResult";
+const char * const name_RepProcessMessage = "DbEnv$RepProcessMessage";
+
+const char * const string_signature = "Ljava/lang/String;";
jfieldID fid_Dbt_data;
jfieldID fid_Dbt_offset;
@@ -129,7 +129,7 @@ void one_time_init(JNIEnv *jnienv)
* The private data is stored in the object as a Java long (64 bits),
* which is long enough to store a pointer on current architectures.
*/
-gpointer get_private_dbobj(JNIEnv *jnienv, const gchar *classname,
+void *get_private_dbobj(JNIEnv *jnienv, const char *classname,
jobject obj)
{
jclass dbClass;
@@ -151,8 +151,8 @@ gpointer get_private_dbobj(JNIEnv *jnienv, const gchar *classname,
* The private data is stored in the object as a Java long (64 bits),
* which is long enough to store a pointer on current architectures.
*/
-void set_private_dbobj(JNIEnv *jnienv, const gchar *classname,
- jobject obj, gpointer value)
+void set_private_dbobj(JNIEnv *jnienv, const char *classname,
+ jobject obj, void *value)
{
long_to_ptr lp;
jclass dbClass;
@@ -171,7 +171,7 @@ void set_private_dbobj(JNIEnv *jnienv, const gchar *classname,
* The private data is stored in the object as a Java long (64 bits),
* which is long enough to store a pointer on current architectures.
*/
-gpointer get_private_info(JNIEnv *jnienv, const gchar *classname,
+void *get_private_info(JNIEnv *jnienv, const char *classname,
jobject obj)
{
jclass dbClass;
@@ -193,8 +193,8 @@ gpointer get_private_info(JNIEnv *jnienv, const gchar *classname,
* The private data is stored in the object as a Java long (64 bits),
* which is long enough to store a pointer on current architectures.
*/
-void set_private_info(JNIEnv *jnienv, const gchar *classname,
- jobject obj, gpointer value)
+void set_private_info(JNIEnv *jnienv, const char *classname,
+ jobject obj, void *value)
{
long_to_ptr lp;
jclass dbClass;
@@ -212,7 +212,7 @@ void set_private_info(JNIEnv *jnienv, const gchar *classname,
* Given a non-qualified name (e.g. "foo"), get the class handle
* for the fully qualified name (e.g. "com.sleepycat.db.foo")
*/
-jclass get_class(JNIEnv *jnienv, const gchar *classname)
+jclass get_class(JNIEnv *jnienv, const char *classname)
{
/*
* Note: PERFORMANCE: It should be possible to cache jclass's.
@@ -222,7 +222,7 @@ jclass get_class(JNIEnv *jnienv, const gchar *classname)
* technically right, but it would likely work with
* most implementations. Possibly make it configurable.
*/
- gchar fullname[128];
+ char fullname[128];
(void)snprintf(fullname, sizeof(fullname),
"%s%s", DB_PACKAGE_NAME, classname);
@@ -236,14 +236,14 @@ jclass get_class(JNIEnv *jnienv, const gchar *classname)
* This is appropriate to be used for classes that may
* not be present.
*/
-jclass get_fully_qualified_class(JNIEnv *jnienv, const gchar *classname)
+jclass get_fully_qualified_class(JNIEnv *jnienv, const char *classname)
{
jclass result;
result = ((*jnienv)->FindClass(jnienv, classname));
if (result == NULL) {
jclass cnfe;
- gchar message[1024];
+ char message[1024];
cnfe = (*jnienv)->FindClass(jnienv,
"java/lang/ClassNotFoundException");
@@ -259,10 +259,10 @@ jclass get_fully_qualified_class(JNIEnv *jnienv, const gchar *classname)
* The field must be a DB object type.
*/
void set_object_field(JNIEnv *jnienv, jclass class_of_this,
- jobject jthis, const gchar *object_classname,
- const gchar *name_of_field, jobject obj)
+ jobject jthis, const char *object_classname,
+ const char *name_of_field, jobject obj)
{
- gchar signature[512];
+ char signature[512];
jfieldID id;
(void)snprintf(signature, sizeof(signature),
@@ -277,7 +277,7 @@ void set_object_field(JNIEnv *jnienv, jclass class_of_this,
* The field must be an integer type.
*/
void set_int_field(JNIEnv *jnienv, jclass class_of_this,
- jobject jthis, const gchar *name_of_field, jint value)
+ jobject jthis, const char *name_of_field, jint value)
{
jfieldID id =
(*jnienv)->GetFieldID(jnienv, class_of_this, name_of_field, "I");
@@ -289,7 +289,7 @@ void set_int_field(JNIEnv *jnienv, jclass class_of_this,
* The field must be an integer type.
*/
void set_long_field(JNIEnv *jnienv, jclass class_of_this,
- jobject jthis, const gchar *name_of_field, jlong value)
+ jobject jthis, const char *name_of_field, jlong value)
{
jfieldID id = (*jnienv)->GetFieldID(jnienv, class_of_this,
name_of_field, "J");
@@ -301,7 +301,7 @@ void set_long_field(JNIEnv *jnienv, jclass class_of_this,
* The field must be an integer type.
*/
void set_lsn_field(JNIEnv *jnienv, jclass class_of_this,
- jobject jthis, const gchar *name_of_field, DB_LSN value)
+ jobject jthis, const char *name_of_field, DB_LSN value)
{
set_object_field(jnienv, class_of_this, jthis, name_DB_LSN,
name_of_field, get_DbLsn(jnienv, value));
@@ -310,8 +310,8 @@ void set_lsn_field(JNIEnv *jnienv, jclass class_of_this,
/*
* Report an exception back to the java side.
*/
-void report_exception(JNIEnv *jnienv, const gchar *text,
- gint err, unsigned long expect_mask)
+void report_exception(JNIEnv *jnienv, const char *text,
+ int err, unsigned long expect_mask)
{
jstring textString;
jclass dbexcept;
@@ -351,7 +351,7 @@ void report_exception(JNIEnv *jnienv, const gchar *text,
"java/io/FileNotFoundException");
}
else {
- gchar errstr[1024];
+ char errstr[1024];
snprintf(errstr, sizeof(errstr),
"internal error: unexpected errno: %s",
@@ -393,9 +393,9 @@ void report_exception(JNIEnv *jnienv, const gchar *text,
* case of DB_LOCK_NOTGRANTED, as more things are added to the
* constructor of this type of exception.
*/
-void report_notgranted_exception(JNIEnv *jnienv, const gchar *text,
+void report_notgranted_exception(JNIEnv *jnienv, const char *text,
db_lockop_t op, db_lockmode_t mode,
- jobject jdbt, jobject jlock, gint index)
+ jobject jdbt, jobject jlock, int index)
{
jstring textString;
jclass dbexcept;
@@ -421,11 +421,11 @@ void report_notgranted_exception(JNIEnv *jnienv, const gchar *text,
/*
* Create an exception object and return it.
* The given class must have a constructor that has a
- * constructor with args (java.lang.String text, gint errno);
+ * constructor with args (java.lang.String text, int errno);
* DbException and its subclasses fit this bill.
*/
jobject create_exception(JNIEnv *jnienv, jstring text,
- gint err, jclass dbexcept)
+ int err, jclass dbexcept)
{
jthrowable obj;
jmethodID mid;
@@ -447,7 +447,7 @@ jobject create_exception(JNIEnv *jnienv, jstring text,
* Report an error via the errcall mechanism.
*/
void report_errcall(JNIEnv *jnienv, jobject errcall,
- jstring prefix, const gchar *message)
+ jstring prefix, const char *message)
{
jmethodID id;
jclass errcall_class;
@@ -473,7 +473,7 @@ void report_errcall(JNIEnv *jnienv, jobject errcall,
* If the object is null, report an exception and return false (0),
* otherwise return true (1).
*/
-gint verify_non_null(JNIEnv *jnienv, gpointer obj)
+int verify_non_null(JNIEnv *jnienv, void *obj)
{
if (obj == NULL) {
report_exception(jnienv, "null object", EINVAL, 0);
@@ -486,7 +486,7 @@ gint verify_non_null(JNIEnv *jnienv, gpointer obj)
* If the error code is non-zero, report an exception and return false (0),
* otherwise return true (1).
*/
-gint verify_return(JNIEnv *jnienv, gint err, unsigned long expect_mask)
+int verify_return(JNIEnv *jnienv, int err, unsigned long expect_mask)
{
if (err == 0)
return (1);
@@ -500,7 +500,7 @@ gint verify_return(JNIEnv *jnienv, gint err, unsigned long expect_mask)
* If there is report a DbMemoryException, with the Dbt attached
* and return false (0), otherwise return true (1).
*/
-gint verify_dbt(JNIEnv *jnienv, gint err, LOCKED_DBT *ldbt)
+int verify_dbt(JNIEnv *jnienv, int err, LOCKED_DBT *ldbt)
{
DBT *dbt;
jobject exception;
@@ -533,7 +533,7 @@ gint verify_dbt(JNIEnv *jnienv, gint err, LOCKED_DBT *ldbt)
/*
* Create an object of the given class, calling its default constructor.
*/
-jobject create_default_object(JNIEnv *jnienv, const gchar *class_name)
+jobject create_default_object(JNIEnv *jnienv, const char *class_name)
{
jmethodID id;
jclass dbclass;
@@ -549,7 +549,7 @@ jobject create_default_object(JNIEnv *jnienv, const gchar *class_name)
* Note: This implementation creates a new Java object on each call,
* so it is generally useful when a new DB object has just been created.
*/
-jobject convert_object(JNIEnv *jnienv, const gchar *class_name, gpointer dbobj)
+jobject convert_object(JNIEnv *jnienv, const char *class_name, void *dbobj)
{
jobject jo;
@@ -564,11 +564,11 @@ jobject convert_object(JNIEnv *jnienv, const gchar *class_name, gpointer dbobj)
/*
* Create a copy of the string
*/
-gchar *dup_string(const gchar *str)
+char *dup_string(const char *str)
{
- gint len;
- gchar *retval;
- gint err;
+ int len;
+ char *retval;
+ int err;
len = strlen(str) + 1;
if ((err = __os_malloc(NULL, sizeof(char)*len, &retval)) != 0)
@@ -580,7 +580,7 @@ gchar *dup_string(const gchar *str)
/*
* Create a java string from the given string
*/
-jstring get_java_string(JNIEnv *jnienv, const gchar * string)
+jstring get_java_string(JNIEnv *jnienv, const char* string)
{
if (string == 0)
return (0);
@@ -591,10 +591,10 @@ jstring get_java_string(JNIEnv *jnienv, const gchar * string)
* Create a copy of the java string using __os_malloc.
* Caller must free it.
*/
-gchar *get_c_string(JNIEnv *jnienv, jstring jstr)
+char *get_c_string(JNIEnv *jnienv, jstring jstr)
{
- const gchar *utf;
- gchar *retval;
+ const char *utf;
+ char *retval;
utf = (*jnienv)->GetStringUTFChars(jnienv, jstr, NULL);
retval = dup_string(utf);
@@ -680,7 +680,7 @@ DB_LSN *get_DB_LSN(JNIEnv *jnienv, /* DbLsn */ jobject obj) {
* DB_LSN is legitimate.
*/
DB_LSN *lsnp;
- gint err;
+ int err;
if (obj == NULL)
return (NULL);
@@ -778,7 +778,7 @@ jobject get_DbLogStat(JNIEnv *jnienv, DB_LOG_STAT *dbobj)
jobject get_DbLsn(JNIEnv *jnienv, DB_LSN dbobj)
{
DB_LSN *lsnp;
- gint err;
+ int err;
if ((err = __os_malloc(NULL, sizeof(DB_LSN), &lsnp)) != 0)
return (NULL);
@@ -804,7 +804,7 @@ jobject get_DbLsn(JNIEnv *jnienv, DB_LSN dbobj)
* arbitrary number. We might also have sharing of the byte arrays
* used by the Dbts.
*/
-static jobject get_Dbt_shared(JNIEnv *jnienv, const DBT *dbt, gint readonly,
+static jobject get_Dbt_shared(JNIEnv *jnienv, const DBT *dbt, int readonly,
DBT_JAVAINFO **ret_info)
{
jobject jdbt;
diff --git a/libdb/libdb_java/java_util.h b/libdb/libdb_java/java_util.h
index 1008cc6..9051a94 100644
--- a/libdb/libdb_java/java_util.h
+++ b/libdb/libdb_java/java_util.h
@@ -47,7 +47,7 @@
/* Union to convert longs to pointers (see {get,set}_private_dbobj). */
typedef union {
jlong java_long;
- gpointer ptr;
+ void *ptr;
} long_to_ptr;
/****************************************************************
@@ -70,19 +70,19 @@ typedef union {
*/
#ifdef DBJAVA_DEBUG
#include <unistd.h>
-static void wrdebug(const gchar *str)
+static void wrdebug(const char *str)
{
write(2, str, strlen(str));
write(2, "\n", 1);
}
-static jobject debug_new_global_ref(JNIEnv *jnienv, jobject obj, const gchar *s)
+static jobject debug_new_global_ref(JNIEnv *jnienv, jobject obj, const char *s)
{
wrdebug(s);
return ((*jnienv)->NewGlobalRef(jnienv, obj));
}
-static void debug_delete_global_ref(JNIEnv *jnienv, jobject obj, const gchar *s)
+static void debug_delete_global_ref(JNIEnv *jnienv, jobject obj, const char *s)
{
wrdebug(s);
(*jnienv)->DeleteGlobalRef(jnienv, obj);
@@ -116,7 +116,7 @@ JNIEnv *get_jnienv(JavaVM *jvm);
* The private data is stored in the object as a Java long (64 bits),
* which is long enough to store a pointer on current architectures.
*/
-gpointer get_private_dbobj(JNIEnv *jnienv, const gchar *classname,
+void *get_private_dbobj(JNIEnv *jnienv, const char *classname,
jobject obj);
/*
@@ -124,15 +124,15 @@ gpointer get_private_dbobj(JNIEnv *jnienv, const gchar *classname,
* The private data is stored in the object as a Java long (64 bits),
* which is long enough to store a pointer on current architectures.
*/
-void set_private_dbobj(JNIEnv *jnienv, const gchar *classname,
- jobject obj, gpointer value);
+void set_private_dbobj(JNIEnv *jnienv, const char *classname,
+ jobject obj, void *value);
/*
* Get the private data in a Db/DbEnv object that holds additional 'side data'.
* The private data is stored in the object as a Java long (64 bits),
* which is long enough to store a pointer on current architectures.
*/
-gpointer get_private_info(JNIEnv *jnienv, const gchar *classname,
+void *get_private_info(JNIEnv *jnienv, const char *classname,
jobject obj);
/*
@@ -140,43 +140,43 @@ gpointer get_private_info(JNIEnv *jnienv, const gchar *classname,
* The private data is stored in the object as a Java long (64 bits),
* which is long enough to store a pointer on current architectures.
*/
-void set_private_info(JNIEnv *jnienv, const gchar *classname,
- jobject obj, gpointer value);
+void set_private_info(JNIEnv *jnienv, const char *classname,
+ jobject obj, void *value);
/*
* Given a non-qualified name (e.g. "foo"), get the class handle
* for the fully qualified name (e.g. "com.sleepycat.db.foo")
*/
-jclass get_class(JNIEnv *jnienv, const gchar *classname);
+jclass get_class(JNIEnv *jnienv, const char *classname);
/*
* Set an individual field in a Db* object.
* The field must be a DB object type.
*/
void set_object_field(JNIEnv *jnienv, jclass class_of_this,
- jobject jthis, const gchar *object_classname,
- const gchar *name_of_field, jobject obj);
+ jobject jthis, const char *object_classname,
+ const char *name_of_field, jobject obj);
/*
* Set an individual field in a Db* object.
* The field must be an integer type.
*/
void set_int_field(JNIEnv *jnienv, jclass class_of_this,
- jobject jthis, const gchar *name_of_field, jint value);
+ jobject jthis, const char *name_of_field, jint value);
/*
* Set an individual field in a Db* object.
* The field must be an integer type.
*/
void set_long_field(JNIEnv *jnienv, jclass class_of_this,
- jobject jthis, const gchar *name_of_field, jlong value);
+ jobject jthis, const char *name_of_field, jlong value);
/*
* Set an individual field in a Db* object.
* The field must be an DbLsn type.
*/
void set_lsn_field(JNIEnv *jnienv, jclass class_of_this,
- jobject jthis, const gchar *name_of_field, DB_LSN value);
+ jobject jthis, const char *name_of_field, DB_LSN value);
/*
* Values of flags for verify_return() and report_exception().
@@ -188,79 +188,79 @@ static const u_int32_t EXCEPTION_FILE_NOT_FOUND = 0x0001; /*FileNotFound*/
/*
* Report an exception back to the java side.
*/
-void report_exception(JNIEnv *jnienv, const gchar *text,
- gint err, unsigned long expect_mask);
+void report_exception(JNIEnv *jnienv, const char *text,
+ int err, unsigned long expect_mask);
/*
* Report an exception back to the java side, for the specific
* case of DB_LOCK_NOTGRANTED, as more things are added to the
* constructor of this type of exception.
*/
-void report_notgranted_exception(JNIEnv *jnienv, const gchar *text,
+void report_notgranted_exception(JNIEnv *jnienv, const char *text,
db_lockop_t op, db_lockmode_t mode,
- jobject jdbt, jobject jlock, gint index);
+ jobject jdbt, jobject jlock, int index);
/*
* Create an exception object and return it.
* The given class must have a constructor that has a
- * constructor with args (java.lang.String text, gint errno);
+ * constructor with args (java.lang.String text, int errno);
* DbException and its subclasses fit this bill.
*/
jobject create_exception(JNIEnv *jnienv, jstring text,
- gint err, jclass dbexcept);
+ int err, jclass dbexcept);
/*
* Report an error via the errcall mechanism.
*/
void report_errcall(JNIEnv *jnienv, jobject errcall,
- jstring prefix, const gchar *message);
+ jstring prefix, const char *message);
/*
* If the object is null, report an exception and return false (0),
* otherwise return true (1).
*/
-gint verify_non_null(JNIEnv *jnienv, gpointer obj);
+int verify_non_null(JNIEnv *jnienv, void *obj);
/*
* If the error code is non-zero, report an exception and return false (0),
* otherwise return true (1).
*/
-gint verify_return(JNIEnv *jnienv, gint err, unsigned long flags);
+int verify_return(JNIEnv *jnienv, int err, unsigned long flags);
/*
* Verify that there was no memory error due to undersized Dbt.
* If there is report a DbMemoryException, with the Dbt attached
* and return false (0), otherwise return true (1).
*/
-gint verify_dbt(JNIEnv *jnienv, gint err, LOCKED_DBT *locked_dbt);
+int verify_dbt(JNIEnv *jnienv, int err, LOCKED_DBT *locked_dbt);
/*
* Create an object of the given class, calling its default constructor.
*/
-jobject create_default_object(JNIEnv *jnienv, const gchar *class_name);
+jobject create_default_object(JNIEnv *jnienv, const char *class_name);
/*
* Create a Dbt object, , calling its default constructor.
*/
-jobject create_dbt(JNIEnv *jnienv, const gchar *class_name);
+jobject create_dbt(JNIEnv *jnienv, const char *class_name);
/*
* Convert an DB object to a Java encapsulation of that object.
* Note: This implementation creates a new Java object on each call,
* so it is generally useful when a new DB object has just been created.
*/
-jobject convert_object(JNIEnv *jnienv, const gchar *class_name, gpointer dbobj);
+jobject convert_object(JNIEnv *jnienv, const char *class_name, void *dbobj);
/*
* Create a copy of the java string using __os_malloc.
* Caller must free it.
*/
-gchar *get_c_string(JNIEnv *jnienv, jstring jstr);
+char *get_c_string(JNIEnv *jnienv, jstring jstr);
/*
* Create a java string from the given string
*/
-jstring get_java_string(JNIEnv *jnienv, const gchar * string);
+jstring get_java_string(JNIEnv *jnienv, const char* string);
/*
* Convert a java object to the various C pointers they represent.
@@ -302,47 +302,47 @@ jobject get_DbTxn (JNIEnv *jnienv, DB_TXN *dbobj);
jobject get_DbTxnStat (JNIEnv *jnienv, DB_TXN_STAT *dbobj);
/* The java names of DB classes */
-extern const gchar * const name_DB;
-extern const gchar * const name_DB_BTREE_STAT;
-extern const gchar * const name_DBC;
-extern const gchar * const name_DB_DEADLOCK_EX;
-extern const gchar * const name_DB_ENV;
-extern const gchar * const name_DB_EXCEPTION;
-extern const gchar * const name_DB_HASH_STAT;
-extern const gchar * const name_DB_LOCK;
-extern const gchar * const name_DB_LOCK_STAT;
-extern const gchar * const name_DB_LOGC;
-extern const gchar * const name_DB_LOG_STAT;
-extern const gchar * const name_DB_LSN;
-extern const gchar * const name_DB_MEMORY_EX;
-extern const gchar * const name_DB_MPOOL_FSTAT;
-extern const gchar * const name_DB_MPOOL_STAT;
-extern const gchar * const name_DB_LOCKNOTGRANTED_EX;
-extern const gchar * const name_DB_PREPLIST;
-extern const gchar * const name_DB_QUEUE_STAT;
-extern const gchar * const name_DB_REP_STAT;
-extern const gchar * const name_DB_RUNRECOVERY_EX;
-extern const gchar * const name_DBT;
-extern const gchar * const name_DB_TXN;
-extern const gchar * const name_DB_TXN_STAT;
-extern const gchar * const name_DB_TXN_STAT_ACTIVE;
-extern const gchar * const name_DB_UTIL;
-extern const gchar * const name_DbAppendRecno;
-extern const gchar * const name_DbBtreeCompare;
-extern const gchar * const name_DbBtreePrefix;
-extern const gchar * const name_DbDupCompare;
-extern const gchar * const name_DbEnvFeedback;
-extern const gchar * const name_DbErrcall;
-extern const gchar * const name_DbFeedback;
-extern const gchar * const name_DbHash;
-extern const gchar * const name_DbRecoveryInit;
-extern const gchar * const name_DbRepTransport;
-extern const gchar * const name_DbSecondaryKeyCreate;
-extern const gchar * const name_DbTxnRecover;
-extern const gchar * const name_RepElectResult;
-extern const gchar * const name_RepProcessMessage;
-
-extern const gchar * const string_signature;
+extern const char * const name_DB;
+extern const char * const name_DB_BTREE_STAT;
+extern const char * const name_DBC;
+extern const char * const name_DB_DEADLOCK_EX;
+extern const char * const name_DB_ENV;
+extern const char * const name_DB_EXCEPTION;
+extern const char * const name_DB_HASH_STAT;
+extern const char * const name_DB_LOCK;
+extern const char * const name_DB_LOCK_STAT;
+extern const char * const name_DB_LOGC;
+extern const char * const name_DB_LOG_STAT;
+extern const char * const name_DB_LSN;
+extern const char * const name_DB_MEMORY_EX;
+extern const char * const name_DB_MPOOL_FSTAT;
+extern const char * const name_DB_MPOOL_STAT;
+extern const char * const name_DB_LOCKNOTGRANTED_EX;
+extern const char * const name_DB_PREPLIST;
+extern const char * const name_DB_QUEUE_STAT;
+extern const char * const name_DB_REP_STAT;
+extern const char * const name_DB_RUNRECOVERY_EX;
+extern const char * const name_DBT;
+extern const char * const name_DB_TXN;
+extern const char * const name_DB_TXN_STAT;
+extern const char * const name_DB_TXN_STAT_ACTIVE;
+extern const char * const name_DB_UTIL;
+extern const char * const name_DbAppendRecno;
+extern const char * const name_DbBtreeCompare;
+extern const char * const name_DbBtreePrefix;
+extern const char * const name_DbDupCompare;
+extern const char * const name_DbEnvFeedback;
+extern const char * const name_DbErrcall;
+extern const char * const name_DbFeedback;
+extern const char * const name_DbHash;
+extern const char * const name_DbRecoveryInit;
+extern const char * const name_DbRepTransport;
+extern const char * const name_DbSecondaryKeyCreate;
+extern const char * const name_DbTxnRecover;
+extern const char * const name_RepElectResult;
+extern const char * const name_RepProcessMessage;
+
+extern const char * const string_signature;
extern jfieldID fid_Dbt_data;
extern jfieldID fid_Dbt_offset;
@@ -388,7 +388,7 @@ JNIEXPORT void JNICALL \
JNIEXPORT void JNICALL Java_com_sleepycat_db_##_meth _argspec \
{ \
c_type *c_this = get_##c_type(jnienv, jthis); \
- gint ret; \
+ int ret; \
\
if (!verify_non_null(jnienv, c_this)) \
return; \
@@ -401,7 +401,7 @@ JNIEXPORT void JNICALL Java_com_sleepycat_db_##_meth _argspec \
JNIEXPORT jint JNICALL Java_com_sleepycat_db_##_meth _argspec \
{ \
c_type *c_this = get_##c_type(jnienv, jthis); \
- gint ret; \
+ int ret; \
\
if (!verify_non_null(jnienv, c_this)) \
return (0); \
diff --git a/libdb/lock/lock.c b/libdb/lock/lock.c
index 0011fef..66d4a2b 100644
--- a/libdb/lock/lock.c
+++ b/libdb/lock/lock.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -23,34 +23,34 @@ static const gchar revid[] = "$Id$";
#include "dbinc/log.h"
#include "dbinc/txn.h"
-static gint __lock_checklocker __P((DB_LOCKTAB *,
+static int __lock_checklocker __P((DB_LOCKTAB *,
struct __db_lock *, u_int32_t, u_int32_t));
static void __lock_expires __P((DB_ENV *, db_timeval_t *, db_timeout_t));
static void __lock_freelocker
__P((DB_LOCKTAB *, DB_LOCKREGION *, DB_LOCKER *, u_int32_t));
-static gint __lock_get_internal __P((DB_LOCKTAB *, u_int32_t, u_int32_t,
+static int __lock_get_internal __P((DB_LOCKTAB *, u_int32_t, u_int32_t,
const DBT *, db_lockmode_t, db_timeout_t, DB_LOCK *));
-static gint __lock_getobj
+static int __lock_getobj
__P((DB_LOCKTAB *, const DBT *, u_int32_t, int, DB_LOCKOBJ **));
-static gint __lock_is_parent __P((DB_LOCKTAB *, u_int32_t, DB_LOCKER *));
-static gint __lock_put_internal __P((DB_LOCKTAB *,
+static int __lock_is_parent __P((DB_LOCKTAB *, u_int32_t, DB_LOCKER *));
+static int __lock_put_internal __P((DB_LOCKTAB *,
struct __db_lock *, u_int32_t, u_int32_t));
-static gint __lock_put_nolock __P((DB_ENV *, DB_LOCK *, gint *, u_int32_t));
+static int __lock_put_nolock __P((DB_ENV *, DB_LOCK *, int *, u_int32_t));
static void __lock_remove_waiter __P((DB_LOCKTAB *,
DB_LOCKOBJ *, struct __db_lock *, db_status_t));
-static gint __lock_trade __P((DB_ENV *, DB_LOCK *, u_int32_t));
+static int __lock_trade __P((DB_ENV *, DB_LOCK *, u_int32_t));
-static const gchar __db_lock_err[] = "Lock table is out of available %s";
-static const gchar __db_lock_invalid[] = "%s: Lock is no longer valid";
-static const gchar __db_locker_invalid[] = "Locker is not valid";
+static const char __db_lock_err[] = "Lock table is out of available %s";
+static const char __db_lock_invalid[] = "%s: Lock is no longer valid";
+static const char __db_locker_invalid[] = "Locker is not valid";
/*
* __lock_id --
* Generate a unique locker id.
*
- * PUBLIC: gint __lock_id __P((DB_ENV *, u_int32_t *));
+ * PUBLIC: int __lock_id __P((DB_ENV *, u_int32_t *));
*/
-gint
+int
__lock_id(dbenv, idp)
DB_ENV *dbenv;
u_int32_t *idp;
@@ -59,7 +59,7 @@ __lock_id(dbenv, idp)
DB_LOCKTAB *lt;
DB_LOCKREGION *region;
u_int32_t *ids, locker_ndx;
- gint nids, ret;
+ int nids, ret;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
@@ -114,9 +114,9 @@ err: UNLOCKREGION(dbenv, lt);
* __lock_id_free --
* Free a locker id.
*
- * PUBLIC: gint __lock_id_free __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __lock_id_free __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__lock_id_free(dbenv, id)
DB_ENV *dbenv;
u_int32_t id;
@@ -125,7 +125,7 @@ __lock_id_free(dbenv, id)
DB_LOCKTAB *lt;
DB_LOCKREGION *region;
u_int32_t locker_ndx;
- gint ret;
+ int ret;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
@@ -164,14 +164,14 @@ err: UNLOCKREGION(dbenv, lt);
* given locker (used during transaction commit/abort), releasing
* all locks on a given object, and generating debugging information.
*
- * PUBLIC: gint __lock_vec __P((DB_ENV *,
+ * PUBLIC: int __lock_vec __P((DB_ENV *,
* PUBLIC: u_int32_t, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **));
*/
-gint
+int
__lock_vec(dbenv, locker, flags, list, nlist, elistp)
DB_ENV *dbenv;
u_int32_t locker, flags;
- gint nlist;
+ int nlist;
DB_LOCKREQ *list, **elistp;
{
struct __db_lock *lp, *next_lock;
@@ -181,7 +181,7 @@ __lock_vec(dbenv, locker, flags, list, nlist, elistp)
DB_LOCKREGION *region;
DB_LOCKTAB *lt;
u_int32_t lndx, ndx;
- gint did_abort, i, ret, run_dd, upgrade, writes;
+ int did_abort, i, ret, run_dd, upgrade, writes;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
@@ -485,10 +485,10 @@ __lock_vec(dbenv, locker, flags, list, nlist, elistp)
* All the work for lock_get (and for the GET option of lock_vec) is done
* inside of lock_get_internal.
*
- * PUBLIC: gint __lock_get __P((DB_ENV *,
+ * PUBLIC: int __lock_get __P((DB_ENV *,
* PUBLIC: u_int32_t, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *));
*/
-gint
+int
__lock_get(dbenv, locker, flags, obj, lock_mode, lock)
DB_ENV *dbenv;
u_int32_t locker, flags;
@@ -496,7 +496,7 @@ __lock_get(dbenv, locker, flags, obj, lock_mode, lock)
db_lockmode_t lock_mode;
DB_LOCK *lock;
{
- gint ret;
+ int ret;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
@@ -534,7 +534,7 @@ __lock_get_internal(lt, locker, flags, obj, lock_mode, timeout, lock)
DB_LOCKOBJ *sh_obj;
DB_LOCKREGION *region;
u_int32_t locker_ndx, obj_ndx;
- gint did_abort, ihold, on_locker_list, no_dd, ret;
+ int did_abort, ihold, on_locker_list, no_dd, ret;
dbenv = lt->dbenv;
region = lt->reginfo.primary;
@@ -918,15 +918,15 @@ err: newl->status = DB_LSTAT_FREE;
* The user callable one is lock_put and the three we use internally are
* __lock_put_nolock, __lock_put_internal and __lock_downgrade.
*
- * PUBLIC: gint __lock_put __P((DB_ENV *, DB_LOCK *));
+ * PUBLIC: int __lock_put __P((DB_ENV *, DB_LOCK *));
*/
-gint
+int
__lock_put(dbenv, lock)
DB_ENV *dbenv;
DB_LOCK *lock;
{
DB_LOCKTAB *lt;
- gint ret, run_dd;
+ int ret, run_dd;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
@@ -957,13 +957,13 @@ static int
__lock_put_nolock(dbenv, lock, runp, flags)
DB_ENV *dbenv;
DB_LOCK *lock;
- gint *runp;
+ int *runp;
u_int32_t flags;
{
struct __db_lock *lockp;
DB_LOCKREGION *region;
DB_LOCKTAB *lt;
- gint ret;
+ int ret;
/* Check if locks have been globally turned off. */
if (F_ISSET(dbenv, DB_ENV_NOLOCKING))
@@ -996,10 +996,10 @@ __lock_put_nolock(dbenv, lock, runp, flags)
* back to iwrite locks and 2) to downgrade write-handle locks to read-handle
* locks at the end of an open/create.
*
- * PUBLIC: gint __lock_downgrade __P((DB_ENV *,
+ * PUBLIC: int __lock_downgrade __P((DB_ENV *,
* PUBLIC: DB_LOCK *, db_lockmode_t, u_int32_t));
*/
-gint
+int
__lock_downgrade(dbenv, lock, new_mode, flags)
DB_ENV *dbenv;
DB_LOCK *lock;
@@ -1012,7 +1012,7 @@ __lock_downgrade(dbenv, lock, new_mode, flags)
DB_LOCKREGION *region;
DB_LOCKTAB *lt;
u_int32_t indx;
- gint ret;
+ int ret;
COMPQUIET(flags, 0);
@@ -1069,7 +1069,7 @@ __lock_put_internal(lt, lockp, obj_ndx, flags)
{
DB_LOCKOBJ *sh_obj;
DB_LOCKREGION *region;
- gint ret, state_changed;
+ int ret, state_changed;
region = lt->reginfo.primary;
ret = state_changed = 0;
@@ -1174,7 +1174,7 @@ __lock_checklocker(lt, lockp, locker, flags)
DB_LOCKER *sh_locker;
DB_LOCKREGION *region;
u_int32_t indx;
- gint ret;
+ int ret;
dbenv = lt->dbenv;
region = lt->reginfo.primary;
@@ -1225,9 +1225,9 @@ freelock:
* __lock_addfamilylocker
* Put a locker entry in for a child transaction.
*
- * PUBLIC: gint __lock_addfamilylocker __P((DB_ENV *, u_int32_t, u_int32_t));
+ * PUBLIC: int __lock_addfamilylocker __P((DB_ENV *, u_int32_t, u_int32_t));
*/
-gint
+int
__lock_addfamilylocker(dbenv, pid, id)
DB_ENV *dbenv;
u_int32_t pid, id;
@@ -1236,7 +1236,7 @@ __lock_addfamilylocker(dbenv, pid, id)
DB_LOCKREGION *region;
DB_LOCKTAB *lt;
u_int32_t ndx;
- gint ret;
+ int ret;
lt = dbenv->lk_handle;
region = lt->reginfo.primary;
@@ -1291,9 +1291,9 @@ err:
*
* This must be called without the locker bucket locked.
*
- * PUBLIC: gint __lock_freefamilylocker __P((DB_LOCKTAB *, u_int32_t));
+ * PUBLIC: int __lock_freefamilylocker __P((DB_LOCKTAB *, u_int32_t));
*/
-gint
+int
__lock_freefamilylocker(lt, locker)
DB_LOCKTAB *lt;
u_int32_t locker;
@@ -1302,7 +1302,7 @@ __lock_freefamilylocker(lt, locker)
DB_LOCKER *sh_locker;
DB_LOCKREGION *region;
u_int32_t indx;
- gint ret;
+ int ret;
dbenv = lt->dbenv;
region = lt->reginfo.primary;
@@ -1361,10 +1361,10 @@ __lock_freelocker(lt, region, sh_locker, indx)
* amount of time that a lock for this transaction is permitted
* to wait.
*
- * PUBLIC: gint __lock_set_timeout __P(( DB_ENV *,
+ * PUBLIC: int __lock_set_timeout __P(( DB_ENV *,
* PUBLIC: u_int32_t, db_timeout_t, u_int32_t));
*/
-gint
+int
__lock_set_timeout(dbenv, locker, timeout, op)
DB_ENV *dbenv;
u_int32_t locker;
@@ -1375,7 +1375,7 @@ __lock_set_timeout(dbenv, locker, timeout, op)
DB_LOCKREGION *region;
DB_LOCKTAB *lt;
u_int32_t locker_ndx;
- gint ret;
+ int ret;
lt = dbenv->lk_handle;
region = lt->reginfo.primary;
@@ -1412,9 +1412,9 @@ __lock_set_timeout(dbenv, locker, timeout, op)
* return EINVAL if the parent does not exist or did not
* have a current txn timeout set.
*
- * PUBLIC: gint __lock_inherit_timeout __P(( DB_ENV *, u_int32_t, u_int32_t));
+ * PUBLIC: int __lock_inherit_timeout __P(( DB_ENV *, u_int32_t, u_int32_t));
*/
-gint
+int
__lock_inherit_timeout(dbenv, parent, locker)
DB_ENV *dbenv;
u_int32_t parent, locker;
@@ -1423,7 +1423,7 @@ __lock_inherit_timeout(dbenv, parent, locker)
DB_LOCKREGION *region;
DB_LOCKTAB *lt;
u_int32_t locker_ndx;
- gint ret;
+ int ret;
lt = dbenv->lk_handle;
region = lt->reginfo.primary;
@@ -1476,14 +1476,14 @@ err:
*
* This must be called with the locker bucket locked.
*
- * PUBLIC: gint __lock_getlocker __P((DB_LOCKTAB *,
+ * PUBLIC: int __lock_getlocker __P((DB_LOCKTAB *,
* PUBLIC: u_int32_t, u_int32_t, int, DB_LOCKER **));
*/
-gint
+int
__lock_getlocker(lt, locker, indx, create, retp)
DB_LOCKTAB *lt;
u_int32_t locker, indx;
- gint create;
+ int create;
DB_LOCKER **retp;
{
DB_ENV *dbenv;
@@ -1550,14 +1550,14 @@ __lock_getobj(lt, obj, ndx, create, retp)
DB_LOCKTAB *lt;
const DBT *obj;
u_int32_t ndx;
- gint create;
+ int create;
DB_LOCKOBJ **retp;
{
DB_ENV *dbenv;
DB_LOCKOBJ *sh_obj;
DB_LOCKREGION *region;
- gint ret;
- gpointer p;
+ int ret;
+ void *p;
dbenv = lt->dbenv;
region = lt->reginfo.primary;
@@ -1644,9 +1644,9 @@ __lock_is_parent(lt, locker, sh_locker)
* Look through the waiters and holders lists and decide which (if any)
* locks can be promoted. Promote any that are eligible.
*
- * PUBLIC: gint __lock_promote __P((DB_LOCKTAB *, DB_LOCKOBJ *, u_int32_t));
+ * PUBLIC: int __lock_promote __P((DB_LOCKTAB *, DB_LOCKOBJ *, u_int32_t));
*/
-gint
+int
__lock_promote(lt, obj, flags)
DB_LOCKTAB *lt;
DB_LOCKOBJ *obj;
@@ -1656,7 +1656,7 @@ __lock_promote(lt, obj, flags)
DB_LOCKER *sh_locker;
DB_LOCKREGION *region;
u_int32_t locker_ndx;
- gint had_waiters, state_changed;
+ int had_waiters, state_changed;
region = lt->reginfo.primary;
had_waiters = 0;
@@ -1749,7 +1749,7 @@ __lock_remove_waiter(lt, sh_obj, lockp, status)
db_status_t status;
{
DB_LOCKREGION *region;
- gint do_wakeup;
+ int do_wakeup;
region = lt->reginfo.primary;
@@ -1801,9 +1801,9 @@ __lock_expires(dbenv, timevalp, timeout)
/*
* __lock_expired -- determine if a lock has expired.
*
- * PUBLIC: gint __lock_expired __P((DB_ENV *, db_timeval_t *, db_timeval_t *));
+ * PUBLIC: int __lock_expired __P((DB_ENV *, db_timeval_t *, db_timeval_t *));
*/
-gint
+int
__lock_expired(dbenv, now, timevalp)
DB_ENV *dbenv;
db_timeval_t *now, *timevalp;
@@ -1836,7 +1836,7 @@ __lock_trade(dbenv, lock, new_locker)
DB_LOCKREGION *region;
DB_LOCKTAB *lt;
DB_LOCKER *sh_locker;
- gint ret;
+ int ret;
u_int32_t locker_ndx;
lt = dbenv->lk_handle;
diff --git a/libdb/lock/lock_deadlock.c b/libdb/lock/lock_deadlock.c
index 49d43ac..6ec9ebe 100644
--- a/libdb/lock/lock_deadlock.c
+++ b/libdb/lock/lock_deadlock.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -51,13 +51,13 @@ typedef struct {
db_pgno_t pgno;
} locker_info;
-static gint __dd_abort __P((DB_ENV *, locker_info *));
-static gint __dd_build __P((DB_ENV *,
+static int __dd_abort __P((DB_ENV *, locker_info *));
+static int __dd_build __P((DB_ENV *,
u_int32_t, u_int32_t **, u_int32_t *, u_int32_t *, locker_info **));
-static gint __dd_find __P((DB_ENV *,
+static int __dd_find __P((DB_ENV *,
u_int32_t *, locker_info *, u_int32_t, u_int32_t, u_int32_t ***));
-static gint __dd_isolder __P((u_int32_t, u_int32_t, u_int32_t, u_int32_t));
-static gint __dd_verify __P((locker_info *, u_int32_t *, u_int32_t *,
+static int __dd_isolder __P((u_int32_t, u_int32_t, u_int32_t, u_int32_t));
+static int __dd_verify __P((locker_info *, u_int32_t *, u_int32_t *,
u_int32_t *, u_int32_t, u_int32_t, u_int32_t));
#ifdef DIAGNOSTIC
@@ -68,13 +68,13 @@ static void __dd_debug
/*
* lock_detect --
*
- * PUBLIC: gint __lock_detect __P((DB_ENV *, u_int32_t, u_int32_t, gint *));
+ * PUBLIC: int __lock_detect __P((DB_ENV *, u_int32_t, u_int32_t, int *));
*/
-gint
+int
__lock_detect(dbenv, flags, atype, abortp)
DB_ENV *dbenv;
u_int32_t flags, atype;
- gint *abortp;
+ int *abortp;
{
DB_LOCKREGION *region;
DB_LOCKTAB *lt;
@@ -83,7 +83,7 @@ __lock_detect(dbenv, flags, atype, abortp)
u_int32_t *bitmap, *copymap, **deadp, **free_me, *tmpmap;
u_int32_t i, keeper, killid, limit, nalloc, nlockers;
u_int32_t lock_max, txn_max;
- gint ret;
+ int ret;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
@@ -328,7 +328,7 @@ __dd_build(dbenv, atype, bmp, nlockers, allocp, idmap)
db_timeval_t now;
u_int32_t *bitmap, count, dd, *entryp, id, ndx, nentries, *tmpmap;
u_int8_t *pptr;
- gint expire_only, is_first, need_timeout, ret;
+ int expire_only, is_first, need_timeout, ret;
lt = dbenv->lk_handle;
region = lt->reginfo.primary;
@@ -615,7 +615,7 @@ __dd_find(dbenv, bmp, idmap, nlockers, nalloc, deadp)
{
u_int32_t i, j, k, *mymap, *tmpmap;
u_int32_t **retp;
- gint ndead, ndeadalloc, ret;
+ int ndead, ndeadalloc, ret;
#undef INITIAL_DEAD_ALLOC
#define INITIAL_DEAD_ALLOC 8
@@ -683,7 +683,7 @@ __dd_abort(dbenv, info)
DB_LOCKREGION *region;
DB_LOCKTAB *lt;
u_int32_t ndx;
- gint ret;
+ int ret;
lt = dbenv->lk_handle;
region = lt->reginfo.primary;
@@ -747,7 +747,7 @@ __dd_debug(dbenv, idmap, bitmap, nlockers, nalloc)
u_int32_t *bitmap, nlockers, nalloc;
{
u_int32_t i, j, *mymap;
- gchar *msgbuf;
+ char *msgbuf;
__db_err(dbenv, "Waitsfor array\nWaiter:\tWaiting on:");
@@ -794,7 +794,7 @@ __dd_verify(idmap, deadmap, tmpmap, origmap, nlockers, nalloc, which)
{
u_int32_t *tmap;
u_int32_t j;
- gint count;
+ int count;
memset(tmpmap, 0, sizeof(u_int32_t) * nalloc);
diff --git a/libdb/lock/lock_method.c b/libdb/lock/lock_method.c
index eddc32f..529a420 100644
--- a/libdb/lock/lock_method.c
+++ b/libdb/lock/lock_method.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -30,13 +30,13 @@ static const gchar revid[] = "$Id$";
#include "dbinc_auto/rpc_client_ext.h"
#endif
-static gint __lock_set_lk_conflicts __P((DB_ENV *, u_int8_t *, int));
-static gint __lock_set_lk_detect __P((DB_ENV *, u_int32_t));
-static gint __lock_set_lk_max __P((DB_ENV *, u_int32_t));
-static gint __lock_set_lk_max_lockers __P((DB_ENV *, u_int32_t));
-static gint __lock_set_lk_max_locks __P((DB_ENV *, u_int32_t));
-static gint __lock_set_lk_max_objects __P((DB_ENV *, u_int32_t));
-static gint __lock_set_env_timeout __P((DB_ENV *, db_timeout_t, u_int32_t));
+static int __lock_set_lk_conflicts __P((DB_ENV *, u_int8_t *, int));
+static int __lock_set_lk_detect __P((DB_ENV *, u_int32_t));
+static int __lock_set_lk_max __P((DB_ENV *, u_int32_t));
+static int __lock_set_lk_max_lockers __P((DB_ENV *, u_int32_t));
+static int __lock_set_lk_max_locks __P((DB_ENV *, u_int32_t));
+static int __lock_set_lk_max_objects __P((DB_ENV *, u_int32_t));
+static int __lock_set_env_timeout __P((DB_ENV *, db_timeout_t, u_int32_t));
/*
* __lock_dbenv_create --
@@ -124,9 +124,9 @@ static int
__lock_set_lk_conflicts(dbenv, lk_conflicts, lk_modes)
DB_ENV *dbenv;
u_int8_t *lk_conflicts;
- gint lk_modes;
+ int lk_modes;
{
- gint ret;
+ int ret;
ENV_ILLEGAL_AFTER_OPEN(dbenv, "set_lk_conflicts");
diff --git a/libdb/lock/lock_region.c b/libdb/lock/lock_region.c
index 8ed61bc..9a53d58 100644
--- a/libdb/lock/lock_region.c
+++ b/libdb/lock/lock_region.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -21,7 +21,7 @@ static const gchar revid[] = "$Id$";
#include "dbinc/db_shash.h"
#include "dbinc/lock.h"
-static gint __lock_init __P((DB_ENV *, DB_LOCKTAB *));
+static int __lock_init __P((DB_ENV *, DB_LOCKTAB *));
static size_t
__lock_region_size __P((DB_ENV *));
@@ -66,16 +66,16 @@ static const u_int8_t db_cdb_conflicts[] = {
* __lock_open --
* Internal version of lock_open: only called from DB_ENV->open.
*
- * PUBLIC: gint __lock_open __P((DB_ENV *));
+ * PUBLIC: int __lock_open __P((DB_ENV *));
*/
-gint
+int
__lock_open(dbenv)
DB_ENV *dbenv;
{
DB_LOCKREGION *region;
DB_LOCKTAB *lt;
size_t size;
- gint ret;
+ int ret;
/* Create the lock table structure. */
if ((ret = __os_calloc(dbenv, 1, sizeof(DB_LOCKTAB), <)) != 0)
@@ -170,7 +170,7 @@ __lock_init(dbenv, lt)
#endif
u_int32_t i, lk_modes;
u_int8_t *addr;
- gint ret;
+ int ret;
if ((ret = __db_shalloc(lt->reginfo.addr,
sizeof(DB_LOCKREGION), 0, <->reginfo.primary)) != 0)
@@ -290,14 +290,14 @@ mem_err: __db_err(dbenv,
* Clean up after the lock system on a close or failed open. Called
* only from __dbenv_refresh. (Formerly called __lock_close.)
*
- * PUBLIC: gint __lock_dbenv_refresh __P((DB_ENV *));
+ * PUBLIC: int __lock_dbenv_refresh __P((DB_ENV *));
*/
-gint
+int
__lock_dbenv_refresh(dbenv)
DB_ENV *dbenv;
{
DB_LOCKTAB *lt;
- gint ret;
+ int ret;
lt = dbenv->lk_handle;
@@ -394,9 +394,9 @@ __lock_region_destroy(dbenv, infop)
* Set the current locker ID and current maximum unused ID (for
* testing purposes only).
*
- * PUBLIC: gint __lock_id_set __P((DB_ENV *, u_int32_t, u_int32_t));
+ * PUBLIC: int __lock_id_set __P((DB_ENV *, u_int32_t, u_int32_t));
*/
-gint
+int
__lock_id_set(dbenv, cur_id, max_id)
DB_ENV *dbenv;
u_int32_t cur_id, max_id;
diff --git a/libdb/lock/lock_stat.c b/libdb/lock/lock_stat.c
index 680e394..72c2490 100644
--- a/libdb/lock/lock_stat.c
+++ b/libdb/lock/lock_stat.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -43,9 +43,9 @@ static void __lock_printheader __P((void));
* __lock_stat --
* Return LOCK statistics.
*
- * PUBLIC: gint __lock_stat __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
+ * PUBLIC: int __lock_stat __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
*/
-gint
+int
__lock_stat(dbenv, statp, flags)
DB_ENV *dbenv;
DB_LOCK_STAT **statp;
@@ -54,7 +54,7 @@ __lock_stat(dbenv, statp, flags)
DB_LOCKREGION *region;
DB_LOCKTAB *lt;
DB_LOCK_STAT *stats, tmp;
- gint ret;
+ int ret;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
@@ -119,12 +119,12 @@ __lock_stat(dbenv, statp, flags)
/*
* __lock_dump_region --
*
- * PUBLIC: gint __lock_dump_region __P((DB_ENV *, gchar *, FILE *));
+ * PUBLIC: int __lock_dump_region __P((DB_ENV *, char *, FILE *));
*/
-gint
+int
__lock_dump_region(dbenv, area, fp)
DB_ENV *dbenv;
- gchar *area;
+ char *area;
FILE *fp;
{
DB_LOCKER *lip;
@@ -229,7 +229,7 @@ __lock_dump_locker(lt, lip, fp)
{
struct __db_lock *lp;
time_t s;
- gchar buf[64];
+ char buf[64];
fprintf(fp, "%8lx dd=%2ld locks held %-4d write locks %-4d",
(u_long)lip->id, (long)lip->dd_id, lip->nlocks, lip->nwrites);
@@ -301,14 +301,14 @@ void
__lock_printlock(lt, lp, ispgno)
DB_LOCKTAB *lt;
struct __db_lock *lp;
- gint ispgno;
+ int ispgno;
{
DB_LOCKOBJ *lockobj;
db_pgno_t pgno;
u_int32_t *fidp, type;
u_int8_t *ptr;
- gchar *namep;
- const gchar *mode, *status;
+ char *namep;
+ const char *mode, *status;
switch (lp->mode) {
case DB_LOCK_DIRTY:
diff --git a/libdb/lock/lock_util.c b/libdb/lock/lock_util.c
index f805b2b..1fa2b93 100644
--- a/libdb/lock/lock_util.c
+++ b/libdb/lock/lock_util.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -31,14 +31,14 @@ static const gchar revid[] = "$Id$";
* this function cannot be used as a sort function; its purpose is to
* be used as a hash comparison function.
*
- * PUBLIC: gint __lock_cmp __P((const DBT *, DB_LOCKOBJ *));
+ * PUBLIC: int __lock_cmp __P((const DBT *, DB_LOCKOBJ *));
*/
-gint
+int
__lock_cmp(dbt, lock_obj)
const DBT *dbt;
DB_LOCKOBJ *lock_obj;
{
- gpointer obj_data;
+ void *obj_data;
obj_data = SH_DBT_PTR(&lock_obj->lockobj);
return (dbt->size == lock_obj->lockobj.size &&
@@ -46,9 +46,9 @@ __lock_cmp(dbt, lock_obj)
}
/*
- * PUBLIC: gint __lock_locker_cmp __P((u_int32_t, DB_LOCKER *));
+ * PUBLIC: int __lock_locker_cmp __P((u_int32_t, DB_LOCKER *));
*/
-gint
+int
__lock_locker_cmp(locker, sh_locker)
u_int32_t locker;
DB_LOCKER *sh_locker;
@@ -112,7 +112,7 @@ u_int32_t
__lock_lhash(lock_obj)
DB_LOCKOBJ *lock_obj;
{
- gpointer obj_data;
+ void *obj_data;
obj_data = SH_DBT_PTR(&lock_obj->lockobj);
diff --git a/libdb/log/log.c b/libdb/log/log.c
index e9852f2..033f77e 100644
--- a/libdb/log/log.c
+++ b/libdb/log/log.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,24 +25,24 @@ static const gchar revid[] = "$Id$";
#include "dbinc/log.h"
#include "dbinc/txn.h"
-static gint __log_init __P((DB_ENV *, DB_LOG *));
-static gint __log_recover __P((DB_LOG *));
+static int __log_init __P((DB_ENV *, DB_LOG *));
+static int __log_recover __P((DB_LOG *));
static size_t __log_region_size __P((DB_ENV *));
-static gint __log_zero __P((DB_ENV *, DB_LSN *, DB_LSN *));
+static int __log_zero __P((DB_ENV *, DB_LSN *, DB_LSN *));
/*
* __log_open --
* Internal version of log_open: only called from DB_ENV->open.
*
- * PUBLIC: gint __log_open __P((DB_ENV *));
+ * PUBLIC: int __log_open __P((DB_ENV *));
*/
-gint
+int
__log_open(dbenv)
DB_ENV *dbenv;
{
DB_LOG *dblp;
LOG *lp;
- gint ret;
+ int ret;
/* Create/initialize the DB_LOG structure. */
if ((ret = __os_calloc(dbenv, 1, sizeof(DB_LOG), &dblp)) != 0)
@@ -145,8 +145,8 @@ __log_init(dbenv, dblp)
{
DB_MUTEX *flush_mutexp;
LOG *region;
- gint ret;
- gpointer p;
+ int ret;
+ void *p;
#ifdef HAVE_MUTEX_SYSTEM_RESOURCES
u_int8_t *addr;
#endif
@@ -250,7 +250,7 @@ __log_recover(dblp)
DB_LSN lsn;
LOG *lp;
u_int32_t cnt, rectype;
- gint ret;
+ int ret;
logfile_validity status;
logc = NULL;
@@ -353,21 +353,21 @@ err: if (logc != NULL)
* the number of the first readable log file, else it will contain the number
* of the last log file (which may be too old to read).
*
- * PUBLIC: gint __log_find __P((DB_LOG *, int, u_int32_t *, logfile_validity *));
+ * PUBLIC: int __log_find __P((DB_LOG *, int, u_int32_t *, logfile_validity *));
*/
-gint
+int
__log_find(dblp, find_first, valp, statusp)
DB_LOG *dblp;
- gint find_first;
+ int find_first;
u_int32_t *valp;
logfile_validity *statusp;
{
DB_ENV *dbenv;
logfile_validity logval_status, status;
u_int32_t clv, logval;
- gint cnt, fcnt, ret;
- const gchar *dir;
- gchar *c, **names, *p, *q, savech;
+ int cnt, fcnt, ret;
+ const char *dir;
+ char *c, **names, *p, *q, savech;
dbenv = dblp->dbenv;
logval_status = status = DB_LV_NONEXISTENT;
@@ -510,13 +510,13 @@ err: __os_dirfree(dbenv, names, fcnt);
* log file if it is not unexpectedly flawed (that is, if it's perfectly
* normal, if it's zero-length, or if it's an old version).
*
- * PUBLIC: gint __log_valid __P((DB_LOG *, u_int32_t, int, logfile_validity *));
+ * PUBLIC: int __log_valid __P((DB_LOG *, u_int32_t, int, logfile_validity *));
*/
-gint
+int
__log_valid(dblp, number, set_persist, statusp)
DB_LOG *dblp;
u_int32_t number;
- gint set_persist;
+ int set_persist;
logfile_validity *statusp;
{
DB_CIPHER *db_cipher;
@@ -527,9 +527,9 @@ __log_valid(dblp, number, set_persist, statusp)
LOGP *persist;
logfile_validity status;
size_t hdrsize, nw, recsize;
- gint is_hmac, need_free, ret;
+ int is_hmac, need_free, ret;
u_int8_t *tmp;
- gchar *fname;
+ char *fname;
dbenv = dblp->dbenv;
db_cipher = dbenv->crypto_handle;
@@ -697,14 +697,14 @@ err: __os_free(dbenv, fname);
* Clean up after the log system on a close or failed open. Called only
* from __dbenv_refresh. (Formerly called __log_close.)
*
- * PUBLIC: gint __log_dbenv_refresh __P((DB_ENV *));
+ * PUBLIC: int __log_dbenv_refresh __P((DB_ENV *));
*/
-gint
+int
__log_dbenv_refresh(dbenv)
DB_ENV *dbenv;
{
DB_LOG *dblp;
- gint ret, t_ret;
+ int ret, t_ret;
dblp = dbenv->lg_handle;
@@ -738,9 +738,9 @@ __log_dbenv_refresh(dbenv)
* __log_stat --
* Return log statistics.
*
- * PUBLIC: gint __log_stat __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
+ * PUBLIC: int __log_stat __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
*/
-gint
+int
__log_stat(dbenv, statp, flags)
DB_ENV *dbenv;
DB_LOG_STAT **statp;
@@ -749,7 +749,7 @@ __log_stat(dbenv, statp, flags)
DB_LOG *dblp;
DB_LOG_STAT *stats;
LOG *region;
- gint ret;
+ int ret;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
@@ -867,9 +867,9 @@ __log_region_destroy(dbenv, infop)
* record to be written). This is used in replication to discard records
* in the log file that do not agree with the master.
*
- * PUBLIC: gint __log_vtruncate __P((DB_ENV *, DB_LSN *, DB_LSN *));
+ * PUBLIC: int __log_vtruncate __P((DB_ENV *, DB_LSN *, DB_LSN *));
*/
-gint
+int
__log_vtruncate(dbenv, lsn, ckplsn)
DB_ENV *dbenv;
DB_LSN *lsn, *ckplsn;
@@ -881,8 +881,8 @@ __log_vtruncate(dbenv, lsn, ckplsn)
DB_LSN end_lsn;
LOG *lp;
u_int32_t bytes, c_len;
- gint fn, ret, t_ret;
- gchar *fname;
+ int fn, ret, t_ret;
+ char *fname;
/* Need to find out the length of this soon-to-be-last record. */
if ((ret = dbenv->log_cursor(dbenv, &logc, 0)) != 0)
@@ -977,19 +977,19 @@ err: R_UNLOCK(dbenv, &dblp->reginfo);
* lower-numbered than the current logs, the we return *outdatedp non
* zero, else we return it 0.
*
- * PUBLIC: gint __log_is_outdated __P((DB_ENV *dbenv,
- * PUBLIC: u_int32_t fnum, gint *outdatedp));
+ * PUBLIC: int __log_is_outdated __P((DB_ENV *dbenv,
+ * PUBLIC: u_int32_t fnum, int *outdatedp));
*/
-gint
+int
__log_is_outdated(dbenv, fnum, outdatedp)
DB_ENV *dbenv;
u_int32_t fnum;
- gint *outdatedp;
+ int *outdatedp;
{
DB_LOG *dblp;
LOG *lp;
- gchar *name;
- gint ret;
+ char *name;
+ int ret;
u_int32_t cfile;
dblp = dbenv->lg_handle;
@@ -1027,10 +1027,10 @@ __log_zero(dbenv, from_lsn, to_lsn)
DB_ENV *dbenv;
DB_LSN *from_lsn, *to_lsn;
{
- gchar *lname;
+ char *lname;
DB_LOG *dblp;
LOG *lp;
- gint ret;
+ int ret;
size_t nbytes, len, nw;
u_int8_t buf[4096];
u_int32_t mbytes, bytes;
diff --git a/libdb/log/log_archive.c b/libdb/log/log_archive.c
index 3d37374..f52403e 100644
--- a/libdb/log/log_archive.c
+++ b/libdb/log/log_archive.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,21 +25,21 @@ static const gchar revid[] = "$Id$";
#include "dbinc/qam.h"
#include "dbinc/txn.h"
-static gint __absname __P((DB_ENV *, gchar *, gchar *, gchar **));
-static gint __build_data __P((DB_ENV *, gchar *, gchar ***));
-static gint __cmpfunc __P((gconstpointer , gconstpointer ));
-static gint __usermem __P((DB_ENV *, gchar ***));
+static int __absname __P((DB_ENV *, char *, char *, char **));
+static int __build_data __P((DB_ENV *, char *, char ***));
+static int __cmpfunc __P((const void *, const void *));
+static int __usermem __P((DB_ENV *, char ***));
/*
* __log_archive --
* Supporting function for db_archive(1).
*
- * PUBLIC: gint __log_archive __P((DB_ENV *, gchar **[], u_int32_t));
+ * PUBLIC: int __log_archive __P((DB_ENV *, char **[], u_int32_t));
*/
-gint
+int
__log_archive(dbenv, listp, flags)
DB_ENV *dbenv;
- gchar ***listp;
+ char ***listp;
u_int32_t flags;
{
DBT rec;
@@ -47,8 +47,8 @@ __log_archive(dbenv, listp, flags)
DB_LOGC *logc;
DB_LSN stable_lsn;
__txn_ckp_args *ckp_args;
- gchar **array, **arrayp, *name, *p, *pref, buf[MAXPATHLEN];
- gint array_size, db_arch_abs, n, ret;
+ char **array, **arrayp, *name, *p, *pref, buf[MAXPATHLEN];
+ int array_size, db_arch_abs, n, ret;
u_int32_t fnum;
PANIC_CHECK(dbenv);
@@ -156,7 +156,7 @@ __log_archive(dbenv, listp, flags)
/* Get some initial space. */
array_size = 64;
if ((ret = __os_malloc(dbenv,
- sizeof(gchar *) * array_size, &array)) != 0)
+ sizeof(char *) * array_size, &array)) != 0)
return (ret);
array[0] = NULL;
@@ -175,7 +175,7 @@ __log_archive(dbenv, listp, flags)
if (n >= array_size - 2) {
array_size += LIST_INCREMENT;
if ((ret = __os_realloc(dbenv,
- sizeof(gchar *) * array_size, &array)) != 0)
+ sizeof(char *) * array_size, &array)) != 0)
goto err;
}
@@ -203,7 +203,7 @@ __log_archive(dbenv, listp, flags)
}
/* Sort the list. */
- qsort(array, (size_t)n, sizeof(gchar *), __cmpfunc);
+ qsort(array, (size_t)n, sizeof(char *), __cmpfunc);
/* Rework the memory. */
if ((ret = __usermem(dbenv, &array)) != 0)
@@ -229,20 +229,20 @@ err: if (array != NULL) {
static int
__build_data(dbenv, pref, listp)
DB_ENV *dbenv;
- gchar *pref, ***listp;
+ char *pref, ***listp;
{
DBT rec;
DB_LOGC *logc;
DB_LSN lsn;
__dbreg_register_args *argp;
u_int32_t rectype;
- gint array_size, last, n, nxt, ret, t_ret;
- gchar **array, **arrayp, **list, **lp, *p, *real_name;
+ int array_size, last, n, nxt, ret, t_ret;
+ char **array, **arrayp, **list, **lp, *p, *real_name;
/* Get some initial space. */
array_size = 64;
if ((ret = __os_malloc(dbenv,
- sizeof(gchar *) * array_size, &array)) != 0)
+ sizeof(char *) * array_size, &array)) != 0)
return (ret);
array[0] = NULL;
@@ -270,7 +270,7 @@ __build_data(dbenv, pref, listp)
if (n >= array_size - 2) {
array_size += LIST_INCREMENT;
if ((ret = __os_realloc(dbenv,
- sizeof(gchar *) * array_size, &array)) != 0)
+ sizeof(char *) * array_size, &array)) != 0)
goto free_continue;
}
@@ -288,7 +288,7 @@ __build_data(dbenv, pref, listp)
if (n >= array_size - 2) {
array_size += LIST_INCREMENT;
if ((ret = __os_realloc(dbenv,
- sizeof(gchar *) *
+ sizeof(char *) *
array_size, &array)) != 0)
goto q_err;
}
@@ -319,7 +319,7 @@ free_continue: __os_free(dbenv, argp);
}
/* Sort the list. */
- qsort(array, (size_t)n, sizeof(gchar *), __cmpfunc);
+ qsort(array, (size_t)n, sizeof(char *), __cmpfunc);
/*
* Build the real pathnames, discarding nonexistent files and
@@ -407,11 +407,11 @@ err1: if (array != NULL) {
static int
__absname(dbenv, pref, name, newnamep)
DB_ENV *dbenv;
- gchar *pref, *name, **newnamep;
+ char *pref, *name, **newnamep;
{
size_t l_pref, l_name;
- gint isabspath, ret;
- gchar *newname;
+ int isabspath, ret;
+ char *newname;
l_name = strlen(name);
isabspath = __os_abspath(name);
@@ -442,22 +442,22 @@ __absname(dbenv, pref, name, newnamep)
static int
__usermem(dbenv, listp)
DB_ENV *dbenv;
- gchar ***listp;
+ char ***listp;
{
size_t len;
- gint ret;
- gchar **array, **arrayp, **orig, *strp;
+ int ret;
+ char **array, **arrayp, **orig, *strp;
/* Find out how much space we need. */
for (len = 0, orig = *listp; *orig != NULL; ++orig)
- len += sizeof(gchar *) + strlen(*orig) + 1;
- len += sizeof(gchar *);
+ len += sizeof(char *) + strlen(*orig) + 1;
+ len += sizeof(char *);
/* Allocate it and set up the pointers. */
if ((ret = __os_umalloc(dbenv, len, &array)) != 0)
return (ret);
- strp = (gchar *)(array + (orig - *listp) + 1);
+ strp = (char *)(array + (orig - *listp) + 1);
/* Copy the original information into the new memory. */
for (orig = *listp, arrayp = array; *orig != NULL; ++orig, ++arrayp) {
@@ -480,7 +480,7 @@ __usermem(dbenv, listp)
static int
__cmpfunc(p1, p2)
- gconstpointer p1, *p2;
+ const void *p1, *p2;
{
- return (strcmp(*((gchar * const *)p1), *((gchar * const *)p2)));
+ return (strcmp(*((char * const *)p1), *((char * const *)p2)));
}
diff --git a/libdb/log/log_compare.c b/libdb/log/log_compare.c
index 86a49eb..887ba0e 100644
--- a/libdb/log/log_compare.c
+++ b/libdb/log/log_compare.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -20,9 +20,9 @@ static const gchar revid[] = "$Id$";
* log_compare --
* Compare two LSN's; return 1, 0, -1 if first is >, == or < second.
*
- * EXTERN: gint log_compare __P((const DB_LSN *, const DB_LSN *));
+ * EXTERN: int log_compare __P((const DB_LSN *, const DB_LSN *));
*/
-gint
+int
log_compare(lsn0, lsn1)
const DB_LSN *lsn0, *lsn1;
{
diff --git a/libdb/log/log_get.c b/libdb/log/log_get.c
index 03ae2b1..faf0be1 100644
--- a/libdb/log/log_get.c
+++ b/libdb/log/log_get.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -26,34 +26,34 @@ static const gchar revid[] = "$Id$";
typedef enum { L_ALREADY, L_ACQUIRED, L_NONE } RLOCK;
-static gint __log_c_close __P((DB_LOGC *, u_int32_t));
-static gint __log_c_get __P((DB_LOGC *, DB_LSN *, DBT *, u_int32_t));
-static gint __log_c_get_int __P((DB_LOGC *, DB_LSN *, DBT *, u_int32_t));
-static gint __log_c_hdrchk __P((DB_LOGC *, HDR *, gint *));
-static gint __log_c_incursor __P((DB_LOGC *, DB_LSN *, HDR *, u_int8_t **));
-static gint __log_c_inregion __P((DB_LOGC *,
+static int __log_c_close __P((DB_LOGC *, u_int32_t));
+static int __log_c_get __P((DB_LOGC *, DB_LSN *, DBT *, u_int32_t));
+static int __log_c_get_int __P((DB_LOGC *, DB_LSN *, DBT *, u_int32_t));
+static int __log_c_hdrchk __P((DB_LOGC *, HDR *, int *));
+static int __log_c_incursor __P((DB_LOGC *, DB_LSN *, HDR *, u_int8_t **));
+static int __log_c_inregion __P((DB_LOGC *,
DB_LSN *, RLOCK *, DB_LSN *, HDR *, u_int8_t **));
-static gint __log_c_io __P((DB_LOGC *,
- u_int32_t, u_int32_t, gpointer , size_t *, gint *));
-static gint __log_c_ondisk __P((DB_LOGC *,
- DB_LSN *, DB_LSN *, int, HDR *, u_int8_t **, gint *));
-static gint __log_c_set_maxrec __P((DB_LOGC *, gchar *));
-static gint __log_c_shortread __P((DB_LOGC *, int));
+static int __log_c_io __P((DB_LOGC *,
+ u_int32_t, u_int32_t, void *, size_t *, int *));
+static int __log_c_ondisk __P((DB_LOGC *,
+ DB_LSN *, DB_LSN *, int, HDR *, u_int8_t **, int *));
+static int __log_c_set_maxrec __P((DB_LOGC *, char *));
+static int __log_c_shortread __P((DB_LOGC *, int));
/*
* __log_cursor --
* Create a log cursor.
*
- * PUBLIC: gint __log_cursor __P((DB_ENV *, DB_LOGC **, u_int32_t));
+ * PUBLIC: int __log_cursor __P((DB_ENV *, DB_LOGC **, u_int32_t));
*/
-gint
+int
__log_cursor(dbenv, logcp, flags)
DB_ENV *dbenv;
DB_LOGC **logcp;
u_int32_t flags;
{
DB_LOGC *logc;
- gint ret;
+ int ret;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
@@ -101,7 +101,7 @@ __log_c_close(logc, flags)
u_int32_t flags;
{
DB_ENV *dbenv;
- gint ret;
+ int ret;
dbenv = logc->dbenv;
@@ -135,7 +135,7 @@ __log_c_get(logc, alsn, dbt, flags)
{
DB_ENV *dbenv;
DB_LSN saved_lsn;
- gint ret;
+ int ret;
dbenv = logc->dbenv;
@@ -228,7 +228,7 @@ __log_c_get_int(logc, alsn, dbt, flags)
logfile_validity status;
u_int32_t cnt;
u_int8_t *rp;
- gint eof, is_hmac, ret;
+ int eof, is_hmac, ret;
dbenv = logc->dbenv;
dblp = dbenv->lg_handle;
@@ -574,7 +574,7 @@ __log_c_inregion(logc, lsn, rlockp, last_lsn, hdr, pp)
LOG *lp;
size_t len, nr;
u_int32_t b_disk, b_region;
- gint ret;
+ int ret;
u_int8_t *p;
dbenv = logc->dbenv;
@@ -747,14 +747,14 @@ static int
__log_c_ondisk(logc, lsn, last_lsn, flags, hdr, pp, eofp)
DB_LOGC *logc;
DB_LSN *lsn, *last_lsn;
- gint flags, *eofp;
+ int flags, *eofp;
HDR *hdr;
u_int8_t **pp;
{
DB_ENV *dbenv;
size_t len, nr;
u_int32_t offset;
- gint ret;
+ int ret;
dbenv = logc->dbenv;
*eofp = 0;
@@ -877,10 +877,10 @@ static int
__log_c_hdrchk(logc, hdr, eofp)
DB_LOGC *logc;
HDR *hdr;
- gint *eofp;
+ int *eofp;
{
DB_ENV *dbenv;
- gint ret;
+ int ret;
dbenv = logc->dbenv;
@@ -927,14 +927,14 @@ static int
__log_c_io(logc, fnum, offset, p, nrp, eofp)
DB_LOGC *logc;
u_int32_t fnum, offset;
- gpointer p;
+ void *p;
size_t *nrp;
- gint *eofp;
+ int *eofp;
{
DB_ENV *dbenv;
DB_LOG *dblp;
- gint ret;
- gchar *np;
+ int ret;
+ char *np;
dbenv = logc->dbenv;
dblp = dbenv->lg_handle;
@@ -999,7 +999,7 @@ __log_c_io(logc, fnum, offset, p, nrp, eofp)
static int
__log_c_shortread(logc, silent)
DB_LOGC *logc;
- gint silent;
+ int silent;
{
if (!silent || !F_ISSET(logc, DB_LOG_SILENT_ERR))
__db_err(logc->dbenv, "DB_LOGC->get: short read");
@@ -1013,13 +1013,13 @@ __log_c_shortread(logc, silent)
static int
__log_c_set_maxrec(logc, np)
DB_LOGC *logc;
- gchar *np;
+ char *np;
{
DB_ENV *dbenv;
DB_LOG *dblp;
LOG *lp;
u_int32_t mbytes, bytes;
- gint ret;
+ int ret;
dbenv = logc->dbenv;
dblp = dbenv->lg_handle;
diff --git a/libdb/log/log_method.c b/libdb/log/log_method.c
index 908422d..96c80c8 100644
--- a/libdb/log/log_method.c
+++ b/libdb/log/log_method.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -30,10 +30,10 @@ static const gchar revid[] = "$Id$";
#include "dbinc_auto/rpc_client_ext.h"
#endif
-static gint __log_set_lg_bsize __P((DB_ENV *, u_int32_t));
-static gint __log_set_lg_dir __P((DB_ENV *, const gchar *));
-static gint __log_set_lg_max __P((DB_ENV *, u_int32_t));
-static gint __log_set_lg_regionmax __P((DB_ENV *, u_int32_t));
+static int __log_set_lg_bsize __P((DB_ENV *, u_int32_t));
+static int __log_set_lg_dir __P((DB_ENV *, const char *));
+static int __log_set_lg_max __P((DB_ENV *, u_int32_t));
+static int __log_set_lg_regionmax __P((DB_ENV *, u_int32_t));
/*
* __log_dbenv_create --
@@ -180,7 +180,7 @@ __log_set_lg_regionmax(dbenv, lg_regionmax)
static int
__log_set_lg_dir(dbenv, dir)
DB_ENV *dbenv;
- const gchar *dir;
+ const char *dir;
{
if (dbenv->db_log_dir != NULL)
__os_free(dbenv, dbenv->db_log_dir);
diff --git a/libdb/log/log_put.c b/libdb/log/log_put.c
index d8068a0..c4bd5e8 100644
--- a/libdb/log/log_put.c
+++ b/libdb/log/log_put.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -36,24 +36,24 @@ static const gchar revid[] = "$Id$";
#include "dbinc/rep.h"
#include "dbinc/txn.h"
-static gint __log_encrypt_record __P((DB_ENV *, DBT *, HDR *, u_int32_t));
-static gint __log_fill __P((DB_LOG *, DB_LSN *, gpointer , u_int32_t));
-static gint __log_flush_commit __P((DB_ENV *, const DB_LSN *, u_int32_t));
-static gint __log_flush_int __P((DB_LOG *, const DB_LSN *, int));
-static gint __log_newfh __P((DB_LOG *));
-static gint __log_put_next __P((DB_ENV *,
+static int __log_encrypt_record __P((DB_ENV *, DBT *, HDR *, u_int32_t));
+static int __log_fill __P((DB_LOG *, DB_LSN *, void *, u_int32_t));
+static int __log_flush_commit __P((DB_ENV *, const DB_LSN *, u_int32_t));
+static int __log_flush_int __P((DB_LOG *, const DB_LSN *, int));
+static int __log_newfh __P((DB_LOG *));
+static int __log_put_next __P((DB_ENV *,
DB_LSN *, const DBT *, HDR *, DB_LSN *));
-static gint __log_putr __P((DB_LOG *,
+static int __log_putr __P((DB_LOG *,
DB_LSN *, const DBT *, u_int32_t, HDR *));
-static gint __log_write __P((DB_LOG *, gpointer , u_int32_t));
+static int __log_write __P((DB_LOG *, void *, u_int32_t));
/*
* __log_put --
* Write a log record. This is the public interface, DB_ENV->log_put.
*
- * PUBLIC: gint __log_put __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
+ * PUBLIC: int __log_put __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
*/
-gint
+int
__log_put(dbenv, lsnp, udbt, flags)
DB_ENV *dbenv;
DB_LSN *lsnp;
@@ -67,7 +67,7 @@ __log_put(dbenv, lsnp, udbt, flags)
HDR hdr;
LOG *lp;
u_int32_t do_flush, op, writeonly;
- gint lock_held, need_free, ret;
+ int lock_held, need_free, ret;
u_int8_t *key;
PANIC_CHECK(dbenv);
@@ -291,7 +291,7 @@ __log_put_next(dbenv, lsn, dbt, hdr, old_lsnp)
DB_LOG *dblp;
DB_LSN old_lsn;
LOG *lp;
- gint newfile, ret;
+ int newfile, ret;
dblp = dbenv->lg_handle;
lp = dblp->reginfo.primary;
@@ -360,7 +360,7 @@ __log_flush_commit(dbenv, lsnp, flags)
DB_LOG *dblp;
DB_LSN flush_lsn;
LOG *lp;
- gint ret;
+ int ret;
u_int32_t op;
dblp = dbenv->lg_handle;
@@ -405,9 +405,9 @@ __log_flush_commit(dbenv, lsnp, flags)
* Initialize and switch to a new log file. (Note that this is
* called both when no log yet exists and when we fill a log file.)
*
- * PUBLIC: gint __log_newfile __P((DB_LOG *, DB_LSN *));
+ * PUBLIC: int __log_newfile __P((DB_LOG *, DB_LSN *));
*/
-gint
+int
__log_newfile(dblp, lsnp)
DB_LOG *dblp;
DB_LSN *lsnp;
@@ -418,7 +418,7 @@ __log_newfile(dblp, lsnp)
DBT t;
HDR hdr;
LOG *lp;
- gint need_free, ret;
+ int need_free, ret;
u_int32_t lastoff;
size_t tsize;
u_int8_t *tmp;
@@ -520,7 +520,7 @@ __log_putr(dblp, lsn, dbt, prev, h)
DB_LSN f_lsn;
LOG *lp;
HDR tmp, *hdr;
- gint ret, t_ret;
+ int ret, t_ret;
size_t b_off, nr;
u_int32_t w_off;
@@ -607,15 +607,15 @@ err:
* __log_flush --
* Write all records less than or equal to the specified LSN.
*
- * PUBLIC: gint __log_flush __P((DB_ENV *, const DB_LSN *));
+ * PUBLIC: int __log_flush __P((DB_ENV *, const DB_LSN *));
*/
-gint
+int
__log_flush(dbenv, lsn)
DB_ENV *dbenv;
const DB_LSN *lsn;
{
DB_LOG *dblp;
- gint ret;
+ int ret;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
@@ -637,13 +637,13 @@ static int
__log_flush_int(dblp, lsnp, release)
DB_LOG *dblp;
const DB_LSN *lsnp;
- gint release;
+ int release;
{
DB_ENV *dbenv;
DB_LSN flush_lsn, f_lsn;
DB_MUTEX *flush_mutexp;
LOG *lp;
- gint current, do_flush, first, ret;
+ int current, do_flush, first, ret;
size_t b_off;
struct __db_commit *commit;
u_int32_t ncommit, w_off;
@@ -887,13 +887,13 @@ static int
__log_fill(dblp, lsn, addr, len)
DB_LOG *dblp;
DB_LSN *lsn;
- gpointer addr;
+ void *addr;
u_int32_t len;
{
LOG *lp;
u_int32_t bsize, nrec;
size_t nw, remain;
- gint ret;
+ int ret;
lp = dblp->reginfo.primary;
bsize = lp->buffer_size;
@@ -948,13 +948,13 @@ __log_fill(dblp, lsn, addr, len)
static int
__log_write(dblp, addr, len)
DB_LOG *dblp;
- gpointer addr;
+ void *addr;
u_int32_t len;
{
DB_ENV *dbenv;
LOG *lp;
size_t nw;
- gint ret;
+ int ret;
dbenv = dblp->dbenv;
lp = dblp->reginfo.primary;
@@ -998,18 +998,18 @@ __log_write(dblp, addr, len)
* __log_file --
* Map a DB_LSN to a file name.
*
- * PUBLIC: gint __log_file __P((DB_ENV *, const DB_LSN *, gchar *, size_t));
+ * PUBLIC: int __log_file __P((DB_ENV *, const DB_LSN *, char *, size_t));
*/
-gint
+int
__log_file(dbenv, lsn, namep, len)
DB_ENV *dbenv;
const DB_LSN *lsn;
- gchar *namep;
+ char *namep;
size_t len;
{
DB_LOG *dblp;
- gint ret;
- gchar *name;
+ int ret;
+ char *name;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
@@ -1044,8 +1044,8 @@ __log_newfh(dblp)
{
DB_ENV *dbenv;
LOG *lp;
- gint ret;
- gchar *name;
+ int ret;
+ char *name;
dbenv = dblp->dbenv;
lp = dblp->reginfo.primary;
@@ -1085,21 +1085,21 @@ __log_newfh(dblp)
* __log_name --
* Return the log name for a particular file, and optionally open it.
*
- * PUBLIC: gint __log_name __P((DB_LOG *,
- * PUBLIC: u_int32_t, gchar **, DB_FH *, u_int32_t));
+ * PUBLIC: int __log_name __P((DB_LOG *,
+ * PUBLIC: u_int32_t, char **, DB_FH *, u_int32_t));
*/
-gint
+int
__log_name(dblp, filenumber, namep, fhp, flags)
DB_LOG *dblp;
u_int32_t filenumber, flags;
- gchar **namep;
+ char **namep;
DB_FH *fhp;
{
DB_ENV *dbenv;
LOG *lp;
- gint ret;
- gchar *oname;
- gchar old[sizeof(LFPREFIX) + 5 + 20], new[sizeof(LFPREFIX) + 10 + 20];
+ int ret;
+ char *oname;
+ char old[sizeof(LFPREFIX) + 5 + 20], new[sizeof(LFPREFIX) + 10 + 20];
dbenv = dblp->dbenv;
lp = dblp->reginfo.primary;
@@ -1180,9 +1180,9 @@ err: __os_free(dbenv, oname);
*
* Note that the log region mutex should be held when this is called.
*
- * PUBLIC: gint __log_rep_put __P((DB_ENV *, DB_LSN *, const DBT *));
+ * PUBLIC: int __log_rep_put __P((DB_ENV *, DB_LSN *, const DBT *));
*/
-gint
+int
__log_rep_put(dbenv, lsnp, rec)
DB_ENV *dbenv;
DB_LSN *lsnp;
@@ -1193,7 +1193,7 @@ __log_rep_put(dbenv, lsnp, rec)
HDR hdr;
DBT *dbt, t;
LOG *lp;
- gint need_free, ret;
+ int need_free, ret;
dblp = dbenv->lg_handle;
lp = dblp->reginfo.primary;
@@ -1231,7 +1231,7 @@ __log_encrypt_record(dbenv, dbt, hdr, orig)
u_int32_t orig;
{
DB_CIPHER *db_cipher;
- gint ret;
+ int ret;
if (CRYPTO_ON(dbenv)) {
db_cipher = (DB_CIPHER *)dbenv->crypto_handle;
diff --git a/libdb/mp/mp_alloc.c b/libdb/mp/mp_alloc.c
index d3ac85b..3672150 100644
--- a/libdb/mp/mp_alloc.c
+++ b/libdb/mp/mp_alloc.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -31,17 +31,17 @@ static void __memp_reset_lru __P((DB_ENV *, REGINFO *, MPOOL *));
* __memp_alloc --
* Allocate some space from a cache region.
*
- * PUBLIC: gint __memp_alloc __P((DB_MPOOL *,
- * PUBLIC: REGINFO *, MPOOLFILE *, size_t, roff_t *, gpointer ));
+ * PUBLIC: int __memp_alloc __P((DB_MPOOL *,
+ * PUBLIC: REGINFO *, MPOOLFILE *, size_t, roff_t *, void *));
*/
-gint
+int
__memp_alloc(dbmp, memreg, mfp, len, offsetp, retp)
DB_MPOOL *dbmp;
REGINFO *memreg;
MPOOLFILE *mfp;
size_t len;
roff_t *offsetp;
- gpointer retp;
+ void *retp;
{
BH *bhp;
DB_ENV *dbenv;
@@ -51,8 +51,8 @@ __memp_alloc(dbmp, memreg, mfp, len, offsetp, retp)
MPOOLFILE *bh_mfp;
size_t freed_space;
u_int32_t buckets, buffers, high_priority, max_na, priority;
- gint aggressive, ret;
- gpointer p;
+ int aggressive, ret;
+ void *p;
dbenv = dbmp->dbenv;
c_mp = memreg->primary;
@@ -112,7 +112,7 @@ alloc: if ((ret = __db_shalloc(memreg->addr, len, MUTEX_ALIGN, &p)) == 0) {
found: if (offsetp != NULL)
*offsetp = R_OFFSET(memreg, p);
- *(gpointer *)retp = p;
+ *(void **)retp = p;
/*
* Update the search statistics.
@@ -374,7 +374,7 @@ __memp_reset_lru(dbenv, memreg, c_mp)
{
BH *bhp;
DB_MPOOL_HASH *hp;
- gint bucket;
+ int bucket;
/*
* Update the counter so all future allocations will start at the
diff --git a/libdb/mp/mp_bh.c b/libdb/mp/mp_bh.c
index e730f7d..34df0a8 100644
--- a/libdb/mp/mp_bh.c
+++ b/libdb/mp/mp_bh.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -23,29 +23,29 @@ static const gchar revid[] = "$Id$";
#include "dbinc/log.h"
#include "dbinc/db_page.h"
-static gint __memp_pgwrite
+static int __memp_pgwrite
__P((DB_MPOOL *, DB_MPOOLFILE *, DB_MPOOL_HASH *, BH *));
-static gint __memp_upgrade __P((DB_MPOOL *, DB_MPOOLFILE *, MPOOLFILE *));
+static int __memp_upgrade __P((DB_MPOOL *, DB_MPOOLFILE *, MPOOLFILE *));
/*
* __memp_bhwrite --
* Write the page associated with a given buffer header.
*
- * PUBLIC: gint __memp_bhwrite __P((DB_MPOOL *,
+ * PUBLIC: int __memp_bhwrite __P((DB_MPOOL *,
* PUBLIC: DB_MPOOL_HASH *, MPOOLFILE *, BH *, int));
*/
-gint
+int
__memp_bhwrite(dbmp, hp, mfp, bhp, open_extents)
DB_MPOOL *dbmp;
DB_MPOOL_HASH *hp;
MPOOLFILE *mfp;
BH *bhp;
- gint open_extents;
+ int open_extents;
{
DB_ENV *dbenv;
DB_MPOOLFILE *dbmfp;
DB_MPREG *mpreg;
- gint local_open, incremented, ret;
+ int local_open, incremented, ret;
dbenv = dbmp->dbenv;
local_open = incremented = 0;
@@ -173,21 +173,21 @@ found: ret = __memp_pgwrite(dbmp, dbmfp, hp, bhp);
* __memp_pgread --
* Read a page from a file.
*
- * PUBLIC: gint __memp_pgread __P((DB_MPOOLFILE *, DB_MUTEX *, BH *, int));
+ * PUBLIC: int __memp_pgread __P((DB_MPOOLFILE *, DB_MUTEX *, BH *, int));
*/
-gint
+int
__memp_pgread(dbmfp, mutexp, bhp, can_create)
DB_MPOOLFILE *dbmfp;
DB_MUTEX *mutexp;
BH *bhp;
- gint can_create;
+ int can_create;
{
DB_IO db_io;
DB_ENV *dbenv;
DB_MPOOL *dbmp;
MPOOLFILE *mfp;
size_t len, nr, pagesize;
- gint ret;
+ int ret;
dbmp = dbmfp->dbmp;
dbenv = dbmp->dbenv;
@@ -286,7 +286,7 @@ __memp_pgwrite(dbmp, dbmfp, hp, bhp)
DB_LSN lsn;
MPOOLFILE *mfp;
size_t nw;
- gint callpgin, ret;
+ int callpgin, ret;
dbenv = dbmp->dbenv;
mfp = dbmfp == NULL ? NULL : dbmfp->mfp;
@@ -447,20 +447,20 @@ file_dead:
* __memp_pg --
* Call the pgin/pgout routine.
*
- * PUBLIC: gint __memp_pg __P((DB_MPOOLFILE *, BH *, int));
+ * PUBLIC: int __memp_pg __P((DB_MPOOLFILE *, BH *, int));
*/
-gint
+int
__memp_pg(dbmfp, bhp, is_pgin)
DB_MPOOLFILE *dbmfp;
BH *bhp;
- gint is_pgin;
+ int is_pgin;
{
DBT dbt, *dbtp;
DB_ENV *dbenv;
DB_MPOOL *dbmp;
DB_MPREG *mpreg;
MPOOLFILE *mfp;
- gint ftype, ret;
+ int ftype, ret;
dbmp = dbmfp->dbmp;
dbenv = dbmp->dbenv;
@@ -517,7 +517,7 @@ __memp_bhfree(dbmp, hp, bhp, free_mem)
DB_MPOOL *dbmp;
DB_MPOOL_HASH *hp;
BH *bhp;
- gint free_mem;
+ int free_mem;
{
DB_ENV *dbenv;
MPOOL *c_mp, *mp;
@@ -591,8 +591,8 @@ __memp_upgrade(dbmp, dbmfp, mfp)
{
DB_ENV *dbenv;
DB_FH *fhp, *tfhp;
- gint ret;
- gchar *rpath;
+ int ret;
+ char *rpath;
dbenv = dbmp->dbenv;
fhp = NULL;
diff --git a/libdb/mp/mp_fget.c b/libdb/mp/mp_fget.c
index ddcfdac..0e1346e 100644
--- a/libdb/mp/mp_fget.c
+++ b/libdb/mp/mp_fget.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -21,7 +21,7 @@ static const gchar revid[] = "$Id$";
#include "dbinc/mp.h"
#ifdef HAVE_FILESYSTEM_NOTZERO
-static gint __memp_fs_notzero
+static int __memp_fs_notzero
__P((DB_ENV *, DB_MPOOLFILE *, MPOOLFILE *, db_pgno_t *));
#endif
@@ -29,15 +29,15 @@ static gint __memp_fs_notzero
* __memp_fget --
* Get a page from the file.
*
- * PUBLIC: gint __memp_fget
- * PUBLIC: __P((DB_MPOOLFILE *, db_pgno_t *, u_int32_t, gpointer ));
+ * PUBLIC: int __memp_fget
+ * PUBLIC: __P((DB_MPOOLFILE *, db_pgno_t *, u_int32_t, void *));
*/
-gint
+int
__memp_fget(dbmfp, pgnoaddr, flags, addrp)
DB_MPOOLFILE *dbmfp;
db_pgno_t *pgnoaddr;
u_int32_t flags;
- gpointer addrp;
+ void *addrp;
{
enum { FIRST_FOUND, FIRST_MISS, SECOND_FOUND, SECOND_MISS } state;
BH *alloc_bhp, *bhp;
@@ -48,9 +48,9 @@ __memp_fget(dbmfp, pgnoaddr, flags, addrp)
MPOOLFILE *mfp;
roff_t mf_offset;
u_int32_t n_cache, st_hsearch;
- gint b_incr, extending, first, ret;
+ int b_incr, extending, first, ret;
- *(gpointer *)addrp = NULL;
+ *(void **)addrp = NULL;
dbmp = dbmfp->dbmp;
dbenv = dbmp->dbenv;
@@ -128,7 +128,7 @@ __memp_fget(dbmfp, pgnoaddr, flags, addrp)
*/
if (dbmfp->addr != NULL &&
F_ISSET(mfp, MP_CAN_MMAP) && *pgnoaddr <= mfp->orig_last_pgno) {
- *(gpointer *)addrp =
+ *(void **)addrp =
R_ADDR(dbmfp, *pgnoaddr * mfp->stat.st_pagesize);
++mfp->stat.st_map;
return (0);
@@ -557,7 +557,7 @@ alloc: /*
__os_yield(dbenv, 1);
#endif
- *(gpointer *)addrp = bhp->buf;
+ *(void **)addrp = bhp->buf;
return (0);
err: /*
@@ -596,9 +596,9 @@ __memp_fs_notzero(dbenv, dbmfp, mfp, pgnoaddr)
DB_IO db_io;
u_int32_t i, npages;
size_t nw;
- gint ret;
+ int ret;
u_int8_t *page;
- gchar *fail;
+ char *fail;
/*
* Pages allocated by writing pages past end-of-file are not zeroed,
diff --git a/libdb/mp/mp_fopen.c b/libdb/mp/mp_fopen.c
index 65c3d50..0b9a8b2 100644
--- a/libdb/mp/mp_fopen.c
+++ b/libdb/mp/mp_fopen.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -20,18 +20,18 @@ static const gchar revid[] = "$Id$";
#include "dbinc/db_shash.h"
#include "dbinc/mp.h"
-static gint __memp_fclose __P((DB_MPOOLFILE *, u_int32_t));
-static gint __memp_fopen __P((DB_MPOOLFILE *,
- const gchar *, u_int32_t, int, size_t));
+static int __memp_fclose __P((DB_MPOOLFILE *, u_int32_t));
+static int __memp_fopen __P((DB_MPOOLFILE *,
+ const char *, u_int32_t, int, size_t));
static void __memp_get_fileid __P((DB_MPOOLFILE *, u_int8_t *));
static void __memp_last_pgno __P((DB_MPOOLFILE *, db_pgno_t *));
static void __memp_refcnt __P((DB_MPOOLFILE *, db_pgno_t *));
-static gint __memp_set_clear_len __P((DB_MPOOLFILE *, u_int32_t));
-static gint __memp_set_fileid __P((DB_MPOOLFILE *, u_int8_t *));
-static gint __memp_set_ftype __P((DB_MPOOLFILE *, int));
-static gint __memp_set_lsn_offset __P((DB_MPOOLFILE *, int32_t));
-static gint __memp_set_pgcookie __P((DB_MPOOLFILE *, DBT *));
-static gint __memp_set_priority __P((DB_MPOOLFILE *, DB_CACHE_PRIORITY));
+static int __memp_set_clear_len __P((DB_MPOOLFILE *, u_int32_t));
+static int __memp_set_fileid __P((DB_MPOOLFILE *, u_int8_t *));
+static int __memp_set_ftype __P((DB_MPOOLFILE *, int));
+static int __memp_set_lsn_offset __P((DB_MPOOLFILE *, int32_t));
+static int __memp_set_pgcookie __P((DB_MPOOLFILE *, DBT *));
+static int __memp_set_priority __P((DB_MPOOLFILE *, DB_CACHE_PRIORITY));
static void __memp_set_unlink __P((DB_MPOOLFILE *, int));
/* Initialization methods cannot be called after open is called. */
@@ -43,9 +43,9 @@ static void __memp_set_unlink __P((DB_MPOOLFILE *, int));
* __memp_fcreate --
* Create a DB_MPOOLFILE handle.
*
- * PUBLIC: gint __memp_fcreate __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
+ * PUBLIC: int __memp_fcreate __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
*/
-gint
+int
__memp_fcreate(dbenv, retp, flags)
DB_ENV *dbenv;
DB_MPOOLFILE **retp;
@@ -53,7 +53,7 @@ __memp_fcreate(dbenv, retp, flags)
{
DB_MPOOL *dbmp;
DB_MPOOLFILE *dbmfp;
- gint ret;
+ int ret;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
@@ -152,7 +152,7 @@ __memp_set_fileid(dbmfp, fileid)
static int
__memp_set_ftype(dbmfp, ftype)
DB_MPOOLFILE *dbmfp;
- gint ftype;
+ int ftype;
{
MPF_ILLEGAL_AFTER_OPEN(dbmfp, "set_ftype");
@@ -231,14 +231,14 @@ __memp_set_priority(dbmfp, priority)
static int
__memp_fopen(dbmfp, path, flags, mode, pagesize)
DB_MPOOLFILE *dbmfp;
- const gchar *path;
+ const char *path;
u_int32_t flags;
- gint mode;
+ int mode;
size_t pagesize;
{
DB_ENV *dbenv;
DB_MPOOL *dbmp;
- gint ret;
+ int ret;
dbmp = dbmfp->dbmp;
dbenv = dbmp->dbenv;
@@ -280,16 +280,16 @@ __memp_fopen(dbmfp, path, flags, mode, pagesize)
* __memp_fopen_int --
* Open a backing file for the memory pool; internal version.
*
- * PUBLIC: gint __memp_fopen_int __P((DB_MPOOLFILE *,
- * PUBLIC: MPOOLFILE *, const gchar *, u_int32_t, int, size_t));
+ * PUBLIC: int __memp_fopen_int __P((DB_MPOOLFILE *,
+ * PUBLIC: MPOOLFILE *, const char *, u_int32_t, int, size_t));
*/
-gint
+int
__memp_fopen_int(dbmfp, mfp, path, flags, mode, pagesize)
DB_MPOOLFILE *dbmfp;
MPOOLFILE *mfp;
- const gchar *path;
+ const char *path;
u_int32_t flags;
- gint mode;
+ int mode;
size_t pagesize;
{
DB_ENV *dbenv;
@@ -298,10 +298,10 @@ __memp_fopen_int(dbmfp, mfp, path, flags, mode, pagesize)
db_pgno_t last_pgno;
size_t maxmap;
u_int32_t mbytes, bytes, oflags;
- gint mfp_alloc, ret;
+ int mfp_alloc, ret;
u_int8_t idbuf[DB_FILE_ID_LEN];
- gchar *rpath;
- gpointer p;
+ char *rpath;
+ void *p;
dbmp = dbmfp->dbmp;
dbenv = dbmp->dbenv;
@@ -722,7 +722,7 @@ __memp_refcnt(dbmfp, cntp)
static void
__memp_set_unlink(dbmpf, set)
DB_MPOOLFILE *dbmpf;
- gint set;
+ int set;
{
DB_ENV *dbenv;
@@ -746,7 +746,7 @@ __memp_fclose(dbmfp, flags)
u_int32_t flags;
{
DB_ENV *dbenv;
- gint ret, t_ret;
+ int ret, t_ret;
dbenv = dbmfp->dbmp->dbenv;
@@ -768,9 +768,9 @@ __memp_fclose(dbmfp, flags)
* __memp_fclose_int --
* Internal version of __memp_fclose.
*
- * PUBLIC: gint __memp_fclose_int __P((DB_MPOOLFILE *, u_int32_t));
+ * PUBLIC: int __memp_fclose_int __P((DB_MPOOLFILE *, u_int32_t));
*/
-gint
+int
__memp_fclose_int(dbmfp, flags)
DB_MPOOLFILE *dbmfp;
u_int32_t flags;
@@ -778,8 +778,8 @@ __memp_fclose_int(dbmfp, flags)
DB_ENV *dbenv;
DB_MPOOL *dbmp;
MPOOLFILE *mfp;
- gchar *rpath;
- gint deleted, ret, t_ret;
+ char *rpath;
+ int deleted, ret, t_ret;
dbmp = dbmfp->dbmp;
dbenv = dbmp->dbenv;
@@ -906,9 +906,9 @@ done: __os_free(dbenv, dbmfp->fhp);
* __memp_mf_discard --
* Discard an MPOOLFILE.
*
- * PUBLIC: gint __memp_mf_discard __P((DB_MPOOL *, MPOOLFILE *));
+ * PUBLIC: int __memp_mf_discard __P((DB_MPOOL *, MPOOLFILE *));
*/
-gint
+int
__memp_mf_discard(dbmp, mfp)
DB_MPOOL *dbmp;
MPOOLFILE *mfp;
@@ -917,8 +917,8 @@ __memp_mf_discard(dbmp, mfp)
DB_FH fh;
DB_MPOOL_STAT *sp;
MPOOL *mp;
- gchar *rpath;
- gint ret;
+ char *rpath;
+ int ret;
dbenv = dbmp->dbenv;
mp = dbmp->reginfo[0].primary;
@@ -990,9 +990,9 @@ __memp_mf_discard(dbmp, mfp)
* __memp_fn --
* On errors we print whatever is available as the file name.
*
- * PUBLIC: gchar * __memp_fn __P((DB_MPOOLFILE *));
+ * PUBLIC: char * __memp_fn __P((DB_MPOOLFILE *));
*/
-gchar *
+char *
__memp_fn(dbmfp)
DB_MPOOLFILE *dbmfp;
{
@@ -1003,16 +1003,16 @@ __memp_fn(dbmfp)
* __memp_fns --
* On errors we print whatever is available as the file name.
*
- * PUBLIC: gchar * __memp_fns __P((DB_MPOOL *, MPOOLFILE *));
+ * PUBLIC: char * __memp_fns __P((DB_MPOOL *, MPOOLFILE *));
*
*/
-gchar *
+char *
__memp_fns(dbmp, mfp)
DB_MPOOL *dbmp;
MPOOLFILE *mfp;
{
if (mfp->path_off == 0)
- return ((gchar *)"temporary");
+ return ((char *)"temporary");
- return ((gchar *)R_ADDR(dbmp->reginfo, mfp->path_off));
+ return ((char *)R_ADDR(dbmp->reginfo, mfp->path_off));
}
diff --git a/libdb/mp/mp_fput.c b/libdb/mp/mp_fput.c
index 8401452..64cda27 100644
--- a/libdb/mp/mp_fput.c
+++ b/libdb/mp/mp_fput.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -23,12 +23,12 @@ static const gchar revid[] = "$Id$";
* __memp_fput --
* Mpool file put function.
*
- * PUBLIC: gint __memp_fput __P((DB_MPOOLFILE *, gpointer , u_int32_t));
+ * PUBLIC: int __memp_fput __P((DB_MPOOLFILE *, void *, u_int32_t));
*/
-gint
+int
__memp_fput(dbmfp, pgaddr, flags)
DB_MPOOLFILE *dbmfp;
- gpointer pgaddr;
+ void *pgaddr;
u_int32_t flags;
{
BH *argbhp, *bhp, *prev;
@@ -37,7 +37,7 @@ __memp_fput(dbmfp, pgaddr, flags)
DB_MPOOL_HASH *hp;
MPOOL *c_mp;
u_int32_t n_cache;
- gint adjust, ret;
+ int adjust, ret;
dbmp = dbmfp->dbmp;
dbenv = dbmp->dbenv;
diff --git a/libdb/mp/mp_fset.c b/libdb/mp/mp_fset.c
index 9265dd6..a8e012d 100644
--- a/libdb/mp/mp_fset.c
+++ b/libdb/mp/mp_fset.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -23,12 +23,12 @@ static const gchar revid[] = "$Id$";
* __memp_fset --
* Mpool page set-flag routine.
*
- * PUBLIC: gint __memp_fset __P((DB_MPOOLFILE *, gpointer , u_int32_t));
+ * PUBLIC: int __memp_fset __P((DB_MPOOLFILE *, void *, u_int32_t));
*/
-gint
+int
__memp_fset(dbmfp, pgaddr, flags)
DB_MPOOLFILE *dbmfp;
- gpointer pgaddr;
+ void *pgaddr;
u_int32_t flags;
{
BH *bhp;
@@ -37,7 +37,7 @@ __memp_fset(dbmfp, pgaddr, flags)
DB_MPOOL_HASH *hp;
MPOOL *c_mp;
u_int32_t n_cache;
- gint ret;
+ int ret;
dbmp = dbmfp->dbmp;
dbenv = dbmp->dbenv;
diff --git a/libdb/mp/mp_method.c b/libdb/mp/mp_method.c
index ecb7ab7..0a78d5e 100644
--- a/libdb/mp/mp_method.c
+++ b/libdb/mp/mp_method.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -27,8 +27,8 @@ static const gchar revid[] = "$Id$";
#include "dbinc_auto/rpc_client_ext.h"
#endif
-static gint __memp_set_cachesize __P((DB_ENV *, u_int32_t, u_int32_t, int));
-static gint __memp_set_mp_mmapsize __P((DB_ENV *, size_t));
+static int __memp_set_cachesize __P((DB_ENV *, u_int32_t, u_int32_t, int));
+static int __memp_set_mp_mmapsize __P((DB_ENV *, size_t));
/*
* __memp_dbenv_create --
@@ -91,7 +91,7 @@ static int
__memp_set_cachesize(dbenv, gbytes, bytes, ncache)
DB_ENV *dbenv;
u_int32_t gbytes, bytes;
- gint ncache;
+ int ncache;
{
ENV_ILLEGAL_AFTER_OPEN(dbenv, "set_cachesize");
diff --git a/libdb/mp/mp_region.c b/libdb/mp/mp_region.c
index d0c1c7a..fd0299a 100644
--- a/libdb/mp/mp_region.c
+++ b/libdb/mp/mp_region.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -20,7 +20,7 @@ static const gchar revid[] = "$Id$";
#include "dbinc/db_shash.h"
#include "dbinc/mp.h"
-static gint __mpool_init __P((DB_ENV *, DB_MPOOL *, int, int));
+static int __mpool_init __P((DB_ENV *, DB_MPOOL *, int, int));
#ifdef HAVE_MUTEX_SYSTEM_RESOURCES
static size_t __mpool_region_maint __P((REGINFO *));
#endif
@@ -29,9 +29,9 @@ static size_t __mpool_region_maint __P((REGINFO *));
* __memp_open --
* Internal version of memp_open: only called from DB_ENV->open.
*
- * PUBLIC: gint __memp_open __P((DB_ENV *));
+ * PUBLIC: int __memp_open __P((DB_ENV *));
*/
-gint
+int
__memp_open(dbenv)
DB_ENV *dbenv;
{
@@ -40,7 +40,7 @@ __memp_open(dbenv)
REGINFO reginfo;
roff_t reg_size, *regids;
u_int32_t i;
- gint htab_buckets, ret;
+ int htab_buckets, ret;
/* Figure out how big each cache region is. */
reg_size = (dbenv->mp_gbytes / dbenv->mp_ncache) * GIGABYTE;
@@ -204,7 +204,7 @@ static int
__mpool_init(dbenv, dbmp, reginfo_off, htab_buckets)
DB_ENV *dbenv;
DB_MPOOL *dbmp;
- gint reginfo_off, htab_buckets;
+ int reginfo_off, htab_buckets;
{
DB_MPOOL_HASH *htab;
MPOOL *mp;
@@ -212,8 +212,8 @@ __mpool_init(dbenv, dbmp, reginfo_off, htab_buckets)
#ifdef HAVE_MUTEX_SYSTEM_RESOURCES
size_t maint_size;
#endif
- gint i, ret;
- gpointer p;
+ int i, ret;
+ void *p;
mp = NULL;
@@ -278,9 +278,9 @@ mem_err:__db_err(dbenv, "Unable to allocate memory for mpool region");
* __memp_dbenv_refresh --
* Clean up after the mpool system on a close or failed open.
*
- * PUBLIC: gint __memp_dbenv_refresh __P((DB_ENV *));
+ * PUBLIC: int __memp_dbenv_refresh __P((DB_ENV *));
*/
-gint
+int
__memp_dbenv_refresh(dbenv)
DB_ENV *dbenv;
{
@@ -288,7 +288,7 @@ __memp_dbenv_refresh(dbenv)
DB_MPOOLFILE *dbmfp;
DB_MPREG *mpreg;
u_int32_t i;
- gint ret, t_ret;
+ int ret, t_ret;
ret = 0;
dbmp = dbenv->mp_handle;
@@ -332,7 +332,7 @@ __mpool_region_maint(infop)
REGINFO *infop;
{
size_t s;
- gint numlocks;
+ int numlocks;
/*
* For mutex maintenance we need one mutex per possible page.
@@ -369,24 +369,24 @@ __mpool_region_destroy(dbenv, infop)
* __memp_nameop
* Remove or rename a file in the pool.
*
- * PUBLIC: gint __memp_nameop __P((DB_ENV *,
- * PUBLIC: u_int8_t *, const gchar *, const gchar *, const gchar *));
+ * PUBLIC: int __memp_nameop __P((DB_ENV *,
+ * PUBLIC: u_int8_t *, const char *, const char *, const char *));
*
* XXX
* Undocumented interface: DB private.
*/
-gint
+int
__memp_nameop(dbenv, fileid, newname, fullold, fullnew)
DB_ENV *dbenv;
u_int8_t *fileid;
- const gchar *newname, *fullold, *fullnew;
+ const char *newname, *fullold, *fullnew;
{
DB_MPOOL *dbmp;
MPOOL *mp;
MPOOLFILE *mfp;
roff_t newname_off;
- gint locked, ret;
- gpointer p;
+ int locked, ret;
+ void *p;
locked = 0;
dbmp = NULL;
diff --git a/libdb/mp/mp_register.c b/libdb/mp/mp_register.c
index b58d1b3..89b6b60 100644
--- a/libdb/mp/mp_register.c
+++ b/libdb/mp/mp_register.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -22,20 +22,20 @@ static const gchar revid[] = "$Id$";
* memp_register --
* Register a file type's pgin, pgout routines.
*
- * PUBLIC: gint __memp_register __P((DB_ENV *, int,
- * PUBLIC: gint (*)(DB_ENV *, db_pgno_t, gpointer , DBT *),
- * PUBLIC: gint (*)(DB_ENV *, db_pgno_t, gpointer , DBT *)));
+ * PUBLIC: int __memp_register __P((DB_ENV *, int,
+ * PUBLIC: int (*)(DB_ENV *, db_pgno_t, void *, DBT *),
+ * PUBLIC: int (*)(DB_ENV *, db_pgno_t, void *, DBT *)));
*/
-gint
+int
__memp_register(dbenv, ftype, pgin, pgout)
DB_ENV *dbenv;
- gint ftype;
- gint (*pgin) __P((DB_ENV *, db_pgno_t, gpointer , DBT *));
- gint (*pgout) __P((DB_ENV *, db_pgno_t, gpointer , DBT *));
+ int ftype;
+ int (*pgin) __P((DB_ENV *, db_pgno_t, void *, DBT *));
+ int (*pgout) __P((DB_ENV *, db_pgno_t, void *, DBT *));
{
DB_MPOOL *dbmp;
DB_MPREG *mpreg;
- gint ret;
+ int ret;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
diff --git a/libdb/mp/mp_stat.c b/libdb/mp/mp_stat.c
index 55530f2..23779b3 100644
--- a/libdb/mp/mp_stat.c
+++ b/libdb/mp/mp_stat.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -33,10 +33,10 @@ static void __memp_stat_wait __P((REGINFO *, MPOOL *, DB_MPOOL_STAT *, int));
* __memp_stat --
* Display MPOOL statistics.
*
- * PUBLIC: gint __memp_stat
+ * PUBLIC: int __memp_stat
* PUBLIC: __P((DB_ENV *, DB_MPOOL_STAT **, DB_MPOOL_FSTAT ***, u_int32_t));
*/
-gint
+int
__memp_stat(dbenv, gspp, fspp, flags)
DB_ENV *dbenv;
DB_MPOOL_STAT **gspp;
@@ -50,8 +50,8 @@ __memp_stat(dbenv, gspp, fspp, flags)
MPOOLFILE *mfp;
size_t len, nlen, pagesize;
u_int32_t pages, i;
- gint ret;
- gchar *name, *tname;
+ int ret;
+ char *name, *tname;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
@@ -200,7 +200,7 @@ __memp_stat(dbenv, gspp, fspp, flags)
*/
tfsp = *fspp;
tstruct = (DB_MPOOL_FSTAT *)(tfsp + i + 1);
- tname = (gchar *)(tstruct + i);
+ tname = (char *)(tstruct + i);
/*
* Files may have been opened since we counted, don't walk
@@ -240,12 +240,12 @@ __memp_stat(dbenv, gspp, fspp, flags)
* __memp_dump_region --
* Display MPOOL structures.
*
- * PUBLIC: gint __memp_dump_region __P((DB_ENV *, gchar *, FILE *));
+ * PUBLIC: int __memp_dump_region __P((DB_ENV *, char *, FILE *));
*/
-gint
+int
__memp_dump_region(dbenv, area, fp)
DB_ENV *dbenv;
- gchar *area;
+ char *area;
FILE *fp;
{
static const FN fn[] = {
@@ -263,7 +263,7 @@ __memp_dump_region(dbenv, area, fp)
MPOOLFILE *mfp;
size_t fmap[FMAP_ENTRIES + 1];
u_int32_t i, flags;
- gint cnt;
+ int cnt;
u_int8_t *p;
PANIC_CHECK(dbenv);
@@ -363,7 +363,7 @@ __memp_dumpcache(dbenv, dbmp, reginfo, fmap, fp, flags)
BH *bhp;
DB_MPOOL_HASH *hp;
MPOOL *c_mp;
- gint bucket;
+ int bucket;
c_mp = reginfo->primary;
@@ -413,7 +413,7 @@ __memp_pbh(dbmp, bhp, fmap, fp)
{ BH_TRASH, "trash" },
{ 0, NULL }
};
- gint i;
+ int i;
for (i = 0; i < FMAP_ENTRIES; ++i)
if (fmap[i] == INVALID_ROFF || fmap[i] == bhp->mf_offset)
@@ -451,7 +451,7 @@ __memp_stat_hash(reginfo, mp, dirtyp)
{
DB_MPOOL_HASH *hp;
u_int32_t dirty;
- gint i;
+ int i;
hp = R_ADDR(reginfo, mp->htab);
for (i = 0, dirty = 0; i < mp->htab_buckets; i++, hp++)
@@ -468,11 +468,11 @@ __memp_stat_wait(reginfo, mp, mstat, flags)
REGINFO *reginfo;
MPOOL *mp;
DB_MPOOL_STAT *mstat;
- gint flags;
+ int flags;
{
DB_MPOOL_HASH *hp;
DB_MUTEX *mutexp;
- gint i;
+ int i;
mstat->st_hash_max_wait = 0;
hp = R_ADDR(reginfo, mp->htab);
diff --git a/libdb/mp/mp_sync.c b/libdb/mp/mp_sync.c
index 6503b89..0ffc1cc 100644
--- a/libdb/mp/mp_sync.c
+++ b/libdb/mp/mp_sync.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -27,24 +27,24 @@ typedef struct {
db_pgno_t track_pgno; /* Page number. */
} BH_TRACK;
-static gint __bhcmp __P((gconstpointer , gconstpointer ));
-static gint __memp_close_flush_files __P((DB_ENV *, DB_MPOOL *));
-static gint __memp_sync_files __P((DB_ENV *, DB_MPOOL *));
+static int __bhcmp __P((const void *, const void *));
+static int __memp_close_flush_files __P((DB_ENV *, DB_MPOOL *));
+static int __memp_sync_files __P((DB_ENV *, DB_MPOOL *));
/*
* __memp_sync --
* Mpool sync function.
*
- * PUBLIC: gint __memp_sync __P((DB_ENV *, DB_LSN *));
+ * PUBLIC: int __memp_sync __P((DB_ENV *, DB_LSN *));
*/
-gint
+int
__memp_sync(dbenv, lsnp)
DB_ENV *dbenv;
DB_LSN *lsnp;
{
DB_MPOOL *dbmp;
MPOOL *mp;
- gint ret;
+ int ret;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
@@ -90,9 +90,9 @@ __memp_sync(dbenv, lsnp)
* __memp_fsync --
* Mpool file sync function.
*
- * PUBLIC: gint __memp_fsync __P((DB_MPOOLFILE *));
+ * PUBLIC: int __memp_fsync __P((DB_MPOOLFILE *));
*/
-gint
+int
__memp_fsync(dbmfp)
DB_MPOOLFILE *dbmfp;
{
@@ -122,9 +122,9 @@ __memp_fsync(dbmfp)
* __mp_xxx_fh --
* Return a file descriptor for DB 1.85 compatibility locking.
*
- * PUBLIC: gint __mp_xxx_fh __P((DB_MPOOLFILE *, DB_FH **));
+ * PUBLIC: int __mp_xxx_fh __P((DB_MPOOLFILE *, DB_FH **));
*/
-gint
+int
__mp_xxx_fh(dbmfp, fhp)
DB_MPOOLFILE *dbmfp;
DB_FH **fhp;
@@ -156,14 +156,14 @@ __mp_xxx_fh(dbmfp, fhp)
* __memp_sync_int --
* Mpool sync internal function.
*
- * PUBLIC: gint __memp_sync_int
- * PUBLIC: __P((DB_ENV *, DB_MPOOLFILE *, int, db_sync_op, gint *));
+ * PUBLIC: int __memp_sync_int
+ * PUBLIC: __P((DB_ENV *, DB_MPOOLFILE *, int, db_sync_op, int *));
*/
-gint
+int
__memp_sync_int(dbenv, dbmfp, ar_max, op, wrotep)
DB_ENV *dbenv;
DB_MPOOLFILE *dbmfp;
- gint ar_max, *wrotep;
+ int ar_max, *wrotep;
db_sync_op op;
{
BH *bhp;
@@ -174,7 +174,7 @@ __memp_sync_int(dbenv, dbmfp, ar_max, op, wrotep)
MPOOL *c_mp, *mp;
MPOOLFILE *mfp;
u_int32_t n_cache;
- gint ar_cnt, hb_lock, i, pass, remaining, ret, t_ret, wait_cnt, wrote;
+ int ar_cnt, hb_lock, i, pass, remaining, ret, t_ret, wait_cnt, wrote;
dbmp = dbenv->mp_handle;
mp = dbmp->reginfo[0].primary;
@@ -501,14 +501,14 @@ err: __os_free(dbenv, bharray);
* Sync all the files in the environment, open or not.
*/
static
-gint __memp_sync_files(dbenv, dbmp)
+int __memp_sync_files(dbenv, dbmp)
DB_ENV *dbenv;
DB_MPOOL *dbmp;
{
DB_MPOOLFILE *dbmfp;
MPOOL *mp;
MPOOLFILE *mfp;
- gint ret, t_ret;
+ int ret, t_ret;
ret = 0;
mp = dbmp->reginfo[0].primary;
@@ -569,7 +569,7 @@ __memp_close_flush_files(dbenv, dbmp)
DB_MPOOL *dbmp;
{
DB_MPOOLFILE *dbmfp;
- gint ret;
+ int ret;
/*
* The routine exists because we must close files opened by sync to
@@ -601,7 +601,7 @@ retry: MUTEX_THREAD_LOCK(dbenv, dbmp->mutexp);
static int
__bhcmp(p1, p2)
- gconstpointer p1, *p2;
+ const void *p1, *p2;
{
BH_TRACK *bhp1, *bhp2;
diff --git a/libdb/mp/mp_trickle.c b/libdb/mp/mp_trickle.c
index a93d62b..8f78a2b 100644
--- a/libdb/mp/mp_trickle.c
+++ b/libdb/mp/mp_trickle.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,17 +24,17 @@ static const gchar revid[] = "$Id$";
* __memp_trickle --
* Keep a specified percentage of the buffers clean.
*
- * PUBLIC: gint __memp_trickle __P((DB_ENV *, int, gint *));
+ * PUBLIC: int __memp_trickle __P((DB_ENV *, int, int *));
*/
-gint
+int
__memp_trickle(dbenv, pct, nwrotep)
DB_ENV *dbenv;
- gint pct, *nwrotep;
+ int pct, *nwrotep;
{
DB_MPOOL *dbmp;
MPOOL *c_mp, *mp;
u_int32_t clean, dirty, i, total, dtmp;
- gint ret, wrote;
+ int ret, wrote;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
diff --git a/libdb/mutex/mut_fcntl.c b/libdb/mutex/mut_fcntl.c
index 0d0699a..687ca6b 100644
--- a/libdb/mutex/mut_fcntl.c
+++ b/libdb/mutex/mut_fcntl.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -26,9 +26,9 @@ static const gchar revid[] = "$Id$";
* __db_fcntl_mutex_init --
* Initialize a DB mutex structure.
*
- * PUBLIC: gint __db_fcntl_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
+ * PUBLIC: int __db_fcntl_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
*/
-gint
+int
__db_fcntl_mutex_init(dbenv, mutexp, offset)
DB_ENV *dbenv;
DB_MUTEX *mutexp;
@@ -69,15 +69,15 @@ __db_fcntl_mutex_init(dbenv, mutexp, offset)
* __db_fcntl_mutex_lock
* Lock on a mutex, blocking if necessary.
*
- * PUBLIC: gint __db_fcntl_mutex_lock __P((DB_ENV *, DB_MUTEX *));
+ * PUBLIC: int __db_fcntl_mutex_lock __P((DB_ENV *, DB_MUTEX *));
*/
-gint
+int
__db_fcntl_mutex_lock(dbenv, mutexp)
DB_ENV *dbenv;
DB_MUTEX *mutexp;
{
struct flock k_lock;
- gint locked, ms, waited;
+ int locked, ms, waited;
if (F_ISSET(dbenv, DB_ENV_NOLOCKING))
return (0);
@@ -139,9 +139,9 @@ __db_fcntl_mutex_lock(dbenv, mutexp)
* __db_fcntl_mutex_unlock --
* Release a lock.
*
- * PUBLIC: gint __db_fcntl_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
+ * PUBLIC: int __db_fcntl_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
*/
-gint
+int
__db_fcntl_mutex_unlock(dbenv, mutexp)
DB_ENV *dbenv;
DB_MUTEX *mutexp;
@@ -172,9 +172,9 @@ __db_fcntl_mutex_unlock(dbenv, mutexp)
* __db_fcntl_mutex_destroy --
* Destroy a DB_MUTEX.
*
- * PUBLIC: gint __db_fcntl_mutex_destroy __P((DB_MUTEX *));
+ * PUBLIC: int __db_fcntl_mutex_destroy __P((DB_MUTEX *));
*/
-gint
+int
__db_fcntl_mutex_destroy(mutexp)
DB_MUTEX *mutexp;
{
diff --git a/libdb/mutex/mut_pthread.c b/libdb/mutex/mut_pthread.c
index a87df4d..04d4b08 100644
--- a/libdb/mutex/mut_pthread.c
+++ b/libdb/mutex/mut_pthread.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -59,16 +59,16 @@ static const gchar revid[] = "$Id$";
* __db_pthread_mutex_init --
* Initialize a DB_MUTEX.
*
- * PUBLIC: gint __db_pthread_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
+ * PUBLIC: int __db_pthread_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
*/
-gint
+int
__db_pthread_mutex_init(dbenv, mutexp, flags)
DB_ENV *dbenv;
DB_MUTEX *mutexp;
u_int32_t flags;
{
u_int32_t save;
- gint ret;
+ int ret;
ret = 0;
@@ -172,7 +172,7 @@ __db_pthread_mutex_init(dbenv, mutexp, flags)
#endif
#ifdef HAVE_MUTEX_UI_THREADS
{
- gint type;
+ int type;
type = LF_ISSET(MUTEX_THREAD) ? USYNC_THREAD : USYNC_PROCESS;
@@ -201,15 +201,15 @@ __db_pthread_mutex_init(dbenv, mutexp, flags)
* __db_pthread_mutex_lock
* Lock on a mutex, logically blocking if necessary.
*
- * PUBLIC: gint __db_pthread_mutex_lock __P((DB_ENV *, DB_MUTEX *));
+ * PUBLIC: int __db_pthread_mutex_lock __P((DB_ENV *, DB_MUTEX *));
*/
-gint
+int
__db_pthread_mutex_lock(dbenv, mutexp)
DB_ENV *dbenv;
DB_MUTEX *mutexp;
{
u_int32_t nspins;
- gint i, ret, waited;
+ int i, ret, waited;
if (F_ISSET(dbenv, DB_ENV_NOLOCKING) || F_ISSET(mutexp, MUTEX_IGNORE))
return (0);
@@ -280,7 +280,7 @@ __db_pthread_mutex_lock(dbenv, mutexp)
++mutexp->mutex_set_wait;
#ifdef DIAGNOSTIC
if (mutexp->locked) {
- gchar msgbuf[128];
+ char msgbuf[128];
(void)snprintf(msgbuf,
sizeof(msgbuf), MSG1, (u_long)mutexp->locked);
(void)write(STDERR_FILENO, msgbuf, strlen(msgbuf));
@@ -300,14 +300,14 @@ err: __db_err(dbenv, "unable to lock mutex: %s", strerror(ret));
* __db_pthread_mutex_unlock --
* Release a lock.
*
- * PUBLIC: gint __db_pthread_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
+ * PUBLIC: int __db_pthread_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
*/
-gint
+int
__db_pthread_mutex_unlock(dbenv, mutexp)
DB_ENV *dbenv;
DB_MUTEX *mutexp;
{
- gint i, ret;
+ int i, ret;
if (F_ISSET(dbenv, DB_ENV_NOLOCKING) || F_ISSET(mutexp, MUTEX_IGNORE))
return (0);
@@ -344,13 +344,13 @@ err: __db_err(dbenv, "unable to unlock mutex: %s", strerror(ret));
* __db_pthread_mutex_destroy --
* Destroy a DB_MUTEX.
*
- * PUBLIC: gint __db_pthread_mutex_destroy __P((DB_MUTEX *));
+ * PUBLIC: int __db_pthread_mutex_destroy __P((DB_MUTEX *));
*/
-gint
+int
__db_pthread_mutex_destroy(mutexp)
DB_MUTEX *mutexp;
{
- gint ret;
+ int ret;
if (F_ISSET(mutexp, MUTEX_IGNORE))
return (0);
diff --git a/libdb/mutex/mut_tas.c b/libdb/mutex/mut_tas.c
index 7d1f618..8ad8a4a 100644
--- a/libdb/mutex/mut_tas.c
+++ b/libdb/mutex/mut_tas.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -41,9 +41,9 @@ static const gchar revid[] = "$Id$";
* __db_tas_mutex_init --
* Initialize a DB_MUTEX.
*
- * PUBLIC: gint __db_tas_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
+ * PUBLIC: int __db_tas_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
*/
-gint
+int
__db_tas_mutex_init(dbenv, mutexp, flags)
DB_ENV *dbenv;
DB_MUTEX *mutexp;
@@ -97,15 +97,15 @@ __db_tas_mutex_init(dbenv, mutexp, flags)
* __db_tas_mutex_lock
* Lock on a mutex, logically blocking if necessary.
*
- * PUBLIC: gint __db_tas_mutex_lock __P((DB_ENV *, DB_MUTEX *));
+ * PUBLIC: int __db_tas_mutex_lock __P((DB_ENV *, DB_MUTEX *));
*/
-gint
+int
__db_tas_mutex_lock(dbenv, mutexp)
DB_ENV *dbenv;
DB_MUTEX *mutexp;
{
u_long ms;
- gint nspins;
+ int nspins;
if (F_ISSET(dbenv, DB_ENV_NOLOCKING) || F_ISSET(mutexp, MUTEX_IGNORE))
return (0);
@@ -168,9 +168,9 @@ relock:
* __db_tas_mutex_unlock --
* Release a lock.
*
- * PUBLIC: gint __db_tas_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
+ * PUBLIC: int __db_tas_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
*/
-gint
+int
__db_tas_mutex_unlock(dbenv, mutexp)
DB_ENV *dbenv;
DB_MUTEX *mutexp;
@@ -196,9 +196,9 @@ __db_tas_mutex_unlock(dbenv, mutexp)
* __db_tas_mutex_destroy --
* Destroy a DB_MUTEX.
*
- * PUBLIC: gint __db_tas_mutex_destroy __P((DB_MUTEX *));
+ * PUBLIC: int __db_tas_mutex_destroy __P((DB_MUTEX *));
*/
-gint
+int
__db_tas_mutex_destroy(mutexp)
DB_MUTEX *mutexp;
{
diff --git a/libdb/mutex/mut_win32.c b/libdb/mutex/mut_win32.c
index ba33078..fef57f0 100644
--- a/libdb/mutex/mut_win32.c
+++ b/libdb/mutex/mut_win32.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -28,7 +28,7 @@ static const gchar revid[] = "$Id$";
#undef MUTEX_DIAG
#define GET_HANDLE(mutexp, event) do { \
- gchar idbuf[13]; \
+ char idbuf[13]; \
\
snprintf(idbuf, sizeof idbuf, "db.m%08x", mutexp->id); \
event = CreateEvent(NULL, FALSE, FALSE, idbuf); \
@@ -40,9 +40,9 @@ static const gchar revid[] = "$Id$";
* __db_win32_mutex_init --
* Initialize a DB_MUTEX.
*
- * PUBLIC: gint __db_win32_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
+ * PUBLIC: int __db_win32_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
*/
-gint
+int
__db_win32_mutex_init(dbenv, mutexp, flags)
DB_ENV *dbenv;
DB_MUTEX *mutexp;
@@ -84,15 +84,15 @@ __db_win32_mutex_init(dbenv, mutexp, flags)
* __db_win32_mutex_lock
* Lock on a mutex, logically blocking if necessary.
*
- * PUBLIC: gint __db_win32_mutex_lock __P((DB_ENV *, DB_MUTEX *));
+ * PUBLIC: int __db_win32_mutex_lock __P((DB_ENV *, DB_MUTEX *));
*/
-gint
+int
__db_win32_mutex_lock(dbenv, mutexp)
DB_ENV *dbenv;
DB_MUTEX *mutexp;
{
HANDLE event;
- gint ret, ms, nspins;
+ int ret, ms, nspins;
#ifdef MUTEX_DIAG
LARGE_INTEGER now;
#endif
@@ -163,14 +163,14 @@ loop: /* Attempt to acquire the resource for N spins. */
* __db_win32_mutex_unlock --
* Release a lock.
*
- * PUBLIC: gint __db_win32_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
+ * PUBLIC: int __db_win32_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
*/
-gint
+int
__db_win32_mutex_unlock(dbenv, mutexp)
DB_ENV *dbenv;
DB_MUTEX *mutexp;
{
- gint ret;
+ int ret;
HANDLE event;
#ifdef MUTEX_DIAG
LARGE_INTEGER now;
@@ -217,9 +217,9 @@ __db_win32_mutex_unlock(dbenv, mutexp)
* __db_win32_mutex_destroy --
* Destroy a DB_MUTEX - noop with this implementation.
*
- * PUBLIC: gint __db_win32_mutex_destroy __P((DB_MUTEX *));
+ * PUBLIC: int __db_win32_mutex_destroy __P((DB_MUTEX *));
*/
-gint
+int
__db_win32_mutex_destroy(mutexp)
DB_MUTEX *mutexp;
{
diff --git a/libdb/mutex/mutex.c b/libdb/mutex/mutex.c
index c368eea..97fec83 100644
--- a/libdb/mutex/mutex.c
+++ b/libdb/mutex/mutex.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -27,7 +27,7 @@ static const gchar revid[] = "$Id$";
#include "dbinc/txn.h"
#endif
-static gint __db_mutex_alloc_int __P((DB_ENV *, REGINFO *, DB_MUTEX **));
+static int __db_mutex_alloc_int __P((DB_ENV *, REGINFO *, DB_MUTEX **));
#ifdef HAVE_MUTEX_SYSTEM_RESOURCES
static REGMAINT * __db_mutex_maint __P((DB_ENV *, REGINFO *));
#endif
@@ -37,19 +37,19 @@ static REGMAINT * __db_mutex_maint __P((DB_ENV *, REGINFO *));
* External interface to allocate, and/or initialize, record
* mutexes.
*
- * PUBLIC: gint __db_mutex_setup __P((DB_ENV *, REGINFO *, gpointer , u_int32_t));
+ * PUBLIC: int __db_mutex_setup __P((DB_ENV *, REGINFO *, void *, u_int32_t));
*/
-gint
+int
__db_mutex_setup(dbenv, infop, ptr, flags)
DB_ENV *dbenv;
REGINFO *infop;
- gpointer ptr;
+ void *ptr;
u_int32_t flags;
{
DB_MUTEX *mutex;
REGMAINT *maint;
u_int32_t iflags, offset;
- gint ret;
+ int ret;
ret = 0;
/*
@@ -122,7 +122,7 @@ __db_mutex_alloc_int(dbenv, infop, storep)
REGINFO *infop;
DB_MUTEX **storep;
{
- gint ret;
+ int ret;
/*
* If the architecture supports mutexes in heap memory, use heap memory.
@@ -299,10 +299,10 @@ __db_shreg_locks_destroy(infop, rp)
* __db_shreg_mutex_init --
* Initialize a shared memory mutex.
*
- * PUBLIC: gint __db_shreg_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t,
+ * PUBLIC: int __db_shreg_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t,
* PUBLIC: u_int32_t, REGINFO *, REGMAINT *));
*/
-gint
+int
__db_shreg_mutex_init(dbenv, mutexp, offset, flags, infop, rp)
DB_ENV *dbenv;
DB_MUTEX *mutexp;
@@ -311,7 +311,7 @@ __db_shreg_mutex_init(dbenv, mutexp, offset, flags, infop, rp)
REGINFO *infop;
REGMAINT *rp;
{
- gint ret;
+ int ret;
if ((ret = __db_mutex_init_int(dbenv, mutexp, offset, flags)) != 0)
return (ret);
@@ -344,12 +344,12 @@ __db_shreg_mutex_init(dbenv, mutexp, offset, flags, infop, rp)
* __db_shreg_maintinit --
* Initialize a region's maintenance information.
*
- * PUBLIC: void __db_shreg_maintinit __P((REGINFO *, gpointer addr, size_t));
+ * PUBLIC: void __db_shreg_maintinit __P((REGINFO *, void *addr, size_t));
*/
void
__db_shreg_maintinit(infop, addr, size)
REGINFO *infop;
- gpointer addr;
+ void *addr;
size_t size;
{
REGMAINT *rp;
diff --git a/libdb/mutex/tm.c b/libdb/mutex/tm.c
index 9e4559f..4af1b19 100644
--- a/libdb/mutex/tm.c
+++ b/libdb/mutex/tm.c
@@ -25,8 +25,8 @@ void exec_proc();
void tm_file_init();
void map_file();
void run_proc();
-gpointer run_thread();
-gpointer run_thread_wake();
+void *run_thread();
+void *run_thread_wake();
void tm_mutex_destroy();
void tm_mutex_init();
void tm_mutex_stats();
@@ -47,16 +47,16 @@ int child; /* -s: Slave. */
int nthreads = 1; /* -t: Threads. */
int verbose; /* -v: Verbosity. */
-gint
+int
main(argc, argv)
- gint argc;
- gchar *argv[];
+ int argc;
+ char *argv[];
{
- extern gint optind;
- extern gchar *optarg;
+ extern int optind;
+ extern char *optarg;
pid_t pid;
- gint ch, eval, i, status;
- gchar *tmpath;
+ int ch, eval, i, status;
+ char *tmpath;
tmpath = argv[0];
while ((ch = getopt(argc, argv, "l:n:p:st:v")) != EOF)
@@ -150,9 +150,9 @@ main(argc, argv)
void
exec_proc(tmpath)
- gchar *tmpath;
+ char *tmpath;
{
- gchar *argv[10], **ap, b_l[10], b_n[10], b_t[10];
+ char *argv[10], **ap, b_l[10], b_n[10], b_t[10];
ap = &argv[0];
*ap++ = "tm";
@@ -178,15 +178,15 @@ run_proc()
{
#if defined(HAVE_MUTEX_PTHREADS) || defined(BUILD_PTHREADS_ANYWAY)
pthread_t *kidsp, wakep;
- gint i, status;
- gpointer retp;
+ int i, status;
+ void *retp;
#endif
__os_sleep(&dbenv, 3, 0); /* Let everyone catch up. */
srand((u_int)time(NULL) / getpid()); /* Initialize random numbers. */
if (nthreads == 1) /* Simple case. */
- exit((int)run_thread((gpointer)0));
+ exit((int)run_thread((void *)0));
#if defined(HAVE_MUTEX_PTHREADS) || defined(BUILD_PTHREADS_ANYWAY)
/*
@@ -200,14 +200,14 @@ run_proc()
}
for (i = 0; i < nthreads; i++)
if ((errno = pthread_create(
- &kidsp[i], NULL, run_thread, (gpointer)i)) != 0) {
+ &kidsp[i], NULL, run_thread, (void *)i)) != 0) {
fprintf(stderr, "tm: failed spawning thread %d: %s\n",
i, strerror(errno));
exit(EXIT_FAILURE);
}
if ((errno = pthread_create(
- &wakep, NULL, run_thread_wake, (gpointer)0)) != 0) {
+ &wakep, NULL, run_thread_wake, (void *)0)) != 0) {
fprintf(stderr, "tm: failed spawning wakeup thread: %s\n",
strerror(errno));
exit(EXIT_FAILURE);
@@ -237,13 +237,13 @@ run_proc()
#endif
}
-gpointer
+void *
run_thread(arg)
- gpointer arg;
+ void *arg;
{
DB_MUTEX *gm_addr, *lm_addr, *tm_addr, *mp;
u_long gid1, gid2, *id_addr;
- gint fd, i, lock, id, nl, remap;
+ int fd, i, lock, id, nl, remap;
/* Set local and global per-thread ID. */
id = (int)arg;
@@ -272,14 +272,14 @@ run_thread(arg)
if (__db_mutex_lock(&dbenv, mp)) {
fprintf(stderr,
"%lu/%lx: never got lock\n", gid1, gid2);
- return ((gpointer)EXIT_FAILURE);
+ return ((void *)EXIT_FAILURE);
}
if (id_addr[lock * 2] != 0) {
fprintf(stderr,
"RACE! (%lu/%lx granted lock %d held by %lu/%lx)\n",
gid1, gid2,
lock, id_addr[lock * 2], id_addr[lock * 2 + 1]);
- return ((gpointer)EXIT_FAILURE);
+ return ((void *)EXIT_FAILURE);
}
id_addr[lock * 2] = gid1;
id_addr[lock * 2 + 1] = gid2;
@@ -296,7 +296,7 @@ run_thread(arg)
"RACE! (%lu/%lx stole lock %d from %lu/%lx)\n",
id_addr[lock * 2],
id_addr[lock * 2 + 1], lock, gid1, gid2);
- return ((gpointer)EXIT_FAILURE);
+ return ((void *)EXIT_FAILURE);
}
}
@@ -313,25 +313,25 @@ run_thread(arg)
*/
if (__db_mutex_lock(&dbenv, gm_addr)) {
fprintf(stderr, "%lu/%lx: global lock\n", gid1, gid2);
- return ((gpointer)EXIT_FAILURE);
+ return ((void *)EXIT_FAILURE);
}
mp = (DB_MUTEX *)((u_int8_t *)tm_addr + id * align);
F_SET(mp, MUTEX_WAKEME);
if (__db_mutex_unlock(&dbenv, gm_addr)) {
fprintf(stderr,
"%lu/%lx: per-thread wakeup failed\n", gid1, gid2);
- return ((gpointer)EXIT_FAILURE);
+ return ((void *)EXIT_FAILURE);
}
if (__db_mutex_lock(&dbenv, mp)) {
fprintf(stderr,
"%lu/%lx: per-thread lock\n", gid1, gid2);
- return ((gpointer)EXIT_FAILURE);
+ return ((void *)EXIT_FAILURE);
}
/* Time passes... */
if (F_ISSET(mp, MUTEX_WAKEME)) {
fprintf(stderr, "%lu/%lx: %03d wakeup flag still set\n",
gid1, gid2, id);
- return ((gpointer)EXIT_FAILURE);
+ return ((void *)EXIT_FAILURE);
}
#endif
@@ -340,14 +340,14 @@ run_thread(arg)
mp = (DB_MUTEX *)((u_int8_t *)lm_addr + lock * align);
if (__db_mutex_unlock(&dbenv, mp)) {
fprintf(stderr, "%lu/%lx: wakeup failed\n", gid1, gid2);
- return ((gpointer)EXIT_FAILURE);
+ return ((void *)EXIT_FAILURE);
}
if (--nl % 100 == 0)
fprintf(stderr, "%lu/%lx: %d\n", gid1, gid2, nl);
if (nl == 0 || --remap == 0) {
- unmap_file((gpointer)gm_addr, fd);
+ unmap_file((void *)gm_addr, fd);
gm_addr = NULL;
if (nl == 0)
@@ -365,12 +365,12 @@ run_thread(arg)
* run_thread_wake --
* Thread to wake up other threads that are sleeping.
*/
-gpointer
+void *
run_thread_wake(arg)
- gpointer arg;
+ void *arg;
{
DB_MUTEX *gm_addr, *tm_addr, *mp;
- gint fd, id;
+ int fd, id;
arg = NULL;
map_file(&gm_addr, &tm_addr, NULL, NULL, &fd);
@@ -382,7 +382,7 @@ run_thread_wake(arg)
/* Acquire the global lock. */
retry: if (__db_mutex_lock(&dbenv, gm_addr)) {
fprintf(stderr, "wt: global lock failed\n");
- return ((gpointer)EXIT_FAILURE);
+ return ((void *)EXIT_FAILURE);
}
next: mp = (DB_MUTEX *)((u_int8_t *)tm_addr + id * align);
@@ -390,7 +390,7 @@ next: mp = (DB_MUTEX *)((u_int8_t *)tm_addr + id * align);
F_CLR(mp, MUTEX_WAKEME);
if (__db_mutex_unlock(&dbenv, mp)) {
fprintf(stderr, "wt: wakeup failed\n");
- return ((gpointer)EXIT_FAILURE);
+ return ((void *)EXIT_FAILURE);
}
}
@@ -399,7 +399,7 @@ next: mp = (DB_MUTEX *)((u_int8_t *)tm_addr + id * align);
if (__db_mutex_unlock(&dbenv, gm_addr)) {
fprintf(stderr, "wt: global unlock failed\n");
- return ((gpointer)EXIT_FAILURE);
+ return ((void *)EXIT_FAILURE);
}
__os_sleep(&dbenv, 0, 500);
@@ -418,7 +418,7 @@ next: mp = (DB_MUTEX *)((u_int8_t *)tm_addr + id * align);
void
tm_file_init()
{
- gint fd;
+ int fd;
/* Initialize the backing file. */
@@ -451,7 +451,7 @@ void
tm_mutex_init()
{
DB_MUTEX *gm_addr, *lm_addr, *mp, *tm_addr;
- gint fd, i;
+ int fd, i;
map_file(&gm_addr, &tm_addr, &lm_addr, NULL, &fd);
@@ -487,7 +487,7 @@ tm_mutex_init()
exit(EXIT_FAILURE);
}
- unmap_file((gpointer)gm_addr, fd);
+ unmap_file((void *)gm_addr, fd);
}
/*
@@ -498,7 +498,7 @@ void
tm_mutex_destroy()
{
DB_MUTEX *gm_addr, *lm_addr, *mp, *tm_addr;
- gint fd, i;
+ int fd, i;
map_file(&gm_addr, &tm_addr, &lm_addr, NULL, &fd);
@@ -530,7 +530,7 @@ tm_mutex_destroy()
exit(EXIT_FAILURE);
}
- unmap_file((gpointer)gm_addr, fd);
+ unmap_file((void *)gm_addr, fd);
#ifdef HAVE_QNX
(void)shm_unlink(file);
#endif
@@ -544,7 +544,7 @@ void
tm_mutex_stats()
{
DB_MUTEX *gm_addr, *lm_addr, *mp;
- gint fd, i;
+ int fd, i;
map_file(&gm_addr, NULL, &lm_addr, NULL, &fd);
@@ -554,7 +554,7 @@ tm_mutex_stats()
printf("mutex %2d: wait: %lu; no wait %lu\n", i,
(u_long)mp->mutex_set_wait, (u_long)mp->mutex_set_nowait);
- unmap_file((gpointer)gm_addr, fd);
+ unmap_file((void *)gm_addr, fd);
}
/*
@@ -565,13 +565,13 @@ void
map_file(gm_addrp, tm_addrp, lm_addrp, id_addrp, fdp)
DB_MUTEX **gm_addrp, **tm_addrp, **lm_addrp;
u_long **id_addrp;
- gint *fdp;
+ int *fdp;
{
- gpointer maddr;
- gint fd;
+ void *maddr;
+ int fd;
#ifndef MAP_FAILED
-#define MAP_FAILED (gpointer)-1
+#define MAP_FAILED (void *)-1
#endif
#ifndef MAP_FILE
#define MAP_FILE 0
@@ -613,8 +613,8 @@ map_file(gm_addrp, tm_addrp, lm_addrp, id_addrp, fdp)
*/
void
unmap_file(maddr, fd)
- gpointer maddr;
- gint fd;
+ void *maddr;
+ int fd;
{
if (munmap(maddr, len) != 0) {
fprintf(stderr, "munmap: %s\n", strerror(errno));
diff --git a/libdb/os/os_abs.c b/libdb/os/os_abs.c
index f03480e..538e335 100644
--- a/libdb/os/os_abs.c
+++ b/libdb/os/os_abs.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -21,11 +21,11 @@ static const gchar revid[] = "$Id$";
* __os_abspath --
* Return if a path is an absolute path.
*
- * PUBLIC: gint __os_abspath __P((const gchar *));
+ * PUBLIC: int __os_abspath __P((const char *));
*/
-gint
+int
__os_abspath(path)
- const gchar *path;
+ const char *path;
{
return (path[0] == '/');
}
diff --git a/libdb/os/os_alloc.c b/libdb/os/os_alloc.c
index 61adcaf..388cf9f 100644
--- a/libdb/os/os_alloc.c
+++ b/libdb/os/os_alloc.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -59,15 +59,15 @@ union __db_alloc {
* the allocation function specified to the DB handle, the DB_ENV
* handle, or __os_malloc.
*
- * PUBLIC: gint __os_umalloc __P((DB_ENV *, size_t, gpointer ));
+ * PUBLIC: int __os_umalloc __P((DB_ENV *, size_t, void *));
*/
-gint
+int
__os_umalloc(dbenv, size, storep)
DB_ENV *dbenv;
size_t size;
- gpointer storep;
+ void *storep;
{
- gint ret;
+ int ret;
/* Require an environment handle. */
DB_ASSERT(dbenv != NULL);
@@ -78,10 +78,10 @@ __os_umalloc(dbenv, size, storep)
if (dbenv == NULL || dbenv->db_malloc == NULL) {
if (DB_GLOBAL(j_malloc) != NULL)
- *(gpointer *)storep = DB_GLOBAL(j_malloc)(size);
+ *(void **)storep = DB_GLOBAL(j_malloc)(size);
else
- *(gpointer *)storep = malloc(size);
- if (*(gpointer *)storep == NULL) {
+ *(void **)storep = malloc(size);
+ if (*(void **)storep == NULL) {
/*
* Correct error return, see __os_malloc.
*/
@@ -96,7 +96,7 @@ __os_umalloc(dbenv, size, storep)
return (0);
}
- if ((*(gpointer *)storep = dbenv->db_malloc(size)) == NULL) {
+ if ((*(void **)storep = dbenv->db_malloc(size)) == NULL) {
__db_err(dbenv, "User-specified malloc function returned NULL");
return (ENOMEM);
}
@@ -108,18 +108,18 @@ __os_umalloc(dbenv, size, storep)
* __os_urealloc --
* realloc(3) counterpart to __os_umalloc.
*
- * PUBLIC: gint __os_urealloc __P((DB_ENV *, size_t, gpointer ));
+ * PUBLIC: int __os_urealloc __P((DB_ENV *, size_t, void *));
*/
-gint
+int
__os_urealloc(dbenv, size, storep)
DB_ENV *dbenv;
size_t size;
- gpointer storep;
+ void *storep;
{
- gint ret;
- gpointer ptr;
+ int ret;
+ void *ptr;
- ptr = *(gpointer *)storep;
+ ptr = *(void **)storep;
/* Require an environment handle. */
DB_ASSERT(dbenv != NULL);
@@ -133,10 +133,10 @@ __os_urealloc(dbenv, size, storep)
return (__os_umalloc(dbenv, size, storep));
if (DB_GLOBAL(j_realloc) != NULL)
- *(gpointer *)storep = DB_GLOBAL(j_realloc)(ptr, size);
+ *(void **)storep = DB_GLOBAL(j_realloc)(ptr, size);
else
- *(gpointer *)storep = realloc(ptr, size);
- if (*(gpointer *)storep == NULL) {
+ *(void **)storep = realloc(ptr, size);
+ if (*(void **)storep == NULL) {
/*
* Correct errno, see __os_realloc.
*/
@@ -151,7 +151,7 @@ __os_urealloc(dbenv, size, storep)
return (0);
}
- if ((*(gpointer *)storep = dbenv->db_realloc(ptr, size)) == NULL) {
+ if ((*(void **)storep = dbenv->db_realloc(ptr, size)) == NULL) {
__db_err(dbenv,
"User-specified realloc function returned NULL");
return (ENOMEM);
@@ -164,12 +164,12 @@ __os_urealloc(dbenv, size, storep)
* __os_ufree --
* free(3) counterpart to __os_umalloc.
*
- * PUBLIC: gint __os_ufree __P((DB_ENV *, gpointer ));
+ * PUBLIC: int __os_ufree __P((DB_ENV *, void *));
*/
-gint
+int
__os_ufree(dbenv, ptr)
DB_ENV *dbenv;
- gpointer ptr;
+ void *ptr;
{
/* Require an environment handle. */
DB_ASSERT(dbenv != NULL);
@@ -188,19 +188,19 @@ __os_ufree(dbenv, ptr)
* __os_strdup --
* The strdup(3) function for DB.
*
- * PUBLIC: gint __os_strdup __P((DB_ENV *, const gchar *, gpointer ));
+ * PUBLIC: int __os_strdup __P((DB_ENV *, const char *, void *));
*/
-gint
+int
__os_strdup(dbenv, str, storep)
DB_ENV *dbenv;
- const gchar *str;
- gpointer storep;
+ const char *str;
+ void *storep;
{
size_t size;
- gint ret;
- gpointer p;
+ int ret;
+ void *p;
- *(gpointer *)storep = NULL;
+ *(void **)storep = NULL;
size = strlen(str) + 1;
if ((ret = __os_malloc(dbenv, size, &p)) != 0)
@@ -208,7 +208,7 @@ __os_strdup(dbenv, str, storep)
memcpy(p, str, size);
- *(gpointer *)storep = p;
+ *(void **)storep = p;
return (0);
}
@@ -216,16 +216,16 @@ __os_strdup(dbenv, str, storep)
* __os_calloc --
* The calloc(3) function for DB.
*
- * PUBLIC: gint __os_calloc __P((DB_ENV *, size_t, size_t, gpointer ));
+ * PUBLIC: int __os_calloc __P((DB_ENV *, size_t, size_t, void *));
*/
-gint
+int
__os_calloc(dbenv, num, size, storep)
DB_ENV *dbenv;
size_t num, size;
- gpointer storep;
+ void *storep;
{
- gpointer p;
- gint ret;
+ void *p;
+ int ret;
size *= num;
if ((ret = __os_malloc(dbenv, size, &p)) != 0)
@@ -233,7 +233,7 @@ __os_calloc(dbenv, num, size, storep)
memset(p, 0, size);
- *(gpointer *)storep = p;
+ *(void **)storep = p;
return (0);
}
@@ -241,18 +241,18 @@ __os_calloc(dbenv, num, size, storep)
* __os_malloc --
* The malloc(3) function for DB.
*
- * PUBLIC: gint __os_malloc __P((DB_ENV *, size_t, gpointer ));
+ * PUBLIC: int __os_malloc __P((DB_ENV *, size_t, void *));
*/
-gint
+int
__os_malloc(dbenv, size, storep)
DB_ENV *dbenv;
size_t size;
- gpointer storep;
+ void *storep;
{
- gint ret;
- gpointer p;
+ int ret;
+ void *p;
- *(gpointer *)storep = NULL;
+ *(void **)storep = NULL;
/* Never allocate 0 bytes -- some C libraries don't like it. */
if (size == 0)
@@ -294,7 +294,7 @@ __os_malloc(dbenv, size, storep)
((union __db_alloc *)p)->size = size;
p = &((union __db_alloc *)p)[1];
#endif
- *(gpointer *)storep = p;
+ *(void **)storep = p;
return (0);
}
@@ -303,18 +303,18 @@ __os_malloc(dbenv, size, storep)
* __os_realloc --
* The realloc(3) function for DB.
*
- * PUBLIC: gint __os_realloc __P((DB_ENV *, size_t, gpointer ));
+ * PUBLIC: int __os_realloc __P((DB_ENV *, size_t, void *));
*/
-gint
+int
__os_realloc(dbenv, size, storep)
DB_ENV *dbenv;
size_t size;
- gpointer storep;
+ void *storep;
{
- gint ret;
- gpointer p, *ptr;
+ int ret;
+ void *p, *ptr;
- ptr = *(gpointer *)storep;
+ ptr = *(void **)storep;
/* Never allocate 0 bytes -- some C libraries don't like it. */
if (size == 0)
@@ -362,7 +362,7 @@ __os_realloc(dbenv, size, storep)
p = &((union __db_alloc *)p)[1];
#endif
- *(gpointer *)storep = p;
+ *(void **)storep = p;
return (0);
}
@@ -371,15 +371,15 @@ __os_realloc(dbenv, size, storep)
* __os_free --
* The free(3) function for DB.
*
- * PUBLIC: void __os_free __P((DB_ENV *, gpointer ));
+ * PUBLIC: void __os_free __P((DB_ENV *, void *));
*/
void
__os_free(dbenv, ptr)
DB_ENV *dbenv;
- gpointer ptr;
+ void *ptr;
{
#ifdef DIAGNOSTIC
- gint size;
+ int size;
/*
* Check that the guard byte (one past the end of the memory) is
* still CLEAR_BYTE.
@@ -428,11 +428,11 @@ __os_guard(dbenv)
* we want to look at it. Unfortunately, if you have code like:
*
* struct a {
- * gint x;
+ * int x;
* } *p;
*
- * gpointer func_argument;
- * gint local;
+ * void *func_argument;
+ * int local;
*
* p = (struct a *)func_argument;
* memcpy(&local, p->x, sizeof(local));
@@ -446,13 +446,13 @@ __os_guard(dbenv)
* of the time, but we've seen examples where it wasn't sufficient
* and there's nothing in ANSI C that requires that work.
*
- * PUBLIC: gpointer __ua_memcpy __P((gpointer , gconstpointer , size_t));
+ * PUBLIC: void *__ua_memcpy __P((void *, const void *, size_t));
*/
-gpointer
+void *
__ua_memcpy(dst, src, len)
- gpointer dst;
- gconstpointer src;
+ void *dst;
+ const void *src;
size_t len;
{
- return ((gpointer)memcpy(dst, src, len));
+ return ((void *)memcpy(dst, src, len));
}
diff --git a/libdb/os/os_clock.c b/libdb/os/os_clock.c
index 791feae..6dc5700 100644
--- a/libdb/os/os_clock.c
+++ b/libdb/os/os_clock.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -34,16 +34,16 @@ static const gchar revid[] = "$Id$";
* __os_clock --
* Return the current time-of-day clock in seconds and microseconds.
*
- * PUBLIC: gint __os_clock __P((DB_ENV *, u_int32_t *, u_int32_t *));
+ * PUBLIC: int __os_clock __P((DB_ENV *, u_int32_t *, u_int32_t *));
*/
-gint
+int
__os_clock(dbenv, secsp, usecsp)
DB_ENV *dbenv;
u_int32_t *secsp, *usecsp; /* Seconds and microseconds. */
{
#if defined(HAVE_GETTIMEOFDAY)
struct timeval tp;
- gint ret;
+ int ret;
retry: if (gettimeofday(&tp, NULL) != 0) {
if ((ret = __os_get_errno()) == EINTR)
@@ -59,7 +59,7 @@ retry: if (gettimeofday(&tp, NULL) != 0) {
#endif
#if !defined(HAVE_GETTIMEOFDAY) && defined(HAVE_CLOCK_GETTIME)
struct timespec tp;
- gint ret;
+ int ret;
retry: if (clock_gettime(CLOCK_REALTIME, &tp) != 0) {
if ((ret = __os_get_errno()) == EINTR)
@@ -75,7 +75,7 @@ retry: if (clock_gettime(CLOCK_REALTIME, &tp) != 0) {
#endif
#if !defined(HAVE_GETTIMEOFDAY) && !defined(HAVE_CLOCK_GETTIME)
time_t now;
- gint ret;
+ int ret;
if (time(&now) == (time_t)-1) {
ret = __os_get_errno();
diff --git a/libdb/os/os_config.c b/libdb/os/os_config.c
index 58f2c06..bf791e3 100644
--- a/libdb/os/os_config.c
+++ b/libdb/os/os_config.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -21,9 +21,9 @@ static const gchar revid[] = "$Id$";
* __os_fs_notzero --
* Return 1 if allocated filesystem blocks are not zeroed.
*
- * PUBLIC: gint __os_fs_notzero __P((void));
+ * PUBLIC: int __os_fs_notzero __P((void));
*/
-gint
+int
__os_fs_notzero()
{
/* Most filesystems zero out implicitly created pages. */
diff --git a/libdb/os/os_dir.c b/libdb/os/os_dir.c
index f7863a1..aed7add 100644
--- a/libdb/os/os_dir.c
+++ b/libdb/os/os_dir.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -39,25 +39,25 @@ static const gchar revid[] = "$Id$";
* __os_dirlist --
* Return a list of the files in a directory.
*
- * PUBLIC: gint __os_dirlist __P((DB_ENV *, const gchar *, gchar ***, gint *));
+ * PUBLIC: int __os_dirlist __P((DB_ENV *, const char *, char ***, int *));
*/
-gint
+int
__os_dirlist(dbenv, dir, namesp, cntp)
DB_ENV *dbenv;
- const gchar *dir;
- gchar ***namesp;
- gint *cntp;
+ const char *dir;
+ char ***namesp;
+ int *cntp;
{
struct dirent *dp;
DIR *dirp;
- gint arraysz, cnt, ret;
- gchar **names;
+ int arraysz, cnt, ret;
+ char **names;
if (DB_GLOBAL(j_dirlist) != NULL)
return (DB_GLOBAL(j_dirlist)(dir, namesp, cntp));
#ifdef HAVE_VXWORKS
- if ((dirp = opendir((gchar *)dir)) == NULL)
+ if ((dirp = opendir((char *)dir)) == NULL)
#else
if ((dirp = opendir(dir)) == NULL)
#endif
@@ -90,13 +90,13 @@ nomem: if (names != NULL)
* __os_dirfree --
* Free the list of files.
*
- * PUBLIC: void __os_dirfree __P((DB_ENV *, gchar **, int));
+ * PUBLIC: void __os_dirfree __P((DB_ENV *, char **, int));
*/
void
__os_dirfree(dbenv, names, cnt)
DB_ENV *dbenv;
- gchar **names;
- gint cnt;
+ char **names;
+ int cnt;
{
if (DB_GLOBAL(j_dirfree) != NULL)
DB_GLOBAL(j_dirfree)(names, cnt);
diff --git a/libdb/os/os_errno.c b/libdb/os/os_errno.c
index ed9787a..ad7c8dd 100644
--- a/libdb/os/os_errno.c
+++ b/libdb/os/os_errno.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include "db_int.h"
@@ -17,9 +17,9 @@ static const gchar revid[] = "$Id$";
* __os_get_errno_ret_zero --
* Return the value of errno, even if it's zero.
*
- * PUBLIC: gint __os_get_errno_ret_zero __P((void));
+ * PUBLIC: int __os_get_errno_ret_zero __P((void));
*/
-gint
+int
__os_get_errno_ret_zero()
{
/* This routine must be able to return the same value repeatedly. */
@@ -30,9 +30,9 @@ __os_get_errno_ret_zero()
* __os_get_errno --
* Return the value of errno, or EAGAIN if errno is zero.
*
- * PUBLIC: gint __os_get_errno __P((void));
+ * PUBLIC: int __os_get_errno __P((void));
*/
-gint
+int
__os_get_errno()
{
/*
@@ -58,7 +58,7 @@ __os_get_errno()
*/
void
__os_set_errno(evalue)
- gint evalue;
+ int evalue;
{
errno = evalue;
}
diff --git a/libdb/os/os_fid.c b/libdb/os/os_fid.c
index 11b2ccc..bd2ffc7 100644
--- a/libdb/os/os_fid.c
+++ b/libdb/os/os_fid.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -45,18 +45,18 @@ static u_int32_t fid_serial = SERIAL_INIT;
* temporary files, the inode and device fields are left blank and
* the extra four bytes are filled in with a random value.
*
- * PUBLIC: gint __os_fileid __P((DB_ENV *, const gchar *, int, u_int8_t *));
+ * PUBLIC: int __os_fileid __P((DB_ENV *, const char *, int, u_int8_t *));
*/
-gint
+int
__os_fileid(dbenv, fname, unique_okay, fidp)
DB_ENV *dbenv;
- const gchar *fname;
- gint unique_okay;
+ const char *fname;
+ int unique_okay;
u_int8_t *fidp;
{
struct stat sb;
size_t i;
- gint ret;
+ int ret;
u_int32_t tmp;
u_int8_t *p;
@@ -66,7 +66,7 @@ __os_fileid(dbenv, fname, unique_okay, fidp)
/* On POSIX/UNIX, use a dev/inode pair. */
retry:
#ifdef HAVE_VXWORKS
- if (stat((gchar *)fname, &sb) != 0) {
+ if (stat((char *)fname, &sb) != 0) {
#else
if (stat(fname, &sb) != 0) {
#endif
diff --git a/libdb/os/os_fsync.c b/libdb/os/os_fsync.c
index 1f2db36..4bcb4f6 100644
--- a/libdb/os/os_fsync.c
+++ b/libdb/os/os_fsync.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -26,11 +26,11 @@ static const gchar revid[] = "$Id$";
#define fsync(fd) __vx_fsync(fd);
-gint
+int
__vx_fsync(fd)
- gint fd;
+ int fd;
{
- gint ret;
+ int ret;
/*
* The results of ioctl are driver dependent. Some will return the
@@ -46,11 +46,11 @@ __vx_fsync(fd)
#ifdef __hp3000s900
#define fsync(fd) __mpe_fsync(fd);
-gint
+int
__mpe_fsync(fd)
- gint fd;
+ int fd;
{
- extern FCONTROL(short, short, gpointer );
+ extern FCONTROL(short, short, void *);
FCONTROL(_MPE_FILENO(fd), 2, NULL); /* Flush the buffers */
FCONTROL(_MPE_FILENO(fd), 6, NULL); /* Write the EOF */
@@ -62,14 +62,14 @@ __mpe_fsync(fd)
* __os_fsync --
* Flush a file descriptor.
*
- * PUBLIC: gint __os_fsync __P((DB_ENV *, DB_FH *));
+ * PUBLIC: int __os_fsync __P((DB_ENV *, DB_FH *));
*/
-gint
+int
__os_fsync(dbenv, fhp)
DB_ENV *dbenv;
DB_FH *fhp;
{
- gint ret;
+ int ret;
/*
* Do nothing if the file descriptor has been marked as not requiring
diff --git a/libdb/os/os_handle.c b/libdb/os/os_handle.c
index 8d74809..5341f65 100644
--- a/libdb/os/os_handle.c
+++ b/libdb/os/os_handle.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,18 +25,18 @@ static const gchar revid[] = "$Id$";
* __os_openhandle --
* Open a file, using POSIX 1003.1 open flags.
*
- * PUBLIC: gint __os_openhandle __P((DB_ENV *, const gchar *, int, int, DB_FH *));
+ * PUBLIC: int __os_openhandle __P((DB_ENV *, const char *, int, int, DB_FH *));
*/
-gint
+int
__os_openhandle(dbenv, name, flags, mode, fhp)
DB_ENV *dbenv;
- const gchar *name;
- gint flags, mode;
+ const char *name;
+ int flags, mode;
DB_FH *fhp;
{
- gint ret, nrepeat;
+ int ret, nrepeat;
#ifdef HAVE_VXWORKS
- gint newflags;
+ int newflags;
#endif
memset(fhp, 0, sizeof(*fhp));
@@ -151,14 +151,14 @@ __os_openhandle(dbenv, name, flags, mode, fhp)
* __os_closehandle --
* Close a file.
*
- * PUBLIC: gint __os_closehandle __P((DB_ENV *, DB_FH *));
+ * PUBLIC: int __os_closehandle __P((DB_ENV *, DB_FH *));
*/
-gint
+int
__os_closehandle(dbenv, fhp)
DB_ENV *dbenv;
DB_FH *fhp;
{
- gint ret;
+ int ret;
/* Don't close file descriptors that were never opened. */
DB_ASSERT(F_ISSET(fhp, DB_FH_VALID) && fhp->fd != -1);
diff --git a/libdb/os/os_id.c b/libdb/os/os_id.c
index dd3e5e6..78221d9 100644
--- a/libdb/os/os_id.c
+++ b/libdb/os/os_id.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
diff --git a/libdb/os/os_map.c b/libdb/os/os_map.c
index 7e1ffeb..ed3da9d 100644
--- a/libdb/os/os_map.c
+++ b/libdb/os/os_map.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -28,19 +28,19 @@ static const gchar revid[] = "$Id$";
#include "db_int.h"
#ifdef HAVE_MMAP
-static gint __os_map __P((DB_ENV *, gchar *, DB_FH *, size_t, int, int, gpointer *));
+static int __os_map __P((DB_ENV *, char *, DB_FH *, size_t, int, int, void **));
#endif
#ifndef HAVE_SHMGET
-static gint __db_nosystemmem __P((DB_ENV *));
+static int __db_nosystemmem __P((DB_ENV *));
#endif
/*
* __os_r_sysattach --
* Create/join a shared memory region.
*
- * PUBLIC: gint __os_r_sysattach __P((DB_ENV *, REGINFO *, REGION *));
+ * PUBLIC: int __os_r_sysattach __P((DB_ENV *, REGINFO *, REGION *));
*/
-gint
+int
__os_r_sysattach(dbenv, infop, rp)
DB_ENV *dbenv;
REGINFO *infop;
@@ -65,7 +65,7 @@ __os_r_sysattach(dbenv, infop, rp)
#if defined(HAVE_SHMGET)
{
key_t segid;
- gint id, ret;
+ int id, ret;
/*
* We could potentially create based on REGION_CREATE_OK, but
@@ -118,7 +118,7 @@ __os_r_sysattach(dbenv, infop, rp)
} else
id = rp->segid;
- if ((infop->addr = shmat(id, NULL, 0)) == (gpointer)-1) {
+ if ((infop->addr = shmat(id, NULL, 0)) == (void *)-1) {
infop->addr = NULL;
ret = __os_get_errno();
__db_err(dbenv,
@@ -137,7 +137,7 @@ __os_r_sysattach(dbenv, infop, rp)
#ifdef HAVE_MMAP
{
DB_FH fh;
- gint ret;
+ int ret;
/*
* Try to open/create the shared region file. We DO NOT need to ensure
@@ -185,13 +185,13 @@ __os_r_sysattach(dbenv, infop, rp)
* __os_r_sysdetach --
* Detach from a shared memory region.
*
- * PUBLIC: gint __os_r_sysdetach __P((DB_ENV *, REGINFO *, int));
+ * PUBLIC: int __os_r_sysdetach __P((DB_ENV *, REGINFO *, int));
*/
-gint
+int
__os_r_sysdetach(dbenv, infop, destroy)
DB_ENV *dbenv;
REGINFO *infop;
- gint destroy;
+ int destroy;
{
REGION *rp;
@@ -199,7 +199,7 @@ __os_r_sysdetach(dbenv, infop, destroy)
if (F_ISSET(dbenv, DB_ENV_SYSTEM_MEM)) {
#ifdef HAVE_SHMGET
- gint ret, segid;
+ int ret, segid;
/*
* We may be about to remove the memory referenced by rp,
@@ -235,7 +235,7 @@ __os_r_sysdetach(dbenv, infop, destroy)
(void)munlock(infop->addr, rp->size);
#endif
if (munmap(infop->addr, rp->size) != 0) {
- gint ret;
+ int ret;
ret = __os_get_errno();
__db_err(dbenv, "munmap: %s", strerror(ret));
@@ -256,17 +256,17 @@ __os_r_sysdetach(dbenv, infop, destroy)
* __os_mapfile --
* Map in a shared memory file.
*
- * PUBLIC: gint __os_mapfile __P((DB_ENV *,
- * PUBLIC: gchar *, DB_FH *, size_t, int, gpointer *));
+ * PUBLIC: int __os_mapfile __P((DB_ENV *,
+ * PUBLIC: char *, DB_FH *, size_t, int, void **));
*/
-gint
+int
__os_mapfile(dbenv, path, fhp, len, is_rdonly, addrp)
DB_ENV *dbenv;
- gchar *path;
+ char *path;
DB_FH *fhp;
- gint is_rdonly;
+ int is_rdonly;
size_t len;
- gpointer *addrp;
+ void **addrp;
{
#if defined(HAVE_MMAP) && !defined(HAVE_QNX)
return (__os_map(dbenv, path, fhp, len, 0, is_rdonly, addrp));
@@ -285,12 +285,12 @@ __os_mapfile(dbenv, path, fhp, len, is_rdonly, addrp)
* __os_unmapfile --
* Unmap the shared memory file.
*
- * PUBLIC: gint __os_unmapfile __P((DB_ENV *, gpointer , size_t));
+ * PUBLIC: int __os_unmapfile __P((DB_ENV *, void *, size_t));
*/
-gint
+int
__os_unmapfile(dbenv, addr, len)
DB_ENV *dbenv;
- gpointer addr;
+ void *addr;
size_t len;
{
/* If the user replaced the map call, call through their interface. */
@@ -306,7 +306,7 @@ __os_unmapfile(dbenv, addr, len)
COMPQUIET(dbenv, NULL);
#endif
{
- gint ret;
+ int ret;
while ((ret = munmap(addr, len)) != 0 &&
__os_get_errno() == EINTR)
@@ -328,14 +328,14 @@ __os_unmapfile(dbenv, addr, len)
static int
__os_map(dbenv, path, fhp, len, is_region, is_rdonly, addrp)
DB_ENV *dbenv;
- gchar *path;
+ char *path;
DB_FH *fhp;
- gint is_region, is_rdonly;
+ int is_region, is_rdonly;
size_t len;
- gpointer *addrp;
+ void **addrp;
{
- gpointer p;
- gint flags, prot, ret;
+ void *p;
+ int flags, prot, ret;
/* If the user replaced the map call, call through their interface. */
if (DB_GLOBAL(j_map) != NULL)
@@ -396,7 +396,7 @@ __os_map(dbenv, path, fhp, len, is_region, is_rdonly, addrp)
#define MAP_FAILED -1
#endif
if ((p = mmap(NULL,
- len, prot, flags, fhp->fd, (off_t)0)) == (gpointer)MAP_FAILED) {
+ len, prot, flags, fhp->fd, (off_t)0)) == (void *)MAP_FAILED) {
ret = __os_get_errno();
__db_err(dbenv, "mmap: %s", strerror(ret));
return (ret);
diff --git a/libdb/os/os_method.c b/libdb/os/os_method.c
index 0aaac80..2db73f6 100644
--- a/libdb/os/os_method.c
+++ b/libdb/os/os_method.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -18,216 +18,216 @@ static const gchar revid[] = "$Id$";
#include "db_int.h"
/*
- * EXTERN: gint db_env_set_func_close __P((gint (*)(int)));
+ * EXTERN: int db_env_set_func_close __P((int (*)(int)));
*/
-gint
+int
db_env_set_func_close(func_close)
- gint (*func_close) __P((int));
+ int (*func_close) __P((int));
{
DB_GLOBAL(j_close) = func_close;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_dirfree __P((void (*)(gchar **, int)));
+ * EXTERN: int db_env_set_func_dirfree __P((void (*)(char **, int)));
*/
-gint
+int
db_env_set_func_dirfree(func_dirfree)
- void (*func_dirfree) __P((gchar **, int));
+ void (*func_dirfree) __P((char **, int));
{
DB_GLOBAL(j_dirfree) = func_dirfree;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_dirlist
- * EXTERN: __P((gint (*)(const gchar *, gchar ***, gint *)));
+ * EXTERN: int db_env_set_func_dirlist
+ * EXTERN: __P((int (*)(const char *, char ***, int *)));
*/
-gint
+int
db_env_set_func_dirlist(func_dirlist)
- gint (*func_dirlist) __P((const gchar *, gchar ***, gint *));
+ int (*func_dirlist) __P((const char *, char ***, int *));
{
DB_GLOBAL(j_dirlist) = func_dirlist;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_exists __P((gint (*)(const gchar *, gint *)));
+ * EXTERN: int db_env_set_func_exists __P((int (*)(const char *, int *)));
*/
-gint
+int
db_env_set_func_exists(func_exists)
- gint (*func_exists) __P((const gchar *, gint *));
+ int (*func_exists) __P((const char *, int *));
{
DB_GLOBAL(j_exists) = func_exists;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_free __P((void (*)(gpointer)));
+ * EXTERN: int db_env_set_func_free __P((void (*)(void *)));
*/
-gint
+int
db_env_set_func_free(func_free)
- void (*func_free) __P((gpointer));
+ void (*func_free) __P((void *));
{
DB_GLOBAL(j_free) = func_free;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_fsync __P((gint (*)(int)));
+ * EXTERN: int db_env_set_func_fsync __P((int (*)(int)));
*/
-gint
+int
db_env_set_func_fsync(func_fsync)
- gint (*func_fsync) __P((int));
+ int (*func_fsync) __P((int));
{
DB_GLOBAL(j_fsync) = func_fsync;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_ioinfo __P((gint (*)(const gchar *,
+ * EXTERN: int db_env_set_func_ioinfo __P((int (*)(const char *,
* EXTERN: int, u_int32_t *, u_int32_t *, u_int32_t *)));
*/
-gint
+int
db_env_set_func_ioinfo(func_ioinfo)
- gint (*func_ioinfo)
- __P((const gchar *, int, u_int32_t *, u_int32_t *, u_int32_t *));
+ int (*func_ioinfo)
+ __P((const char *, int, u_int32_t *, u_int32_t *, u_int32_t *));
{
DB_GLOBAL(j_ioinfo) = func_ioinfo;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_malloc __P((gpointer (*)(size_t)));
+ * EXTERN: int db_env_set_func_malloc __P((void *(*)(size_t)));
*/
-gint
+int
db_env_set_func_malloc(func_malloc)
- gpointer (*func_malloc) __P((size_t));
+ void *(*func_malloc) __P((size_t));
{
DB_GLOBAL(j_malloc) = func_malloc;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_map
- * EXTERN: __P((gint (*)(gchar *, size_t, int, int, gpointer *)));
+ * EXTERN: int db_env_set_func_map
+ * EXTERN: __P((int (*)(char *, size_t, int, int, void **)));
*/
-gint
+int
db_env_set_func_map(func_map)
- gint (*func_map) __P((gchar *, size_t, int, int, gpointer *));
+ int (*func_map) __P((char *, size_t, int, int, void **));
{
DB_GLOBAL(j_map) = func_map;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_open __P((gint (*)(const gchar *, int, ...)));
+ * EXTERN: int db_env_set_func_open __P((int (*)(const char *, int, ...)));
*/
-gint
+int
db_env_set_func_open(func_open)
- gint (*func_open) __P((const gchar *, int, ...));
+ int (*func_open) __P((const char *, int, ...));
{
DB_GLOBAL(j_open) = func_open;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_read __P((ssize_t (*)(int, gpointer , size_t)));
+ * EXTERN: int db_env_set_func_read __P((ssize_t (*)(int, void *, size_t)));
*/
-gint
+int
db_env_set_func_read(func_read)
- ssize_t (*func_read) __P((int, gpointer , size_t));
+ ssize_t (*func_read) __P((int, void *, size_t));
{
DB_GLOBAL(j_read) = func_read;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_realloc __P((gpointer (*)(gpointer , size_t)));
+ * EXTERN: int db_env_set_func_realloc __P((void *(*)(void *, size_t)));
*/
-gint
+int
db_env_set_func_realloc(func_realloc)
- gpointer (*func_realloc) __P((gpointer , size_t));
+ void *(*func_realloc) __P((void *, size_t));
{
DB_GLOBAL(j_realloc) = func_realloc;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_rename
- * EXTERN: __P((gint (*)(const gchar *, const gchar *)));
+ * EXTERN: int db_env_set_func_rename
+ * EXTERN: __P((int (*)(const char *, const char *)));
*/
-gint
+int
db_env_set_func_rename(func_rename)
- gint (*func_rename) __P((const gchar *, const gchar *));
+ int (*func_rename) __P((const char *, const char *));
{
DB_GLOBAL(j_rename) = func_rename;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_seek
- * EXTERN: __P((gint (*)(int, size_t, db_pgno_t, u_int32_t, int, int)));
+ * EXTERN: int db_env_set_func_seek
+ * EXTERN: __P((int (*)(int, size_t, db_pgno_t, u_int32_t, int, int)));
*/
-gint
+int
db_env_set_func_seek(func_seek)
- gint (*func_seek) __P((int, size_t, db_pgno_t, u_int32_t, int, int));
+ int (*func_seek) __P((int, size_t, db_pgno_t, u_int32_t, int, int));
{
DB_GLOBAL(j_seek) = func_seek;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_sleep __P((gint (*)(u_long, u_long)));
+ * EXTERN: int db_env_set_func_sleep __P((int (*)(u_long, u_long)));
*/
-gint
+int
db_env_set_func_sleep(func_sleep)
- gint (*func_sleep) __P((u_long, u_long));
+ int (*func_sleep) __P((u_long, u_long));
{
DB_GLOBAL(j_sleep) = func_sleep;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_unlink __P((gint (*)(const gchar *)));
+ * EXTERN: int db_env_set_func_unlink __P((int (*)(const char *)));
*/
-gint
+int
db_env_set_func_unlink(func_unlink)
- gint (*func_unlink) __P((const gchar *));
+ int (*func_unlink) __P((const char *));
{
DB_GLOBAL(j_unlink) = func_unlink;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_unmap __P((gint (*)(gpointer , size_t)));
+ * EXTERN: int db_env_set_func_unmap __P((int (*)(void *, size_t)));
*/
-gint
+int
db_env_set_func_unmap(func_unmap)
- gint (*func_unmap) __P((gpointer , size_t));
+ int (*func_unmap) __P((void *, size_t));
{
DB_GLOBAL(j_unmap) = func_unmap;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_write
- * EXTERN: __P((ssize_t (*)(int, gconstpointer , size_t)));
+ * EXTERN: int db_env_set_func_write
+ * EXTERN: __P((ssize_t (*)(int, const void *, size_t)));
*/
-gint
+int
db_env_set_func_write(func_write)
- ssize_t (*func_write) __P((int, gconstpointer , size_t));
+ ssize_t (*func_write) __P((int, const void *, size_t));
{
DB_GLOBAL(j_write) = func_write;
return (0);
}
/*
- * EXTERN: gint db_env_set_func_yield __P((gint (*)(void)));
+ * EXTERN: int db_env_set_func_yield __P((int (*)(void)));
*/
-gint
+int
db_env_set_func_yield(func_yield)
- gint (*func_yield) __P((void));
+ int (*func_yield) __P((void));
{
DB_GLOBAL(j_yield) = func_yield;
return (0);
diff --git a/libdb/os/os_oflags.c b/libdb/os/os_oflags.c
index 2fdfd72..b5c68c1 100644
--- a/libdb/os/os_oflags.c
+++ b/libdb/os/os_oflags.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -28,7 +28,7 @@ static const gchar revid[] = "$Id$";
*/
u_int32_t
__db_oflags(oflags)
- gint oflags;
+ int oflags;
{
u_int32_t dbflags;
@@ -64,13 +64,13 @@ __db_oflags(oflags)
* __db_omode --
* Convert a permission string to the correct open(2) flags.
*
- * PUBLIC: gint __db_omode __P((const gchar *));
+ * PUBLIC: int __db_omode __P((const char *));
*/
-gint
+int
__db_omode(perm)
- const gchar *perm;
+ const char *perm;
{
- gint mode;
+ int mode;
#ifdef DB_WIN32
#ifndef S_IRUSR
diff --git a/libdb/os/os_open.c b/libdb/os/os_open.c
index 60157ce..08749eb 100644
--- a/libdb/os/os_open.c
+++ b/libdb/os/os_open.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -21,24 +21,24 @@ static const gchar revid[] = "$Id$";
#include "db_int.h"
#ifdef HAVE_QNX
-static gint __os_region_open __P((DB_ENV *, const gchar *, int, int, DB_FH *));
+static int __os_region_open __P((DB_ENV *, const char *, int, int, DB_FH *));
#endif
/*
* __os_open --
* Open a file.
*
- * PUBLIC: gint __os_open __P((DB_ENV *, const gchar *, u_int32_t, int, DB_FH *));
+ * PUBLIC: int __os_open __P((DB_ENV *, const char *, u_int32_t, int, DB_FH *));
*/
-gint
+int
__os_open(dbenv, name, flags, mode, fhp)
DB_ENV *dbenv;
- const gchar *name;
+ const char *name;
u_int32_t flags;
- gint mode;
+ int mode;
DB_FH *fhp;
{
- gint oflags, ret;
+ int oflags, ret;
oflags = 0;
@@ -145,13 +145,13 @@ __os_open(dbenv, name, flags, mode, fhp)
static int
__os_region_open(dbenv, name, oflags, mode, fhp)
DB_ENV *dbenv;
- const gchar *name;
- gint oflags;
- gint mode;
+ const char *name;
+ int oflags;
+ int mode;
DB_FH *fhp;
{
- gint ret;
- gchar *newname;
+ int ret;
+ char *newname;
if ((ret = __os_shmname(dbenv, name, &newname)) != 0)
goto err;
@@ -185,18 +185,18 @@ err:
* Translate a pathname into a shm_open memory object name.
*
* PUBLIC: #ifdef HAVE_QNX
- * PUBLIC: gint __os_shmname __P((DB_ENV *, const gchar *, gchar **));
+ * PUBLIC: int __os_shmname __P((DB_ENV *, const char *, char **));
* PUBLIC: #endif
*/
-gint
+int
__os_shmname(dbenv, name, newnamep)
DB_ENV *dbenv;
- const gchar *name;
- gchar **newnamep;
+ const char *name;
+ char **newnamep;
{
- gint ret;
+ int ret;
size_t size;
- gchar *p, *q, *tmpname;
+ char *p, *q, *tmpname;
*newnamep = NULL;
diff --git a/libdb/os/os_region.c b/libdb/os/os_region.c
index e803db0..d810e8a 100644
--- a/libdb/os/os_region.c
+++ b/libdb/os/os_region.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -22,15 +22,15 @@ static const gchar revid[] = "$Id$";
* __os_r_attach --
* Attach to a shared memory region.
*
- * PUBLIC: gint __os_r_attach __P((DB_ENV *, REGINFO *, REGION *));
+ * PUBLIC: int __os_r_attach __P((DB_ENV *, REGINFO *, REGION *));
*/
-gint
+int
__os_r_attach(dbenv, infop, rp)
DB_ENV *dbenv;
REGINFO *infop;
REGION *rp;
{
- gint ret;
+ int ret;
/* Round off the requested size for the underlying VM. */
OS_VMROUNDOFF(rp->size);
@@ -89,13 +89,13 @@ __os_r_attach(dbenv, infop, rp)
* __os_r_detach --
* Detach from a shared memory region.
*
- * PUBLIC: gint __os_r_detach __P((DB_ENV *, REGINFO *, int));
+ * PUBLIC: int __os_r_detach __P((DB_ENV *, REGINFO *, int));
*/
-gint
+int
__os_r_detach(dbenv, infop, destroy)
DB_ENV *dbenv;
REGINFO *infop;
- gint destroy;
+ int destroy;
{
REGION *rp;
diff --git a/libdb/os/os_rename.c b/libdb/os/os_rename.c
index 18a332c..94ed6fc 100644
--- a/libdb/os/os_rename.c
+++ b/libdb/os/os_rename.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,16 +25,16 @@ static const gchar revid[] = "$Id$";
* Rename a file. If flags is non-zero, then errors are OK and we
* should not output an error message.
*
- * PUBLIC: gint __os_rename __P((DB_ENV *,
- * PUBLIC: const gchar *, const gchar *, u_int32_t));
+ * PUBLIC: int __os_rename __P((DB_ENV *,
+ * PUBLIC: const char *, const char *, u_int32_t));
*/
-gint
+int
__os_rename(dbenv, old, new, flags)
DB_ENV *dbenv;
- const gchar *old, *new;
+ const char *old, *new;
u_int32_t flags;
{
- gint ret;
+ int ret;
do {
ret = DB_GLOBAL(j_rename) != NULL ?
diff --git a/libdb/os/os_root.c b/libdb/os/os_root.c
index 91b9346..5dc63c9 100644
--- a/libdb/os/os_root.c
+++ b/libdb/os/os_root.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -23,9 +23,9 @@ static const gchar revid[] = "$Id$";
* __os_isroot --
* Return if user has special permissions.
*
- * PUBLIC: gint __os_isroot __P((void));
+ * PUBLIC: int __os_isroot __P((void));
*/
-gint
+int
__os_isroot()
{
#ifdef HAVE_GETUID
diff --git a/libdb/os/os_rpath.c b/libdb/os/os_rpath.c
index e17473c..7b34913 100644
--- a/libdb/os/os_rpath.c
+++ b/libdb/os/os_rpath.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,16 +24,16 @@ static const gchar revid[] = "$Id$";
* __db_rpath --
* Return the last path separator in the path or NULL if none found.
*
- * PUBLIC: gchar *__db_rpath __P((const gchar *));
+ * PUBLIC: char *__db_rpath __P((const char *));
*/
-gchar *
+char *
__db_rpath(path)
- const gchar *path;
+ const char *path;
{
- const gchar *s, *last;
+ const char *s, *last;
#ifdef HAVE_VXWORKS
DEV_HDR *dummy;
- gchar *ptail;
+ char *ptail;
/*
* VxWorks devices can be rooted at any name. We want to
@@ -48,7 +48,7 @@ __db_rpath(path)
* We do not support the first usage here.
* XXX
*/
- if ((dummy = iosDevFind((gchar *)path, &ptail)) == NULL)
+ if ((dummy = iosDevFind((char *)path, &ptail)) == NULL)
s = path;
else
s = ptail;
@@ -65,5 +65,5 @@ __db_rpath(path)
for (; s[0] != '\0'; ++s)
if (s[0] == PATH_SEPARATOR[0])
last = s;
- return ((gchar *)last);
+ return ((char *)last);
}
diff --git a/libdb/os/os_rw.c b/libdb/os/os_rw.c
index 19ff32f..c21abb7 100644
--- a/libdb/os/os_rw.c
+++ b/libdb/os/os_rw.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -22,24 +22,24 @@ static const gchar revid[] = "$Id$";
#include "db_int.h"
#ifdef HAVE_FILESYSTEM_NOTZERO
-static gint __os_zerofill __P((DB_ENV *, DB_FH *));
+static int __os_zerofill __P((DB_ENV *, DB_FH *));
#endif
-static gint __os_physwrite __P((DB_ENV *, DB_FH *, gpointer , size_t, size_t *));
+static int __os_physwrite __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
/*
* __os_io --
* Do an I/O.
*
- * PUBLIC: gint __os_io __P((DB_ENV *, DB_IO *, int, size_t *));
+ * PUBLIC: int __os_io __P((DB_ENV *, DB_IO *, int, size_t *));
*/
-gint
+int
__os_io(dbenv, db_iop, op, niop)
DB_ENV *dbenv;
DB_IO *db_iop;
- gint op;
+ int op;
size_t *niop;
{
- gint ret;
+ int ret;
/* Check for illegal usage. */
DB_ASSERT(F_ISSET(db_iop->fhp, DB_FH_VALID) && db_iop->fhp->fd != -1);
@@ -93,19 +93,19 @@ err: MUTEX_THREAD_UNLOCK(dbenv, db_iop->mutexp);
* __os_read --
* Read from a file handle.
*
- * PUBLIC: gint __os_read __P((DB_ENV *, DB_FH *, gpointer , size_t, size_t *));
+ * PUBLIC: int __os_read __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
*/
-gint
+int
__os_read(dbenv, fhp, addr, len, nrp)
DB_ENV *dbenv;
DB_FH *fhp;
- gpointer addr;
+ void *addr;
size_t len;
size_t *nrp;
{
size_t offset;
ssize_t nr;
- gint ret;
+ int ret;
u_int8_t *taddr;
/* Check for illegal usage. */
@@ -133,13 +133,13 @@ retry: if ((nr = DB_GLOBAL(j_read) != NULL ?
* __os_write --
* Write to a file handle.
*
- * PUBLIC: gint __os_write __P((DB_ENV *, DB_FH *, gpointer , size_t, size_t *));
+ * PUBLIC: int __os_write __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
*/
-gint
+int
__os_write(dbenv, fhp, addr, len, nwp)
DB_ENV *dbenv;
DB_FH *fhp;
- gpointer addr;
+ void *addr;
size_t len;
size_t *nwp;
{
@@ -149,7 +149,7 @@ __os_write(dbenv, fhp, addr, len, nwp)
#ifdef HAVE_FILESYSTEM_NOTZERO
/* Zero-fill as necessary. */
if (__os_fs_notzero()) {
- gint ret;
+ int ret;
if ((ret = __os_zerofill(dbenv, fhp)) != 0)
return (ret);
}
@@ -165,13 +165,13 @@ static int
__os_physwrite(dbenv, fhp, addr, len, nwp)
DB_ENV *dbenv;
DB_FH *fhp;
- gpointer addr;
+ void *addr;
size_t len;
size_t *nwp;
{
size_t offset;
ssize_t nw;
- gint ret;
+ int ret;
u_int8_t *taddr;
#if defined(HAVE_FILESYSTEM_NOTZERO) && defined(DIAGNOSTIC)
@@ -222,7 +222,7 @@ __os_zerofill(dbenv, fhp)
off_t stat_offset, write_offset;
size_t blen, nw;
u_int32_t bytes, mbytes;
- gint group_sync, need_free, ret;
+ int group_sync, need_free, ret;
u_int8_t buf[8 * 1024], *bp;
/* Calculate the byte offset of the next write. */
diff --git a/libdb/os/os_seek.c b/libdb/os/os_seek.c
index 4915dae..339836d 100644
--- a/libdb/os/os_seek.c
+++ b/libdb/os/os_seek.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,21 +25,21 @@ static const gchar revid[] = "$Id$";
* __os_seek --
* Seek to a page/byte offset in the file.
*
- * PUBLIC: gint __os_seek __P((DB_ENV *,
+ * PUBLIC: int __os_seek __P((DB_ENV *,
* PUBLIC: DB_FH *, size_t, db_pgno_t, u_int32_t, int, DB_OS_SEEK));
*/
-gint
+int
__os_seek(dbenv, fhp, pgsize, pageno, relative, isrewind, db_whence)
DB_ENV *dbenv;
DB_FH *fhp;
size_t pgsize;
db_pgno_t pageno;
u_int32_t relative;
- gint isrewind;
+ int isrewind;
DB_OS_SEEK db_whence;
{
off_t offset;
- gint ret, whence;
+ int ret, whence;
switch (db_whence) {
case DB_OS_SEEK_CUR:
diff --git a/libdb/os/os_sleep.c b/libdb/os/os_sleep.c
index 32d9830..fb1b68d 100644
--- a/libdb/os/os_sleep.c
+++ b/libdb/os/os_sleep.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -45,15 +45,15 @@ static const gchar revid[] = "$Id$";
* __os_sleep --
* Yield the processor for a period of time.
*
- * PUBLIC: gint __os_sleep __P((DB_ENV *, u_long, u_long));
+ * PUBLIC: int __os_sleep __P((DB_ENV *, u_long, u_long));
*/
-gint
+int
__os_sleep(dbenv, secs, usecs)
DB_ENV *dbenv;
u_long secs, usecs; /* Seconds and microseconds. */
{
struct timeval t;
- gint ret;
+ int ret;
/* Don't require that the values be normalized. */
for (; usecs >= 1000000; usecs -= 1000000)
diff --git a/libdb/os/os_spin.c b/libdb/os/os_spin.c
index 95c3158..872f523 100644
--- a/libdb/os/os_spin.c
+++ b/libdb/os/os_spin.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,7 +24,7 @@ static const gchar revid[] = "$Id$";
#include "db_int.h"
#if defined(HAVE_PSTAT_GETDYNAMIC)
-static gint __os_pstat_getdynamic __P((void));
+static int __os_pstat_getdynamic __P((void));
/*
* __os_pstat_getdynamic --
@@ -41,7 +41,7 @@ __os_pstat_getdynamic()
#endif
#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
-static gint __os_sysconf __P((void));
+static int __os_sysconf __P((void));
/*
* __os_sysconf --
@@ -60,9 +60,9 @@ __os_sysconf()
* __os_spin --
* Return the number of default spins before blocking.
*
- * PUBLIC: gint __os_spin __P((DB_ENV *));
+ * PUBLIC: int __os_spin __P((DB_ENV *));
*/
-gint
+int
__os_spin(dbenv)
DB_ENV *dbenv;
{
diff --git a/libdb/os/os_stat.c b/libdb/os/os_stat.c
index 8579ff2..6d0426b 100644
--- a/libdb/os/os_stat.c
+++ b/libdb/os/os_stat.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,14 +24,14 @@ static const gchar revid[] = "$Id$";
* __os_exists --
* Return if the file exists.
*
- * PUBLIC: gint __os_exists __P((const gchar *, gint *));
+ * PUBLIC: int __os_exists __P((const char *, int *));
*/
-gint
+int
__os_exists(path, isdirp)
- const gchar *path;
- gint *isdirp;
+ const char *path;
+ int *isdirp;
{
- gint ret;
+ int ret;
struct stat sb;
if (DB_GLOBAL(j_exists) != NULL)
@@ -40,7 +40,7 @@ __os_exists(path, isdirp)
do {
ret =
#ifdef HAVE_VXWORKS
- stat((gchar *)path, &sb);
+ stat((char *)path, &sb);
#else
stat(path, &sb);
#endif
@@ -70,17 +70,17 @@ __os_exists(path, isdirp)
* Return file size and I/O size; abstracted to make it easier
* to replace.
*
- * PUBLIC: gint __os_ioinfo __P((DB_ENV *, const gchar *,
+ * PUBLIC: int __os_ioinfo __P((DB_ENV *, const char *,
* PUBLIC: DB_FH *, u_int32_t *, u_int32_t *, u_int32_t *));
*/
-gint
+int
__os_ioinfo(dbenv, path, fhp, mbytesp, bytesp, iosizep)
DB_ENV *dbenv;
- const gchar *path;
+ const char *path;
DB_FH *fhp;
u_int32_t *mbytesp, *bytesp, *iosizep;
{
- gint ret;
+ int ret;
struct stat sb;
if (DB_GLOBAL(j_ioinfo) != NULL)
diff --git a/libdb/os/os_tmpdir.c b/libdb/os/os_tmpdir.c
index a1619f4..e09385e 100644
--- a/libdb/os/os_tmpdir.c
+++ b/libdb/os/os_tmpdir.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -30,24 +30,24 @@ static const gchar revid[] = "$Id$";
* The order of items in the list structure and the order of checks in
* the environment are documented.
*
- * PUBLIC: gint __os_tmpdir __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __os_tmpdir __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__os_tmpdir(dbenv, flags)
DB_ENV *dbenv;
u_int32_t flags;
{
- gint isdir;
+ int isdir;
/*
* !!!
* Don't change this to:
*
- * static const gchar * const list[]
+ * static const char * const list[]
*
* because it creates a text relocation in position independent code.
*/
- static const gchar * list[] = {
+ static const char * list[] = {
"/var/tmp",
"/usr/tmp",
"/temp", /* Windows. */
@@ -56,7 +56,7 @@ __os_tmpdir(dbenv, flags)
"C:/tmp", /* Windows. */
NULL
};
- const gchar * const *lp, *p;
+ const char * const *lp, *p;
/* Use the environment if it's permitted and initialized. */
if (LF_ISSET(DB_USE_ENVIRON) ||
@@ -99,7 +99,7 @@ __os_tmpdir(dbenv, flags)
#ifdef DB_WIN32
/* Get the path to the temporary directory. */
{int len;
- gchar *eos, temp[MAXPATHLEN + 1];
+ char *eos, temp[MAXPATHLEN + 1];
if ((len = GetTempPath(sizeof(temp) - 1, temp)) > 2) {
eos = &temp[len];
diff --git a/libdb/os/os_unlink.c b/libdb/os/os_unlink.c
index b74f222..ea3a8a8 100644
--- a/libdb/os/os_unlink.c
+++ b/libdb/os/os_unlink.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,16 +24,16 @@ static const gchar revid[] = "$Id$";
* __os_region_unlink --
* Remove a shared memory object file.
*
- * PUBLIC: gint __os_region_unlink __P((DB_ENV *, const gchar *));
+ * PUBLIC: int __os_region_unlink __P((DB_ENV *, const char *));
*/
-gint
+int
__os_region_unlink(dbenv, path)
DB_ENV *dbenv;
- const gchar *path;
+ const char *path;
{
#ifdef HAVE_QNX
- gint ret;
- gchar *newname;
+ int ret;
+ char *newname;
if ((ret = __os_shmname(dbenv, path, &newname)) != 0)
goto err;
@@ -60,19 +60,19 @@ err:
* __os_unlink --
* Remove a file.
*
- * PUBLIC: gint __os_unlink __P((DB_ENV *, const gchar *));
+ * PUBLIC: int __os_unlink __P((DB_ENV *, const char *));
*/
-gint
+int
__os_unlink(dbenv, path)
DB_ENV *dbenv;
- const gchar *path;
+ const char *path;
{
- gint ret;
+ int ret;
retry: ret = DB_GLOBAL(j_unlink) != NULL ?
DB_GLOBAL(j_unlink)(path) :
#ifdef HAVE_VXWORKS
- unlink((gchar *)path);
+ unlink((char *)path);
#else
unlink(path);
#endif
diff --git a/libdb/os_vxworks/os_vx_abs.c b/libdb/os_vxworks/os_vx_abs.c
index e59f4b4..7d9bad4 100644
--- a/libdb/os_vxworks/os_vx_abs.c
+++ b/libdb/os_vxworks/os_vx_abs.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include "db_int.h"
@@ -18,18 +18,18 @@ static const gchar revid[] = "$Id$";
* __os_abspath --
* Return if a path is an absolute path.
*/
-gint
+int
__os_abspath(path)
- const gchar *path;
+ const char *path;
{
DEV_HDR *dummy;
- gchar *ptail;
+ char *ptail;
/*
* VxWorks devices can be rooted at any name at all.
* Use iosDevFind() to see if name matches any of our devices.
*/
- if ((dummy = iosDevFind((gchar *)path, &ptail)) == NULL)
+ if ((dummy = iosDevFind((char *)path, &ptail)) == NULL)
return (0);
/*
* If the routine used a device, then ptail points to the
diff --git a/libdb/os_vxworks/os_vx_config.c b/libdb/os_vxworks/os_vx_config.c
index e3ceb66..6ccc12d 100644
--- a/libdb/os_vxworks/os_vx_config.c
+++ b/libdb/os_vxworks/os_vx_config.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include "db_int.h"
@@ -17,9 +17,9 @@ static const gchar revid[] = "$Id$";
* __os_fs_notzero --
* Return 1 if allocated filesystem blocks are not zeroed.
*
- * PUBLIC: gint __os_fs_notzero __P((void));
+ * PUBLIC: int __os_fs_notzero __P((void));
*/
-gint
+int
__os_fs_notzero()
{
/*
diff --git a/libdb/os_vxworks/os_vx_map.c b/libdb/os_vxworks/os_vx_map.c
index 9bf223f..c4ae7fe 100644
--- a/libdb/os_vxworks/os_vx_map.c
+++ b/libdb/os_vxworks/os_vx_map.c
@@ -11,7 +11,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -38,39 +38,39 @@ static const gchar revid[] = "$Id$";
* list of already open segments.
*/
typedef struct {
- gpointer segment; /* Segment address. */
+ void *segment; /* Segment address. */
u_int32_t size; /* Segment size. */
- gchar *name; /* Segment name. */
+ char *name; /* Segment name. */
long segid; /* Segment ID. */
} os_segdata_t;
static os_segdata_t *__os_segdata; /* Segment table. */
-static gint __os_segdata_size; /* Segment table size. */
+static int __os_segdata_size; /* Segment table size. */
#define OS_SEGDATA_STARTING_SIZE 16
#define OS_SEGDATA_INCREMENT 16
-static gint __os_segdata_allocate
- __P((DB_ENV *, const gchar *, REGINFO *, REGION *));
-static gint __os_segdata_find_byname
- __P((DB_ENV *, const gchar *, REGINFO *, REGION *));
-static gint __os_segdata_init __P((DB_ENV *));
-static gint __os_segdata_new __P((DB_ENV *, gint *));
-static gint __os_segdata_release __P((DB_ENV *, REGION *, int));
+static int __os_segdata_allocate
+ __P((DB_ENV *, const char *, REGINFO *, REGION *));
+static int __os_segdata_find_byname
+ __P((DB_ENV *, const char *, REGINFO *, REGION *));
+static int __os_segdata_init __P((DB_ENV *));
+static int __os_segdata_new __P((DB_ENV *, int *));
+static int __os_segdata_release __P((DB_ENV *, REGION *, int));
/*
* __os_r_sysattach --
* Create/join a shared memory region.
*
- * PUBLIC: gint __os_r_sysattach __P((DB_ENV *, REGINFO *, REGION *));
+ * PUBLIC: int __os_r_sysattach __P((DB_ENV *, REGINFO *, REGION *));
*/
-gint
+int
__os_r_sysattach(dbenv, infop, rp)
DB_ENV *dbenv;
REGINFO *infop;
REGION *rp;
{
- gint ret;
+ int ret;
if (__os_segdata == NULL)
__os_segdata_init(dbenv);
@@ -130,13 +130,13 @@ out:
* __os_r_sysdetach --
* Detach from a shared region.
*
- * PUBLIC: gint __os_r_sysdetach __P((DB_ENV *, REGINFO *, int));
+ * PUBLIC: int __os_r_sysdetach __P((DB_ENV *, REGINFO *, int));
*/
-gint
+int
__os_r_sysdetach(dbenv, infop, destroy)
DB_ENV *dbenv;
REGINFO *infop;
- gint destroy;
+ int destroy;
{
/*
* If just detaching, there is no mapping to discard.
@@ -151,17 +151,17 @@ __os_r_sysdetach(dbenv, infop, destroy)
* __os_mapfile --
* Map in a shared memory file.
*
- * PUBLIC: gint __os_mapfile __P((DB_ENV *,
- * PUBLIC: gchar *, DB_FH *, size_t, int, gpointer *));
+ * PUBLIC: int __os_mapfile __P((DB_ENV *,
+ * PUBLIC: char *, DB_FH *, size_t, int, void **));
*/
-gint
+int
__os_mapfile(dbenv, path, fhp, len, is_rdonly, addrp)
DB_ENV *dbenv;
- gchar *path;
+ char *path;
DB_FH *fhp;
- gint is_rdonly;
+ int is_rdonly;
size_t len;
- gpointer *addrp;
+ void **addrp;
{
/* We cannot map in regular files in VxWorks. */
COMPQUIET(dbenv, NULL);
@@ -177,12 +177,12 @@ __os_mapfile(dbenv, path, fhp, len, is_rdonly, addrp)
* __os_unmapfile --
* Unmap the shared memory file.
*
- * PUBLIC: gint __os_unmapfile __P((DB_ENV *, gpointer , size_t));
+ * PUBLIC: int __os_unmapfile __P((DB_ENV *, void *, size_t));
*/
-gint
+int
__os_unmapfile(dbenv, addr, len)
DB_ENV *dbenv;
- gpointer addr;
+ void *addr;
size_t len;
{
/* We cannot map in regular files in VxWorks. */
@@ -201,7 +201,7 @@ static int
__os_segdata_init(dbenv)
DB_ENV *dbenv;
{
- gint ret;
+ int ret;
if (__os_segdata != NULL) {
__db_err(dbenv, "shared memory segment already exists");
@@ -226,14 +226,14 @@ __os_segdata_init(dbenv)
* Currently not called. This function should be called if the
* user creates a function to unload or shutdown.
*
- * PUBLIC: gint __os_segdata_destroy __P((DB_ENV *));
+ * PUBLIC: int __os_segdata_destroy __P((DB_ENV *));
*/
-gint
+int
__os_segdata_destroy(dbenv)
DB_ENV *dbenv;
{
os_segdata_t *p;
- gint i;
+ int i;
if (__os_segdata == NULL)
return (0);
@@ -270,12 +270,12 @@ __os_segdata_destroy(dbenv)
static int
__os_segdata_allocate(dbenv, name, infop, rp)
DB_ENV *dbenv;
- const gchar *name;
+ const char *name;
REGINFO *infop;
REGION *rp;
{
os_segdata_t *p;
- gint id, ret;
+ int id, ret;
if ((ret = __os_segdata_new(dbenv, &id)) != 0)
return (ret);
@@ -307,10 +307,10 @@ __os_segdata_allocate(dbenv, name, infop, rp)
static int
__os_segdata_new(dbenv, segidp)
DB_ENV *dbenv;
- gint *segidp;
+ int *segidp;
{
os_segdata_t *p;
- gint i, newsize, ret;
+ int i, newsize, ret;
if (__os_segdata == NULL) {
__db_err(dbenv, "shared memory segment not initialized");
@@ -348,18 +348,18 @@ __os_segdata_new(dbenv, segidp)
* Assumes it is called with the SEGDATA lock taken.
*
* PUBLIC: __os_segdata_find_byname
- * PUBLIC: __P((DB_ENV *, const gchar *, REGINFO *, REGION *));
+ * PUBLIC: __P((DB_ENV *, const char *, REGINFO *, REGION *));
*/
static int
__os_segdata_find_byname(dbenv, name, infop, rp)
DB_ENV *dbenv;
- const gchar *name;
+ const char *name;
REGINFO *infop;
REGION *rp;
{
os_segdata_t *p;
long segid;
- gint i;
+ int i;
if (__os_segdata == NULL) {
__db_err(dbenv, "shared memory segment not initialized");
@@ -406,7 +406,7 @@ static int
__os_segdata_release(dbenv, rp, is_locked)
DB_ENV *dbenv;
REGION *rp;
- gint is_locked;
+ int is_locked;
{
os_segdata_t *p;
diff --git a/libdb/os_win32/os_abs.c b/libdb/os_win32/os_abs.c
index aa75797..b31cce9 100644
--- a/libdb/os_win32/os_abs.c
+++ b/libdb/os_win32/os_abs.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include "db_int.h"
@@ -17,9 +17,9 @@ static const gchar revid[] = "$Id$";
* __os_abspath --
* Return if a path is an absolute path.
*/
-gint
+int
__os_abspath(path)
- const gchar *path;
+ const char *path;
{
/*
* !!!
diff --git a/libdb/os_win32/os_clock.c b/libdb/os_win32/os_clock.c
index 594efd4..472f7a0 100644
--- a/libdb/os_win32/os_clock.c
+++ b/libdb/os_win32/os_clock.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include <sys/types.h>
@@ -21,7 +21,7 @@ static const gchar revid[] = "$Id$";
* __os_clock --
* Return the current time-of-day clock in seconds and microseconds.
*/
-gint
+int
__os_clock(dbenv, secsp, usecsp)
DB_ENV *dbenv;
u_int32_t *secsp, *usecsp; /* Seconds and microseconds. */
diff --git a/libdb/os_win32/os_config.c b/libdb/os_win32/os_config.c
index bb76652..dd9493b 100644
--- a/libdb/os_win32/os_config.c
+++ b/libdb/os_win32/os_config.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include "db_int.h"
@@ -17,7 +17,7 @@ static const gchar revid[] = "$Id$";
* __os_fs_notzero --
* Return 1 if allocated filesystem blocks are not zeroed.
*/
-gint
+int
__os_fs_notzero()
{
/*
diff --git a/libdb/os_win32/os_dir.c b/libdb/os_win32/os_dir.c
index 1f1e0ff..034c4b5 100644
--- a/libdb/os_win32/os_dir.c
+++ b/libdb/os_win32/os_dir.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include "db_int.h"
@@ -17,12 +17,12 @@ static const gchar revid[] = "$Id$";
* __os_dirlist --
* Return a list of the files in a directory.
*/
-gint
+int
__os_dirlist(dbenv, dir, namesp, cntp)
DB_ENV *dbenv;
- const gchar *dir;
- gchar ***namesp;
- gint *cntp;
+ const char *dir;
+ char ***namesp;
+ int *cntp;
{
struct _finddata_t fdata;
#ifdef _WIN64
@@ -30,8 +30,8 @@ __os_dirlist(dbenv, dir, namesp, cntp)
#else
long dirhandle;
#endif
- gint arraysz, cnt, finished, ret;
- gchar **names, filespec[MAXPATHLEN];
+ int arraysz, cnt, finished, ret;
+ char **names, filespec[MAXPATHLEN];
if (DB_GLOBAL(j_dirlist) != NULL)
return (DB_GLOBAL(j_dirlist)(dir, namesp, cntp));
@@ -72,8 +72,8 @@ nomem: if (names != NULL)
void
__os_dirfree(dbenv, names, cnt)
DB_ENV *dbenv;
- gchar **names;
- gint cnt;
+ char **names;
+ int cnt;
{
if (DB_GLOBAL(j_dirfree) != NULL) {
DB_GLOBAL(j_dirfree)(names, cnt);
diff --git a/libdb/os_win32/os_errno.c b/libdb/os_win32/os_errno.c
index 12edc58..a030925 100644
--- a/libdb/os_win32/os_errno.c
+++ b/libdb/os_win32/os_errno.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include "db_int.h"
@@ -17,7 +17,7 @@ static const gchar revid[] = "$Id$";
* __os_get_errno --
* Return the value of errno.
*/
-gint
+int
__os_get_errno()
{
/* This routine must be able to return the same value repeatedly. */
@@ -30,7 +30,7 @@ __os_get_errno()
*/
void
__os_set_errno(evalue)
- gint evalue;
+ int evalue;
{
errno = evalue;
}
@@ -49,14 +49,14 @@ __os_set_errno(evalue)
* here.
*
* PUBLIC: #if defined(DB_WIN32)
- * PUBLIC: gint __os_win32_errno __P((void));
+ * PUBLIC: int __os_win32_errno __P((void));
* PUBLIC: #endif
*/
-gint
+int
__os_win32_errno(void)
{
DWORD last_error;
- gint ret;
+ int ret;
/* Ignore errno - we used to check it here. */
diff --git a/libdb/os_win32/os_fid.c b/libdb/os_win32/os_fid.c
index fba8493..4d73710 100644
--- a/libdb/os_win32/os_fid.c
+++ b/libdb/os_win32/os_fid.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include "db_int.h"
@@ -20,17 +20,17 @@ static u_int32_t fid_serial = SERIAL_INIT;
* __os_fileid --
* Return a unique identifier for a file.
*/
-gint
+int
__os_fileid(dbenv, fname, unique_okay, fidp)
DB_ENV *dbenv;
- const gchar *fname;
- gint unique_okay;
+ const char *fname;
+ int unique_okay;
u_int8_t *fidp;
{
size_t i;
u_int32_t tmp;
u_int8_t *p;
- gint ret;
+ int ret;
/*
* The documentation for GetFileInformationByHandle() states that the
diff --git a/libdb/os_win32/os_fsync.c b/libdb/os_win32/os_fsync.c
index cf23275..b99fb61 100644
--- a/libdb/os_win32/os_fsync.c
+++ b/libdb/os_win32/os_fsync.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,15 +25,15 @@ static const gchar revid[] = "$Id$";
* __os_fsync --
* Flush a file descriptor.
*
- * PUBLIC: gint __os_fsync __P((DB_ENV *, DB_FH *));
+ * PUBLIC: int __os_fsync __P((DB_ENV *, DB_FH *));
*/
-gint
+int
__os_fsync(dbenv, fhp)
DB_ENV *dbenv;
DB_FH *fhp;
{
BOOL success;
- gint ret;
+ int ret;
/*
* Do nothing if the file descriptor has been marked as not requiring
diff --git a/libdb/os_win32/os_handle.c b/libdb/os_win32/os_handle.c
index ea8b9f3..3e36daa 100644
--- a/libdb/os_win32/os_handle.c
+++ b/libdb/os_win32/os_handle.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,16 +25,16 @@ static const gchar revid[] = "$Id$";
* __os_openhandle --
* Open a file, using POSIX 1003.1 open flags.
*
- * PUBLIC: gint __os_openhandle __P((DB_ENV *, const gchar *, int, int, DB_FH *));
+ * PUBLIC: int __os_openhandle __P((DB_ENV *, const char *, int, int, DB_FH *));
*/
-gint
+int
__os_openhandle(dbenv, name, flags, mode, fhp)
DB_ENV *dbenv;
- const gchar *name;
- gint flags, mode;
+ const char *name;
+ int flags, mode;
DB_FH *fhp;
{
- gint ret, nrepeat;
+ int ret, nrepeat;
memset(fhp, 0, sizeof(*fhp));
fhp->handle = INVALID_HANDLE_VALUE;
@@ -85,15 +85,15 @@ __os_openhandle(dbenv, name, flags, mode, fhp)
* __os_closehandle --
* Close a file.
*
- * PUBLIC: gint __os_closehandle __P((DB_ENV *, DB_FH *));
+ * PUBLIC: int __os_closehandle __P((DB_ENV *, DB_FH *));
*/
-gint
+int
__os_closehandle(dbenv, fhp)
DB_ENV *dbenv;
DB_FH *fhp;
{
BOOL success;
- gint ret;
+ int ret;
COMPQUIET(dbenv, NULL);
/* Don't close file descriptors that were never opened. */
diff --git a/libdb/os_win32/os_map.c b/libdb/os_win32/os_map.c
index 48e862b..b81dd4e 100644
--- a/libdb/os_win32/os_map.c
+++ b/libdb/os_win32/os_map.c
@@ -8,27 +8,27 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include "db_int.h"
-static gint __os_map
- __P((DB_ENV *, gchar *, REGINFO *, DB_FH *, size_t, int, int, int, gpointer *));
-static gint __os_unique_name __P((gchar *, HANDLE, gchar *, size_t));
+static int __os_map
+ __P((DB_ENV *, char *, REGINFO *, DB_FH *, size_t, int, int, int, void **));
+static int __os_unique_name __P((char *, HANDLE, char *, size_t));
/*
* __os_r_sysattach --
* Create/join a shared memory region.
*/
-gint
+int
__os_r_sysattach(dbenv, infop, rp)
DB_ENV *dbenv;
REGINFO *infop;
REGION *rp;
{
DB_FH fh;
- gint is_system, ret;
+ int is_system, ret;
/*
* Try to open/create the file. We DO NOT need to ensure that multiple
@@ -72,13 +72,13 @@ __os_r_sysattach(dbenv, infop, rp)
* __os_r_sysdetach --
* Detach from a shared memory region.
*/
-gint
+int
__os_r_sysdetach(dbenv, infop, destroy)
DB_ENV *dbenv;
REGINFO *infop;
- gint destroy;
+ int destroy;
{
- gint ret, t_ret;
+ int ret, t_ret;
if (infop->wnt_handle != NULL) {
(void)CloseHandle(*((HANDLE*)(infop->wnt_handle)));
@@ -103,14 +103,14 @@ __os_r_sysdetach(dbenv, infop, destroy)
* __os_mapfile --
* Map in a shared memory file.
*/
-gint
+int
__os_mapfile(dbenv, path, fhp, len, is_rdonly, addr)
DB_ENV *dbenv;
- gchar *path;
+ char *path;
DB_FH *fhp;
- gint is_rdonly;
+ int is_rdonly;
size_t len;
- gpointer *addr;
+ void **addr;
{
/* If the user replaced the map call, call through their interface. */
if (DB_GLOBAL(j_map) != NULL)
@@ -123,10 +123,10 @@ __os_mapfile(dbenv, path, fhp, len, is_rdonly, addr)
* __os_unmapfile --
* Unmap the shared memory file.
*/
-gint
+int
__os_unmapfile(dbenv, addr, len)
DB_ENV *dbenv;
- gpointer addr;
+ void *addr;
size_t len;
{
/* If the user replaced the map call, call through their interface. */
@@ -165,12 +165,12 @@ __os_unmapfile(dbenv, addr, len)
*/
static int
__os_unique_name(orig_path, hfile, result_path, result_path_len)
- gchar *orig_path, *result_path;
+ char *orig_path, *result_path;
HANDLE hfile;
size_t result_path_len;
{
BY_HANDLE_FILE_INFORMATION fileinfo;
- gchar *basename, *p;
+ char *basename, *p;
/*
* In Windows, pathname components are delimited by '/' or '\', and
@@ -212,17 +212,17 @@ static int
__os_map(dbenv, path, infop, fhp, len, is_region, is_system, is_rdonly, addr)
DB_ENV *dbenv;
REGINFO *infop;
- gchar *path;
+ char *path;
DB_FH *fhp;
- gint is_region, is_system, is_rdonly;
+ int is_region, is_system, is_rdonly;
size_t len;
- gpointer *addr;
+ void **addr;
{
HANDLE hMemory;
REGENV *renv;
- gint ret, use_pagefile;
- gchar shmem_name[MAXPATHLEN];
- gpointer pMemory;
+ int ret, use_pagefile;
+ char shmem_name[MAXPATHLEN];
+ void *pMemory;
ret = 0;
if (infop != NULL)
diff --git a/libdb/os_win32/os_open.c b/libdb/os_win32/os_open.c
index 2483671..ede9742 100644
--- a/libdb/os_win32/os_open.c
+++ b/libdb/os_win32/os_open.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -26,19 +26,19 @@ static const gchar revid[] = "$Id$";
* __os_open --
* Open a file descriptor.
*/
-gint
+int
__os_open(dbenv, name, flags, mode, fhp)
DB_ENV *dbenv;
- const gchar *name;
+ const char *name;
u_int32_t flags;
- gint mode;
+ int mode;
DB_FH *fhp;
{
DWORD bytesWritten;
u_int32_t log_size, pagesize, sectorsize;
- gint access, attr, oflags, share, createflag;
- gint ret, nrepeat;
- gchar *drive, dbuf[4]; /* <letter><colon><slosh><nul> */
+ int access, attr, oflags, share, createflag;
+ int ret, nrepeat;
+ char *drive, dbuf[4]; /* <letter><colon><slosh><nul> */
#ifdef DIAGNOSTIC
#define OKFLAGS \
diff --git a/libdb/os_win32/os_rename.c b/libdb/os_win32/os_rename.c
index 61f9daa..e0cb1f5 100644
--- a/libdb/os_win32/os_rename.c
+++ b/libdb/os_win32/os_rename.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include "db_int.h"
@@ -17,13 +17,13 @@ static const gchar revid[] = "$Id$";
* __os_rename --
* Rename a file.
*/
-gint
+int
__os_rename(dbenv, oldname, newname, flags)
DB_ENV *dbenv;
- const gchar *oldname, *newname;
+ const char *oldname, *newname;
u_int32_t flags;
{
- gint ret;
+ int ret;
ret = 0;
if (DB_GLOBAL(j_rename) != NULL) {
diff --git a/libdb/os_win32/os_rw.c b/libdb/os_win32/os_rw.c
index 5c5c90d..f562931 100644
--- a/libdb/os_win32/os_rw.c
+++ b/libdb/os_win32/os_rw.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -21,24 +21,24 @@ static const gchar revid[] = "$Id$";
#include "db_int.h"
#ifdef HAVE_FILESYSTEM_NOTZERO
-static gint __os_zerofill __P((DB_ENV *, DB_FH *));
+static int __os_zerofill __P((DB_ENV *, DB_FH *));
#endif
-static gint __os_physwrite __P((DB_ENV *, DB_FH *, gpointer , size_t, size_t *));
+static int __os_physwrite __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
/*
* __os_io --
* Do an I/O.
*
- * PUBLIC: gint __os_io __P((DB_ENV *, DB_IO *, int, size_t *));
+ * PUBLIC: int __os_io __P((DB_ENV *, DB_IO *, int, size_t *));
*/
-gint
+int
__os_io(dbenv, db_iop, op, niop)
DB_ENV *dbenv;
DB_IO *db_iop;
- gint op;
+ int op;
size_t *niop;
{
- gint ret;
+ int ret;
if (__os_is_winnt()) {
ULONG64 off = (ULONG64)db_iop->pagesize * db_iop->pgno;
@@ -100,19 +100,19 @@ err: MUTEX_THREAD_UNLOCK(dbenv, db_iop->mutexp);
* __os_read --
* Read from a file handle.
*
- * PUBLIC: gint __os_read __P((DB_ENV *, DB_FH *, gpointer , size_t, size_t *));
+ * PUBLIC: int __os_read __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
*/
-gint
+int
__os_read(dbenv, fhp, addr, len, nrp)
DB_ENV *dbenv;
DB_FH *fhp;
- gpointer addr;
+ void *addr;
size_t len;
size_t *nrp;
{
size_t offset;
DWORD nr;
- gint ret;
+ int ret;
BOOL success;
u_int8_t *taddr;
@@ -148,17 +148,17 @@ retry: if (DB_GLOBAL(j_read) != NULL) {
* __os_write --
* Write to a file handle.
*
- * PUBLIC: gint __os_write __P((DB_ENV *, DB_FH *, gpointer , size_t, size_t *));
+ * PUBLIC: int __os_write __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
*/
-gint
+int
__os_write(dbenv, fhp, addr, len, nwp)
DB_ENV *dbenv;
DB_FH *fhp;
- gpointer addr;
+ void *addr;
size_t len;
size_t *nwp;
{
- gint ret;
+ int ret;
#ifdef HAVE_FILESYSTEM_NOTZERO
/* Zero-fill as necessary. */
@@ -176,13 +176,13 @@ static int
__os_physwrite(dbenv, fhp, addr, len, nwp)
DB_ENV *dbenv;
DB_FH *fhp;
- gpointer addr;
+ void *addr;
size_t len;
size_t *nwp;
{
size_t offset;
DWORD nw;
- gint ret;
+ int ret;
BOOL success;
u_int8_t *taddr;
@@ -234,7 +234,7 @@ __os_zerofill(dbenv, fhp)
unsigned __int64 stat_offset, write_offset;
size_t blen, nw;
u_int32_t bytes, mbytes;
- gint group_sync, need_free, ret;
+ int group_sync, need_free, ret;
u_int8_t buf[8 * 1024], *bp;
/* Calculate the byte offset of the next write. */
diff --git a/libdb/os_win32/os_seek.c b/libdb/os_win32/os_seek.c
index e697a5a..b26dec8 100644
--- a/libdb/os_win32/os_seek.c
+++ b/libdb/os_win32/os_seek.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include "db_int.h"
@@ -17,14 +17,14 @@ static const gchar revid[] = "$Id$";
* __os_seek --
* Seek to a page/byte offset in the file.
*/
-gint
+int
__os_seek(dbenv, fhp, pgsize, pageno, relative, isrewind, db_whence)
DB_ENV *dbenv;
DB_FH *fhp;
size_t pgsize;
db_pgno_t pageno;
u_int32_t relative;
- gint isrewind;
+ int isrewind;
DB_OS_SEEK db_whence;
{
/* Yes, this really is how Microsoft have designed their API */
@@ -35,7 +35,7 @@ __os_seek(dbenv, fhp, pgsize, pageno, relative, isrewind, db_whence)
long high;
};
} offset;
- gint ret, whence;
+ int ret, whence;
DWORD from;
if (DB_GLOBAL(j_seek) != NULL) {
diff --git a/libdb/os_win32/os_sleep.c b/libdb/os_win32/os_sleep.c
index 7249529..18c5a6a 100644
--- a/libdb/os_win32/os_sleep.c
+++ b/libdb/os_win32/os_sleep.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include "db_int.h"
@@ -17,7 +17,7 @@ static const gchar revid[] = "$Id$";
* __os_sleep --
* Yield the processor for a period of time.
*/
-gint
+int
__os_sleep(dbenv, secs, usecs)
DB_ENV *dbenv;
u_long secs, usecs; /* Seconds and microseconds. */
diff --git a/libdb/os_win32/os_spin.c b/libdb/os_win32/os_spin.c
index 8ff7469..4387947 100644
--- a/libdb/os_win32/os_spin.c
+++ b/libdb/os_win32/os_spin.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#include "db_int.h"
@@ -17,7 +17,7 @@ static const gchar revid[] = "$Id$";
* __os_spin --
* Return the number of default spins before blocking.
*/
-gint
+int
__os_spin(dbenv)
DB_ENV *dbenv;
{
diff --git a/libdb/os_win32/os_stat.c b/libdb/os_win32/os_stat.c
index 5968304..1aea275 100644
--- a/libdb/os_win32/os_stat.c
+++ b/libdb/os_win32/os_stat.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,14 +24,14 @@ static const gchar revid[] = "$Id$";
* __os_exists --
* Return if the file exists.
*
- * PUBLIC: gint __os_exists __P((const gchar *, gint *));
+ * PUBLIC: int __os_exists __P((const char *, int *));
*/
-gint
+int
__os_exists(path, isdirp)
- const gchar *path;
- gint *isdirp;
+ const char *path;
+ int *isdirp;
{
- gint ret;
+ int ret;
DWORD attrs;
if (DB_GLOBAL(j_exists) != NULL)
@@ -58,17 +58,17 @@ __os_exists(path, isdirp)
* Return file size and I/O size; abstracted to make it easier
* to replace.
*
- * PUBLIC: gint __os_ioinfo __P((DB_ENV *, const gchar *,
+ * PUBLIC: int __os_ioinfo __P((DB_ENV *, const char *,
* PUBLIC: DB_FH *, u_int32_t *, u_int32_t *, u_int32_t *));
*/
-gint
+int
__os_ioinfo(dbenv, path, fhp, mbytesp, bytesp, iosizep)
DB_ENV *dbenv;
- const gchar *path;
+ const char *path;
DB_FH *fhp;
u_int32_t *mbytesp, *bytesp, *iosizep;
{
- gint ret;
+ int ret;
BY_HANDLE_FILE_INFORMATION bhfi;
unsigned __int64 filesize;
diff --git a/libdb/os_win32/os_type.c b/libdb/os_win32/os_type.c
index 807f833..da51a5c 100644
--- a/libdb/os_win32/os_type.c
+++ b/libdb/os_win32/os_type.c
@@ -9,19 +9,19 @@
#include "db_int_def.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
/*
* __os_is_winnt --
* Return 1 if Windows/NT, otherwise 0.
*
- * PUBLIC: gint __os_is_winnt __P((void));
+ * PUBLIC: int __os_is_winnt __P((void));
*/
-gint
+int
__os_is_winnt()
{
- static gint __os_type = -1;
+ static int __os_type = -1;
/*
* The value of __os_type is computed only once, and cached to
diff --git a/libdb/perl/BerkeleyDB/constants.h b/libdb/perl/BerkeleyDB/constants.h
index ecc0174..d86cef1 100644
--- a/libdb/perl/BerkeleyDB/constants.h
+++ b/libdb/perl/BerkeleyDB/constants.h
@@ -21,7 +21,7 @@ typedef double NV; /* 5.6 and later define NVTYPE, and typedef NV to it. */
#endif
static int
-constant_6 (pTHX_ const gchar *name, IV *iv_return) {
+constant_6 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_DUP DB_PAD DB_RMW DB_SET */
@@ -76,7 +76,7 @@ constant_6 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_7 (pTHX_ const gchar *name, IV *iv_return) {
+constant_7 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_EXCL DB_HASH DB_LAST DB_NEXT DB_PREV */
@@ -145,7 +145,7 @@ constant_7 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_8 (pTHX_ const gchar *name, IV *iv_return) {
+constant_8 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_AFTER DB_BTREE DB_FIRST DB_FLUSH DB_FORCE DB_QUEUE DB_RECNO */
@@ -242,7 +242,7 @@ constant_8 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_9 (pTHX_ const gchar *name, IV *iv_return) {
+constant_9 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_APPEND DB_BEFORE DB_CLIENT DB_COMMIT DB_CREATE DB_CURLSN DB_DIRECT
@@ -423,7 +423,7 @@ constant_9 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_10 (pTHX_ const gchar *name, IV *iv_return) {
+constant_10 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_CONSUME DB_CURRENT DB_DELETED DB_DUPSORT DB_ENCRYPT DB_ENV_CDB
@@ -639,7 +639,7 @@ constant_10 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_11 (pTHX_ const gchar *name, IV *iv_return) {
+constant_11 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_APP_INIT DB_ARCH_ABS DB_ARCH_LOG DB_FIXEDLEN DB_GET_BOTH DB_INIT_CDB
@@ -1010,7 +1010,7 @@ constant_11 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_12 (pTHX_ const gchar *name, IV *iv_return) {
+constant_12 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_ARCH_DATA DB_CDB_ALLDB DB_CL_WRITER DB_DELIMITER DB_DIRECT_DB
@@ -1438,7 +1438,7 @@ constant_12 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_13 (pTHX_ const gchar *name, IV *iv_return) {
+constant_13 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_AGGRESSIVE DB_BTREEMAGIC DB_CHECKPOINT DB_DIRECT_LOG DB_DIRTY_READ
@@ -1817,7 +1817,7 @@ constant_13 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_14 (pTHX_ const gchar *name, IV *iv_return) {
+constant_14 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_AUTO_COMMIT DB_BTREEOLDVER DB_CHKSUM_SHA1 DB_EID_INVALID DB_ENCRYPT_AES
@@ -2287,7 +2287,7 @@ constant_14 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_15 (pTHX_ const gchar *name, IV *iv_return) {
+constant_15 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_APPLY_LOGREG DB_BTREEVERSION DB_CONSUME_WAIT DB_ENV_LOCKDOWN
@@ -2636,7 +2636,7 @@ constant_15 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_16 (pTHX_ const gchar *name, IV *iv_return) {
+constant_16 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_BROADCAST_EID DB_CACHED_COUNTS DB_EID_BROADCAST DB_ENV_CDB_ALLDB
@@ -3071,7 +3071,7 @@ constant_16 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_17 (pTHX_ const gchar *name, IV *iv_return, const gchar **pv_return) {
+constant_17 (pTHX_ const char *name, IV *iv_return, const char **pv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_ENV_DIRECT_LOG DB_ENV_REP_CLIENT DB_ENV_REP_MASTER DB_ENV_STANDALONE
@@ -3252,7 +3252,7 @@ constant_17 (pTHX_ const gchar *name, IV *iv_return, const gchar **pv_return) {
}
static int
-constant_18 (pTHX_ const gchar *name, IV *iv_return) {
+constant_18 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_ALREADY_ABORTED DB_ENV_AUTO_COMMIT DB_ENV_OPEN_CALLED
@@ -3424,7 +3424,7 @@ constant_18 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_19 (pTHX_ const gchar *name, IV *iv_return) {
+constant_19 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_ENV_REP_LOGSONLY DB_LOCK_FREE_LOCKER DB_LOCK_GET_TIMEOUT
@@ -3635,7 +3635,7 @@ constant_19 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_20 (pTHX_ const gchar *name, IV *iv_return) {
+constant_20 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_CXX_NO_EXCEPTIONS DB_LOGFILEID_INVALID DB_PANIC_ENVIRONMENT
@@ -3740,7 +3740,7 @@ constant_20 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_21 (pTHX_ const gchar *name, IV *iv_return) {
+constant_21 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_LOCK_UPGRADE_WRITE DB_PRIORITY_VERY_HIGH DB_TEST_POSTEXTDELETE
@@ -3816,7 +3816,7 @@ constant_21 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant (pTHX_ const gchar *name, STRLEN len, IV *iv_return, const gchar **pv_return) {
+constant (pTHX_ const char *name, STRLEN len, IV *iv_return, const char **pv_return) {
/* Initially switch on the length of the name. */
/* When generated this function returned values for the list of names given
in this section of perl code. Rather than manually editing these functions
diff --git a/libdb/perl/BerkeleyDB/ppport.h b/libdb/perl/BerkeleyDB/ppport.h
index 5d88c2c..c343835 100644
--- a/libdb/perl/BerkeleyDB/ppport.h
+++ b/libdb/perl/BerkeleyDB/ppport.h
@@ -62,9 +62,9 @@
#ifndef dTHR
# ifdef WIN32
-# define dTHR extern gint Perl___notused
+# define dTHR extern int Perl___notused
# else
-# define dTHR extern gint errno
+# define dTHR extern int errno
# endif
#endif
@@ -126,14 +126,14 @@ static SV * newRV_noinc (SV * sv)
#if defined(NEED_newCONSTSUB)
static
#else
-extern void newCONSTSUB _((HV * stash, gchar * name, SV *sv));
+extern void newCONSTSUB _((HV * stash, char * name, SV *sv));
#endif
#if defined(NEED_newCONSTSUB) || defined(NEED_newCONSTSUB_GLOBAL)
void
newCONSTSUB(stash,name,sv)
HV *stash;
-gchar *name;
+char *name;
SV *sv;
{
U32 oldhints = PL_hints;
@@ -154,10 +154,10 @@ SV *sv;
#else
# if (PERL_VERSION == 3) && (PERL_SUBVERSION == 22)
/* 5.003_22 */
- start_subparse(0),
+ start_subparse(0),
# else
/* 5.003_23 onwards */
- start_subparse(FALSE, 0),
+ start_subparse(FALSE, 0),
# endif
#endif
@@ -258,7 +258,7 @@ SV *sv;
#endif
#ifndef dNOOP
-# define dNOOP extern gint Perl___notused PERL_UNUSED_DECL
+# define dNOOP extern int Perl___notused PERL_UNUSED_DECL
#endif
#define START_MY_CXT static my_cxt_t my_cxt;
@@ -289,25 +289,25 @@ SV *sv;
#define DBM_setFilter(db_type,code) \
{ \
if (db_type) \
- RETVAL = sv_mortalcopy(db_type) ; \
+ RETVAL = sv_mortalcopy(db_type) ; \
ST(0) = RETVAL ; \
if (db_type && (code == &PL_sv_undef)) { \
SvREFCNT_dec(db_type) ; \
- db_type = NULL ; \
+ db_type = NULL ; \
} \
else if (code) { \
- if (db_type) \
- sv_setsv(db_type, code) ; \
- else \
- db_type = newSVsv(code) ; \
- } \
+ if (db_type) \
+ sv_setsv(db_type, code) ; \
+ else \
+ db_type = newSVsv(code) ; \
+ } \
}
#define DBM_ckFilter(arg,type,name) \
if (db->type) { \
if (db->filtering) { \
- croak("recursion detected in %s", name) ; \
- } \
+ croak("recursion detected in %s", name) ; \
+ } \
ENTER ; \
SAVETMPS ; \
SAVEINT(db->filtering) ; \
@@ -317,7 +317,7 @@ SV *sv;
SvTEMP_off(arg) ; \
PUSHMARK(SP) ; \
PUTBACK ; \
- (void) perl_call_sv(db->type, G_DISCARD); \
+ (void) perl_call_sv(db->type, G_DISCARD); \
SPAGAIN ; \
PUTBACK ; \
FREETMPS ; \
diff --git a/libdb/perl/DB_File/fallback.h b/libdb/perl/DB_File/fallback.h
index 73daf93..0213308 100644
--- a/libdb/perl/DB_File/fallback.h
+++ b/libdb/perl/DB_File/fallback.h
@@ -21,7 +21,7 @@ typedef double NV; /* 5.6 and later define NVTYPE, and typedef NV to it. */
#endif
static int
-constant_6 (pTHX_ const gchar *name, IV *iv_return) {
+constant_6 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_TXN R_LAST R_NEXT R_PREV */
@@ -76,7 +76,7 @@ constant_6 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_7 (pTHX_ const gchar *name, IV *iv_return) {
+constant_7 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_LOCK R_FIRST R_NOKEY */
@@ -120,7 +120,7 @@ constant_7 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_8 (pTHX_ const gchar *name, IV *iv_return) {
+constant_8 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
DB_SHMEM R_CURSOR R_IAFTER */
@@ -164,7 +164,7 @@ constant_8 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_9 (pTHX_ const gchar *name, IV *iv_return) {
+constant_9 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
HASHMAGIC RET_ERROR R_IBEFORE */
@@ -208,7 +208,7 @@ constant_9 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_10 (pTHX_ const gchar *name, IV *iv_return) {
+constant_10 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
BTREEMAGIC R_FIXEDLEN R_SNAPSHOT __R_UNUSED */
@@ -263,7 +263,7 @@ constant_10 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant_11 (pTHX_ const gchar *name, IV *iv_return) {
+constant_11 (pTHX_ const char *name, IV *iv_return) {
/* When generated this function returned values for the list of names given
here. However, subsequent manual editing may have added or removed some.
HASHVERSION RET_SPECIAL RET_SUCCESS R_RECNOSYNC R_SETCURSOR */
@@ -329,7 +329,7 @@ constant_11 (pTHX_ const gchar *name, IV *iv_return) {
}
static int
-constant (pTHX_ const gchar *name, STRLEN len, IV *iv_return) {
+constant (pTHX_ const char *name, STRLEN len, IV *iv_return) {
/* Initially switch on the length of the name. */
/* When generated this function returned values for the list of names given
in this section of perl code. Rather than manually editing these functions
diff --git a/libdb/perl/DB_File/ppport.h b/libdb/perl/DB_File/ppport.h
index 5d88c2c..c343835 100644
--- a/libdb/perl/DB_File/ppport.h
+++ b/libdb/perl/DB_File/ppport.h
@@ -62,9 +62,9 @@
#ifndef dTHR
# ifdef WIN32
-# define dTHR extern gint Perl___notused
+# define dTHR extern int Perl___notused
# else
-# define dTHR extern gint errno
+# define dTHR extern int errno
# endif
#endif
@@ -126,14 +126,14 @@ static SV * newRV_noinc (SV * sv)
#if defined(NEED_newCONSTSUB)
static
#else
-extern void newCONSTSUB _((HV * stash, gchar * name, SV *sv));
+extern void newCONSTSUB _((HV * stash, char * name, SV *sv));
#endif
#if defined(NEED_newCONSTSUB) || defined(NEED_newCONSTSUB_GLOBAL)
void
newCONSTSUB(stash,name,sv)
HV *stash;
-gchar *name;
+char *name;
SV *sv;
{
U32 oldhints = PL_hints;
@@ -154,10 +154,10 @@ SV *sv;
#else
# if (PERL_VERSION == 3) && (PERL_SUBVERSION == 22)
/* 5.003_22 */
- start_subparse(0),
+ start_subparse(0),
# else
/* 5.003_23 onwards */
- start_subparse(FALSE, 0),
+ start_subparse(FALSE, 0),
# endif
#endif
@@ -258,7 +258,7 @@ SV *sv;
#endif
#ifndef dNOOP
-# define dNOOP extern gint Perl___notused PERL_UNUSED_DECL
+# define dNOOP extern int Perl___notused PERL_UNUSED_DECL
#endif
#define START_MY_CXT static my_cxt_t my_cxt;
@@ -289,25 +289,25 @@ SV *sv;
#define DBM_setFilter(db_type,code) \
{ \
if (db_type) \
- RETVAL = sv_mortalcopy(db_type) ; \
+ RETVAL = sv_mortalcopy(db_type) ; \
ST(0) = RETVAL ; \
if (db_type && (code == &PL_sv_undef)) { \
SvREFCNT_dec(db_type) ; \
- db_type = NULL ; \
+ db_type = NULL ; \
} \
else if (code) { \
- if (db_type) \
- sv_setsv(db_type, code) ; \
- else \
- db_type = newSVsv(code) ; \
- } \
+ if (db_type) \
+ sv_setsv(db_type, code) ; \
+ else \
+ db_type = newSVsv(code) ; \
+ } \
}
#define DBM_ckFilter(arg,type,name) \
if (db->type) { \
if (db->filtering) { \
- croak("recursion detected in %s", name) ; \
- } \
+ croak("recursion detected in %s", name) ; \
+ } \
ENTER ; \
SAVETMPS ; \
SAVEINT(db->filtering) ; \
@@ -317,7 +317,7 @@ SV *sv;
SvTEMP_off(arg) ; \
PUSHMARK(SP) ; \
PUTBACK ; \
- (void) perl_call_sv(db->type, G_DISCARD); \
+ (void) perl_call_sv(db->type, G_DISCARD); \
SPAGAIN ; \
PUTBACK ; \
FREETMPS ; \
diff --git a/libdb/perl/DB_File/version.c b/libdb/perl/DB_File/version.c
index b493df3..09c9a38 100644
--- a/libdb/perl/DB_File/version.c
+++ b/libdb/perl/DB_File/version.c
@@ -44,7 +44,7 @@ __getBerkeleyDBInfo()
SV * compat_sv = perl_get_sv("DB_File::db_185_compat", GV_ADD|GV_ADDMULTI) ;
#ifdef DB_VERSION_MAJOR
- gint Major, Minor, Patch ;
+ int Major, Minor, Patch ;
(void)db_version(&Major, &Minor, &Patch) ;
@@ -61,7 +61,7 @@ __getBerkeleyDBInfo()
Major, Minor, Patch) ;
{
- gchar buffer[40] ;
+ char buffer[40] ;
sprintf(buffer, "%d.%d", Major, Minor) ;
sv_setpv(version_sv, buffer) ;
sprintf(buffer, "%d.%03d%03d", Major, Minor, Patch) ;
diff --git a/libdb/qam/qam.c b/libdb/qam/qam.c
index 81dfb2b..32b3711 100644
--- a/libdb/qam/qam.c
+++ b/libdb/qam/qam.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,34 +25,34 @@ static const gchar revid[] = "$Id$";
#include "dbinc/log.h"
#include "dbinc/qam.h"
-static gint __qam_bulk __P((DBC *, DBT *, u_int32_t));
-static gint __qam_c_close __P((DBC *, db_pgno_t, gint *));
-static gint __qam_c_del __P((DBC *));
-static gint __qam_c_destroy __P((DBC *));
-static gint __qam_c_get __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
-static gint __qam_c_put __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
-static gint __qam_consume __P((DBC *, QMETA *, db_recno_t));
-static gint __qam_getno __P((DB *, const DBT *, db_recno_t *));
+static int __qam_bulk __P((DBC *, DBT *, u_int32_t));
+static int __qam_c_close __P((DBC *, db_pgno_t, int *));
+static int __qam_c_del __P((DBC *));
+static int __qam_c_destroy __P((DBC *));
+static int __qam_c_get __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
+static int __qam_c_put __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
+static int __qam_consume __P((DBC *, QMETA *, db_recno_t));
+static int __qam_getno __P((DB *, const DBT *, db_recno_t *));
/*
* __qam_position --
* Position a queued access method cursor at a record. This returns
* the page locked. *exactp will be set if the record is valid.
- * PUBLIC: gint __qam_position
- * PUBLIC: __P((DBC *, db_recno_t *, qam_position_mode, gint *));
+ * PUBLIC: int __qam_position
+ * PUBLIC: __P((DBC *, db_recno_t *, qam_position_mode, int *));
*/
-gint
+int
__qam_position(dbc, recnop, mode, exactp)
DBC *dbc; /* open cursor */
db_recno_t *recnop; /* pointer to recno to find */
qam_position_mode mode;/* locking: read or write */
- gint *exactp; /* indicate if it was found */
+ int *exactp; /* indicate if it was found */
{
QUEUE_CURSOR *cp;
DB *dbp;
QAMDATA *qp;
db_pgno_t pg;
- gint ret;
+ int ret;
dbp = dbc->dbp;
cp = (QUEUE_CURSOR *)dbc->internal;
@@ -100,10 +100,10 @@ __qam_position(dbc, recnop, mode, exactp)
*
* pagep must be write locked
*
- * PUBLIC: gint __qam_pitem
+ * PUBLIC: int __qam_pitem
* PUBLIC: __P((DBC *, QPAGE *, u_int32_t, db_recno_t, DBT *));
*/
-gint
+int
__qam_pitem(dbc, pagep, indx, recno, data)
DBC *dbc;
QPAGE *pagep;
@@ -117,7 +117,7 @@ __qam_pitem(dbc, pagep, indx, recno, data)
QUEUE *t;
u_int32_t alloced;
u_int8_t *dest, *p;
- gint ret;
+ int ret;
alloced = ret = 0;
@@ -229,7 +229,7 @@ __qam_c_put(dbc, key, data, flags, pgnop)
db_pgno_t pg;
db_recno_t new_cur, new_first;
u_int32_t opcode;
- gint exact, ret, t_ret;
+ int exact, ret, t_ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -359,9 +359,9 @@ __qam_c_put(dbc, key, data, flags, pgnop)
* __qam_append --
* Perform a put(DB_APPEND) in queue.
*
- * PUBLIC: gint __qam_append __P((DBC *, DBT *, DBT *));
+ * PUBLIC: int __qam_append __P((DBC *, DBT *, DBT *));
*/
-gint
+int
__qam_append(dbc, key, data)
DBC *dbc;
DBT *key, *data;
@@ -375,7 +375,7 @@ __qam_append(dbc, key, data)
QUEUE_CURSOR *cp;
db_pgno_t pg;
db_recno_t recno;
- gint ret, t_ret;
+ int ret, t_ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -508,7 +508,7 @@ __qam_c_del(dbc)
QUEUE_CURSOR *cp;
db_pgno_t pg;
db_recno_t first;
- gint exact, ret, t_ret;
+ int exact, ret, t_ret;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -633,8 +633,8 @@ __qam_c_get(dbc, key, data, flags, pgnop)
db_pgno_t metapno;
db_recno_t first;
qam_position_mode mode;
- gint exact, is_first, locked, ret, t_ret, wait, with_delete;
- gint put_mode, meta_dirty, retrying;
+ int exact, is_first, locked, ret, t_ret, wait, with_delete;
+ int put_mode, meta_dirty, retrying;
dbp = dbc->dbp;
dbenv = dbp->dbenv;
@@ -1095,7 +1095,7 @@ __qam_consume(dbc, meta, first)
db_pgno_t save_page;
db_recno_t current, save_recno;
u_int32_t rec_extent;
- gint exact, put_mode, ret, t_ret, wrapped;
+ int exact, put_mode, ret, t_ret, wrapped;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -1271,8 +1271,8 @@ __qam_bulk(dbc, data, flags)
qam_position_mode mode;
int32_t *endp, *offp;
u_int8_t *dbuf, *dp, *np;
- gint exact, recs, re_len, ret, t_ret, valid;
- gint is_key, need_pg, pagesize, size, space;
+ int exact, recs, re_len, ret, t_ret, valid;
+ int is_key, need_pg, pagesize, size, space;
dbp = dbc->dbp;
mpf = dbp->mpf;
@@ -1356,7 +1356,7 @@ get_space:
break;
}
memcpy(dp,
- (gchar *)pg + QPAGE_SZ(dbp), size);
+ (char *)pg + QPAGE_SZ(dbp), size);
need_pg = 0;
space -= size;
np += size;
@@ -1419,7 +1419,7 @@ static int
__qam_c_close(dbc, root_pgno, rmroot)
DBC *dbc;
db_pgno_t root_pgno;
- gint *rmroot;
+ int *rmroot;
{
QUEUE_CURSOR *cp;
@@ -1447,9 +1447,9 @@ __qam_c_close(dbc, root_pgno, rmroot)
* Duplicate a queue cursor, such that the new one holds appropriate
* locks for the position of the original.
*
- * PUBLIC: gint __qam_c_dup __P((DBC *, DBC *));
+ * PUBLIC: int __qam_c_dup __P((DBC *, DBC *));
*/
-gint
+int
__qam_c_dup(orig_dbc, new_dbc)
DBC *orig_dbc, *new_dbc;
{
@@ -1472,15 +1472,15 @@ __qam_c_dup(orig_dbc, new_dbc)
/*
* __qam_c_init
*
- * PUBLIC: gint __qam_c_init __P((DBC *));
+ * PUBLIC: int __qam_c_init __P((DBC *));
*/
-gint
+int
__qam_c_init(dbc)
DBC *dbc;
{
QUEUE_CURSOR *cp;
DB *dbp;
- gint ret;
+ int ret;
dbp = dbc->dbp;
@@ -1547,9 +1547,9 @@ __qam_getno(dbp, key, rep)
* __qam_truncate --
* Truncate a queue database
*
- * PUBLIC: gint __qam_truncate __P((DB *, DB_TXN *, u_int32_t *));
+ * PUBLIC: int __qam_truncate __P((DB *, DB_TXN *, u_int32_t *));
*/
-gint
+int
__qam_truncate(dbp, txn, countp)
DB *dbp;
DB_TXN *txn;
@@ -1560,7 +1560,7 @@ __qam_truncate(dbp, txn, countp)
DB_MPOOLFILE *mpf;
QMETA *meta;
db_pgno_t metapno;
- gint count, ret, t_ret;
+ int count, ret, t_ret;
mpf = dbp->mpf;
diff --git a/libdb/qam/qam_auto.c b/libdb/qam/qam_auto.c
index 37b7292..784598a 100644
--- a/libdb/qam/qam_auto.c
+++ b/libdb/qam/qam_auto.c
@@ -19,10 +19,10 @@
#include "dbinc/txn.h"
/*
- * PUBLIC: gint __qam_incfirst_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __qam_incfirst_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, db_recno_t, db_pgno_t));
*/
-gint
+int
__qam_incfirst_log(dbp, txnid, ret_lsnp, flags, recno, meta_pgno)
DB *dbp;
DB_TXN *txnid;
@@ -36,7 +36,7 @@ __qam_incfirst_log(dbp, txnid, ret_lsnp, flags, recno, meta_pgno)
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -116,16 +116,16 @@ __qam_incfirst_log(dbp, txnid, ret_lsnp, flags, recno, meta_pgno)
}
/*
- * PUBLIC: gint __qam_incfirst_getpgnos __P((DB_ENV *, DBT *,
- * PUBLIC: DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __qam_incfirst_getpgnos __P((DB_ENV *, DBT *,
+ * PUBLIC: DB_LSN *, db_recops, void *));
*/
-gint
+int
__qam_incfirst_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -162,19 +162,19 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __qam_incfirst_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __qam_incfirst_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__qam_incfirst_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__qam_incfirst_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -198,19 +198,19 @@ __qam_incfirst_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __qam_incfirst_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int __qam_incfirst_read __P((DB_ENV *, void *,
* PUBLIC: __qam_incfirst_args **));
*/
-gint
+int
__qam_incfirst_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__qam_incfirst_args **argpp;
{
__qam_incfirst_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__qam_incfirst_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -245,11 +245,11 @@ __qam_incfirst_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __qam_mvptr_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __qam_mvptr_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, u_int32_t, db_recno_t, db_recno_t, db_recno_t,
* PUBLIC: db_recno_t, DB_LSN *, db_pgno_t));
*/
-gint
+int
__qam_mvptr_log(dbp, txnid, ret_lsnp, flags,
opcode, old_first, new_first, old_cur, new_cur,
metalsn, meta_pgno)
@@ -270,7 +270,7 @@ __qam_mvptr_log(dbp, txnid, ret_lsnp, flags,
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -377,16 +377,16 @@ __qam_mvptr_log(dbp, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __qam_mvptr_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __qam_mvptr_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__qam_mvptr_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -423,19 +423,19 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __qam_mvptr_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __qam_mvptr_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__qam_mvptr_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__qam_mvptr_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -465,18 +465,18 @@ __qam_mvptr_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __qam_mvptr_read __P((DB_ENV *, gpointer , __qam_mvptr_args **));
+ * PUBLIC: int __qam_mvptr_read __P((DB_ENV *, void *, __qam_mvptr_args **));
*/
-gint
+int
__qam_mvptr_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__qam_mvptr_args **argpp;
{
__qam_mvptr_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__qam_mvptr_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -530,10 +530,10 @@ __qam_mvptr_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __qam_del_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __qam_del_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_recno_t));
*/
-gint
+int
__qam_del_log(dbp, txnid, ret_lsnp, flags, lsn, pgno, indx, recno)
DB *dbp;
DB_TXN *txnid;
@@ -549,7 +549,7 @@ __qam_del_log(dbp, txnid, ret_lsnp, flags, lsn, pgno, indx, recno)
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -641,16 +641,16 @@ __qam_del_log(dbp, txnid, ret_lsnp, flags, lsn, pgno, indx, recno)
}
/*
- * PUBLIC: gint __qam_del_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __qam_del_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__qam_del_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -687,19 +687,19 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __qam_del_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __qam_del_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__qam_del_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__qam_del_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -726,18 +726,18 @@ __qam_del_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __qam_del_read __P((DB_ENV *, gpointer , __qam_del_args **));
+ * PUBLIC: int __qam_del_read __P((DB_ENV *, void *, __qam_del_args **));
*/
-gint
+int
__qam_del_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__qam_del_args **argpp;
{
__qam_del_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__qam_del_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -779,11 +779,11 @@ __qam_del_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __qam_add_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __qam_add_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_recno_t,
* PUBLIC: const DBT *, u_int32_t, const DBT *));
*/
-gint
+int
__qam_add_log(dbp, txnid, ret_lsnp, flags, lsn, pgno, indx, recno, data,
vflag, olddata)
DB *dbp;
@@ -804,7 +804,7 @@ __qam_add_log(dbp, txnid, ret_lsnp, flags, lsn, pgno, indx, recno, data,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -925,16 +925,16 @@ __qam_add_log(dbp, txnid, ret_lsnp, flags, lsn, pgno, indx, recno, data,
}
/*
- * PUBLIC: gint __qam_add_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __qam_add_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__qam_add_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
DB *dbp;
TXN_RECS *t;
@@ -971,21 +971,21 @@ err: if (argp != NULL)
}
/*
- * PUBLIC: gint __qam_add_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __qam_add_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__qam_add_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__qam_add_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -1025,18 +1025,18 @@ __qam_add_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __qam_add_read __P((DB_ENV *, gpointer , __qam_add_args **));
+ * PUBLIC: int __qam_add_read __P((DB_ENV *, void *, __qam_add_args **));
*/
-gint
+int
__qam_add_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__qam_add_args **argpp;
{
__qam_add_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__qam_add_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -1094,11 +1094,11 @@ __qam_add_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __qam_delext_log __P((DB *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __qam_delext_log __P((DB *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_recno_t,
* PUBLIC: const DBT *));
*/
-gint
+int
__qam_delext_log(dbp, txnid, ret_lsnp, flags, lsn, pgno, indx, recno, data)
DB *dbp;
DB_TXN *txnid;
@@ -1116,7 +1116,7 @@ __qam_delext_log(dbp, txnid, ret_lsnp, flags, lsn, pgno, indx, recno, data)
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
dbenv = dbp->dbenv;
@@ -1220,19 +1220,19 @@ __qam_delext_log(dbp, txnid, ret_lsnp, flags, lsn, pgno, indx, recno, data)
}
/*
- * PUBLIC: gint __qam_delext_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __qam_delext_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__qam_delext_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -1253,21 +1253,21 @@ __qam_delext_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __qam_delext_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __qam_delext_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__qam_delext_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__qam_delext_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -1300,18 +1300,18 @@ __qam_delext_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __qam_delext_read __P((DB_ENV *, gpointer , __qam_delext_args **));
+ * PUBLIC: int __qam_delext_read __P((DB_ENV *, void *, __qam_delext_args **));
*/
-gint
+int
__qam_delext_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__qam_delext_args **argpp;
{
__qam_delext_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__qam_delext_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -1359,16 +1359,16 @@ __qam_delext_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __qam_init_print __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __qam_init_print __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__qam_init_print(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__qam_incfirst_print, DB___qam_incfirst)) != 0)
@@ -1389,16 +1389,16 @@ __qam_init_print(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __qam_init_getpgnos __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __qam_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__qam_init_getpgnos(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__qam_incfirst_getpgnos, DB___qam_incfirst)) != 0)
@@ -1419,16 +1419,16 @@ __qam_init_getpgnos(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __qam_init_recover __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __qam_init_recover __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__qam_init_recover(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__qam_incfirst_recover, DB___qam_incfirst)) != 0)
diff --git a/libdb/qam/qam_conv.c b/libdb/qam/qam_conv.c
index d1fca20..02dbc32 100644
--- a/libdb/qam/qam_conv.c
+++ b/libdb/qam/qam_conv.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,9 +24,9 @@ static const gchar revid[] = "$Id$";
* __qam_mswap --
* Swap the bytes on the queue metadata page.
*
- * PUBLIC: gint __qam_mswap __P((PAGE *));
+ * PUBLIC: int __qam_mswap __P((PAGE *));
*/
-gint
+int
__qam_mswap(pg)
PAGE *pg;
{
@@ -54,13 +54,13 @@ __qam_mswap(pg)
* stored on disk.
* We only need to fix up a few fields in the header
*
- * PUBLIC: gint __qam_pgin_out __P((DB_ENV *, db_pgno_t, gpointer , DBT *));
+ * PUBLIC: int __qam_pgin_out __P((DB_ENV *, db_pgno_t, void *, DBT *));
*/
-gint
+int
__qam_pgin_out(dbenv, pg, pp, cookie)
DB_ENV *dbenv;
db_pgno_t pg;
- gpointer pp;
+ void *pp;
DBT *cookie;
{
DB_PGINFO *pginfo;
diff --git a/libdb/qam/qam_files.c b/libdb/qam/qam_files.c
index cae02af..e7b77f3 100644
--- a/libdb/qam/qam_files.c
+++ b/libdb/qam/qam_files.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -28,14 +28,14 @@ static const gchar revid[] = "$Id$";
*
* Calculate which extent the page is in, open and create if necessary.
*
- * PUBLIC: gint __qam_fprobe
- * PUBLIC: __P((DB *, db_pgno_t, gpointer , qam_probe_mode, u_int32_t));
+ * PUBLIC: int __qam_fprobe
+ * PUBLIC: __P((DB *, db_pgno_t, void *, qam_probe_mode, u_int32_t));
*/
-gint
+int
__qam_fprobe(dbp, pgno, addrp, mode, flags)
DB *dbp;
db_pgno_t pgno;
- gpointer addrp;
+ void *addrp;
qam_probe_mode mode;
u_int32_t flags;
{
@@ -45,8 +45,8 @@ __qam_fprobe(dbp, pgno, addrp, mode, flags)
QUEUE *qp;
u_int8_t fid[DB_FILE_ID_LEN];
u_int32_t extid, maxext, openflags;
- gchar buf[MAXPATHLEN];
- gint numext, offset, oldext, ret;
+ char buf[MAXPATHLEN];
+ int numext, offset, oldext, ret;
dbenv = dbp->dbenv;
qp = (QUEUE *)dbp->q_internal;
@@ -247,9 +247,9 @@ err:
* Calculate which extent the page is in and close it.
* We assume the mpf entry is present.
*
- * PUBLIC: gint __qam_fclose __P((DB *, db_pgno_t));
+ * PUBLIC: int __qam_fclose __P((DB *, db_pgno_t));
*/
-gint
+int
__qam_fclose(dbp, pgnoaddr)
DB *dbp;
db_pgno_t pgnoaddr;
@@ -259,7 +259,7 @@ __qam_fclose(dbp, pgnoaddr)
MPFARRAY *array;
QUEUE *qp;
u_int32_t extid;
- gint offset, ret;
+ int offset, ret;
ret = 0;
dbenv = dbp->dbenv;
@@ -295,9 +295,9 @@ done:
* to remove an extent without probing it first and seeing that is is empty
* so we assume the mpf entry is present.
*
- * PUBLIC: gint __qam_fremove __P((DB *, db_pgno_t));
+ * PUBLIC: int __qam_fremove __P((DB *, db_pgno_t));
*/
-gint
+int
__qam_fremove(dbp, pgnoaddr)
DB *dbp;
db_pgno_t pgnoaddr;
@@ -308,9 +308,9 @@ __qam_fremove(dbp, pgnoaddr)
QUEUE *qp;
u_int32_t extid;
#if CONFIG_TEST
- gchar buf[MAXPATHLEN], *real_name;
+ char buf[MAXPATHLEN], *real_name;
#endif
- gint offset, ret;
+ int offset, ret;
qp = (QUEUE *)dbp->q_internal;
dbenv = dbp->dbenv;
@@ -378,9 +378,9 @@ err:
* __qam_sync --
* Flush the database cache.
*
- * PUBLIC: gint __qam_sync __P((DB *, u_int32_t));
+ * PUBLIC: int __qam_sync __P((DB *, u_int32_t));
*/
-gint
+int
__qam_sync(dbp, flags)
DB *dbp;
u_int32_t flags;
@@ -392,7 +392,7 @@ __qam_sync(dbp, flags)
QUEUE_FILELIST *filelist;
struct __qmpf *mpfp;
u_int32_t i;
- gint done, ret;
+ int done, ret;
dbenv = dbp->dbenv;
mpf = dbp->mpf;
@@ -466,9 +466,9 @@ err:
* Another thread may close the handle so this should only
* be used single threaded or with care.
*
- * PUBLIC: gint __qam_gen_filelist __P(( DB *, QUEUE_FILELIST **));
+ * PUBLIC: int __qam_gen_filelist __P(( DB *, QUEUE_FILELIST **));
*/
-gint
+int
__qam_gen_filelist(dbp, filelistp)
DB *dbp;
QUEUE_FILELIST **filelistp;
@@ -480,7 +480,7 @@ __qam_gen_filelist(dbp, filelistp)
db_pgno_t i, last, start;
db_recno_t current, first;
QUEUE_FILELIST *fp;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
mpf = dbp->mpf;
@@ -542,19 +542,19 @@ again: for (; i <= last; i += qp->page_ext) {
/*
* __qam_extent_names -- generate a list of extent files names.
*
- * PUBLIC: gint __qam_extent_names __P((DB_ENV *, gchar *, gchar ***));
+ * PUBLIC: int __qam_extent_names __P((DB_ENV *, char *, char ***));
*/
-gint
+int
__qam_extent_names(dbenv, name, namelistp)
DB_ENV *dbenv;
- gchar *name;
- gchar ***namelistp;
+ char *name;
+ char ***namelistp;
{
DB *dbp;
QUEUE *qp;
QUEUE_FILELIST *filelist, *fp;
- gchar buf[MAXPATHLEN], *dir, **cp, *freep;
- gint cnt, len, ret;
+ char buf[MAXPATHLEN], *dir, **cp, *freep;
+ int cnt, len, ret;
*namelistp = NULL;
filelist = NULL;
@@ -587,7 +587,7 @@ __qam_extent_names(dbenv, name, namelistp)
__os_malloc(dbp->dbenv, len, namelistp)) != 0)
goto done;
cp = *namelistp;
- freep = (gchar *)(cp + cnt + 1);
+ freep = (char *)(cp + cnt + 1);
for (fp = filelist; fp->mpf != NULL; fp++) {
snprintf(buf, sizeof(buf),
QUEUE_EXTENT, dir, PATH_SEPARATOR[0], name, fp->id);
@@ -626,7 +626,7 @@ __qam_exid(dbp, fidp, exnum)
u_int8_t *fidp;
u_int32_t exnum;
{
- gint i;
+ int i;
u_int8_t *p;
/* Copy the fileid from the master. */
diff --git a/libdb/qam/qam_method.c b/libdb/qam/qam_method.c
index 57c4c69..f51bad4 100644
--- a/libdb/qam/qam_method.c
+++ b/libdb/qam/qam_method.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -26,7 +26,7 @@ static const gchar revid[] = "$Id$";
#include "dbinc/qam.h"
#include "dbinc/txn.h"
-static gint __qam_set_extentsize __P((DB *, u_int32_t));
+static int __qam_set_extentsize __P((DB *, u_int32_t));
struct __qam_cookie {
DB_LSN lsn;
@@ -37,14 +37,14 @@ struct __qam_cookie {
* __qam_db_create --
* Queue specific initialization of the DB structure.
*
- * PUBLIC: gint __qam_db_create __P((DB *));
+ * PUBLIC: int __qam_db_create __P((DB *));
*/
-gint
+int
__qam_db_create(dbp)
DB *dbp;
{
QUEUE *t;
- gint ret;
+ int ret;
/* Allocate and initialize the private queue structure. */
if ((ret = __os_calloc(dbp->dbenv, 1, sizeof(QUEUE), &t)) != 0)
@@ -61,9 +61,9 @@ __qam_db_create(dbp)
* __qam_db_close --
* Queue specific discard of the DB structure.
*
- * PUBLIC: gint __qam_db_close __P((DB *));
+ * PUBLIC: int __qam_db_close __P((DB *));
*/
-gint
+int
__qam_db_close(dbp)
DB *dbp;
{
@@ -72,7 +72,7 @@ __qam_db_close(dbp)
QUEUE *t;
struct __qmpf *mpfp;
u_int32_t i;
- gint ret, t_ret;
+ int ret, t_ret;
ret = 0;
if ((t = dbp->q_internal) == NULL)
@@ -127,9 +127,9 @@ __qam_set_extentsize(dbp, extentsize)
* __db_prqueue --
* Print out a queue
*
- * PUBLIC: gint __db_prqueue __P((DB *, FILE *, u_int32_t));
+ * PUBLIC: int __db_prqueue __P((DB *, FILE *, u_int32_t));
*/
-gint
+int
__db_prqueue(dbp, fp, flags)
DB *dbp;
FILE *fp;
@@ -139,7 +139,7 @@ __db_prqueue(dbp, fp, flags)
PAGE *h;
QMETA *meta;
db_pgno_t first, i, last, pg_ext, stop;
- gint ret, t_ret;
+ int ret, t_ret;
mpf = dbp->mpf;
@@ -198,14 +198,14 @@ begin:
* __qam_remove
* Remove method for a Queue.
*
- * PUBLIC: gint __qam_remove __P((DB *,
- * PUBLIC: DB_TXN *, const gchar *, const gchar *, DB_LSN *));
+ * PUBLIC: int __qam_remove __P((DB *,
+ * PUBLIC: DB_TXN *, const char *, const char *, DB_LSN *));
*/
-gint
+int
__qam_remove(dbp, txn, name, subdb, lsnp)
DB *dbp;
DB_TXN *txn;
- const gchar *name, *subdb;
+ const char *name, *subdb;
DB_LSN *lsnp;
{
DB_ENV *dbenv;
@@ -213,8 +213,8 @@ __qam_remove(dbp, txn, name, subdb, lsnp)
MPFARRAY *ap;
QUEUE *qp;
QUEUE_FILELIST *filelist, *fp;
- gint ret, needclose, t_ret;
- gchar buf[MAXPATHLEN];
+ int ret, needclose, t_ret;
+ char buf[MAXPATHLEN];
u_int8_t fid[DB_FILE_ID_LEN];
COMPQUIET(lsnp, NULL);
@@ -319,23 +319,23 @@ err: if (filelist != NULL)
* __qam_rename
* Rename method for Queue.
*
- * PUBLIC: gint __qam_rename __P((DB *, DB_TXN *,
- * PUBLIC: const gchar *, const gchar *, const gchar *));
+ * PUBLIC: int __qam_rename __P((DB *, DB_TXN *,
+ * PUBLIC: const char *, const char *, const char *));
*/
-gint
+int
__qam_rename(dbp, txn, filename, subdb, newname)
DB *dbp;
DB_TXN *txn;
- const gchar *filename, *subdb, *newname;
+ const char *filename, *subdb, *newname;
{
DB_ENV *dbenv;
DB *tmpdbp;
MPFARRAY *ap;
QUEUE *qp;
QUEUE_FILELIST *fp, *filelist;
- gchar buf[MAXPATHLEN], nbuf[MAXPATHLEN];
- gchar *namep;
- gint ret, needclose, t_ret;
+ char buf[MAXPATHLEN], nbuf[MAXPATHLEN];
+ char *namep;
+ int ret, needclose, t_ret;
u_int8_t fid[DB_FILE_ID_LEN], *fidp;
dbenv = dbp->dbenv;
diff --git a/libdb/qam/qam_open.c b/libdb/qam/qam_open.c
index 62dc132..c31b091 100644
--- a/libdb/qam/qam_open.c
+++ b/libdb/qam/qam_open.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -27,21 +27,21 @@ static const gchar revid[] = "$Id$";
#include "dbinc/qam.h"
#include "dbinc/fop.h"
-static gint __qam_init_meta __P((DB *, QMETA *));
+static int __qam_init_meta __P((DB *, QMETA *));
/*
* __qam_open
*
- * PUBLIC: gint __qam_open __P((DB *,
- * PUBLIC: DB_TXN *, const gchar *, db_pgno_t, int, u_int32_t));
+ * PUBLIC: int __qam_open __P((DB *,
+ * PUBLIC: DB_TXN *, const char *, db_pgno_t, int, u_int32_t));
*/
-gint
+int
__qam_open(dbp, txn, name, base_pgno, mode, flags)
DB *dbp;
DB_TXN *txn;
- const gchar *name;
+ const char *name;
db_pgno_t base_pgno;
- gint mode;
+ int mode;
u_int32_t flags;
{
DBC *dbc;
@@ -50,7 +50,7 @@ __qam_open(dbp, txn, name, base_pgno, mode, flags)
DB_MPOOLFILE *mpf;
QMETA *qmeta;
QUEUE *t;
- gint ret, t_ret;
+ int ret, t_ret;
dbenv = dbp->dbenv;
mpf = dbp->mpf;
@@ -147,17 +147,17 @@ err: if (qmeta != NULL && (t_ret = mpf->put(mpf, qmeta, 0)) != 0 && ret == 0)
/*
* __qam_metachk --
*
- * PUBLIC: gint __qam_metachk __P((DB *, const gchar *, QMETA *));
+ * PUBLIC: int __qam_metachk __P((DB *, const char *, QMETA *));
*/
-gint
+int
__qam_metachk(dbp, name, qmeta)
DB *dbp;
- const gchar *name;
+ const char *name;
QMETA *qmeta;
{
DB_ENV *dbenv;
u_int32_t vers;
- gint ret;
+ int ret;
dbenv = dbp->dbenv;
ret = 0;
@@ -267,14 +267,14 @@ __qam_init_meta(dbp, meta)
* memory or calls mpf->get), 2) the initialization, and 3) the "put page"
* chunk which either does a fop write or an mpf->put.
*
- * PUBLIC: gint __qam_new_file __P((DB *, DB_TXN *, DB_FH *, const gchar *));
+ * PUBLIC: int __qam_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
*/
-gint
+int
__qam_new_file(dbp, txn, fhp, name)
DB *dbp;
DB_TXN *txn;
DB_FH *fhp;
- const gchar *name;
+ const char *name;
{
QMETA *meta;
DB_ENV *dbenv;
@@ -282,8 +282,8 @@ __qam_new_file(dbp, txn, fhp, name)
DB_PGINFO pginfo;
DBT pdbt;
db_pgno_t pgno;
- gint ret;
- gpointer buf;
+ int ret;
+ void *buf;
dbenv = dbp->dbenv;
mpf = dbp->mpf;
diff --git a/libdb/qam/qam_rec.c b/libdb/qam/qam_rec.c
index b6dc64c..439ecf0 100644
--- a/libdb/qam/qam_rec.c
+++ b/libdb/qam/qam_rec.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -29,16 +29,16 @@ static const gchar revid[] = "$Id$";
* __qam_incfirst_recover --
* Recovery function for incfirst.
*
- * PUBLIC: gint __qam_incfirst_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __qam_incfirst_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__qam_incfirst_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__qam_incfirst_args *argp;
DB *file_dbp;
@@ -48,7 +48,7 @@ __qam_incfirst_recover(dbenv, dbtp, lsnp, op, info)
QMETA *meta;
QUEUE_CURSOR *cp;
db_pgno_t metapg;
- gint exact, modified, ret, rec_ext;
+ int exact, modified, ret, rec_ext;
COMPQUIET(info, NULL);
REC_PRINT(__qam_incfirst_print);
@@ -141,16 +141,16 @@ out: REC_CLOSE;
* __qam_mvptr_recover --
* Recovery function for mvptr.
*
- * PUBLIC: gint __qam_mvptr_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __qam_mvptr_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__qam_mvptr_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__qam_mvptr_args *argp;
DB *file_dbp;
@@ -159,7 +159,7 @@ __qam_mvptr_recover(dbenv, dbtp, lsnp, op, info)
DB_MPOOLFILE *mpf;
QMETA *meta;
db_pgno_t metapg;
- gint cmp_n, cmp_p, modified, ret;
+ int cmp_n, cmp_p, modified, ret;
COMPQUIET(info, NULL);
REC_PRINT(__qam_mvptr_print);
@@ -232,16 +232,16 @@ out: REC_CLOSE;
* Recovery function for del.
* Non-extent version or if there is no data (zero len).
*
- * PUBLIC: gint __qam_del_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __qam_del_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__qam_del_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__qam_del_args *argp;
DB *file_dbp;
@@ -252,7 +252,7 @@ __qam_del_recover(dbenv, dbtp, lsnp, op, info)
QMETA *meta;
QPAGE *pagep;
db_pgno_t metapg;
- gint cmp_n, modified, ret;
+ int cmp_n, modified, ret;
COMPQUIET(info, NULL);
REC_PRINT(__qam_del_print);
@@ -331,16 +331,16 @@ out: REC_CLOSE;
* __qam_delext_recover --
* Recovery function for del in an extent based queue.
*
- * PUBLIC: gint __qam_delext_recover __P((DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __qam_delext_recover __P((DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__qam_delext_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__qam_delext_args *argp;
DB *file_dbp;
@@ -351,7 +351,7 @@ __qam_delext_recover(dbenv, dbtp, lsnp, op, info)
QMETA *meta;
QPAGE *pagep;
db_pgno_t metapg;
- gint cmp_n, modified, ret;
+ int cmp_n, modified, ret;
COMPQUIET(info, NULL);
REC_PRINT(__qam_delext_print);
@@ -440,16 +440,16 @@ out: REC_CLOSE;
* __qam_add_recover --
* Recovery function for add.
*
- * PUBLIC: gint __qam_add_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __qam_add_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__qam_add_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__qam_add_args *argp;
DB *file_dbp;
@@ -459,7 +459,7 @@ __qam_add_recover(dbenv, dbtp, lsnp, op, info)
QMETA *meta;
QPAGE *pagep;
db_pgno_t metapg;
- gint cmp_n, meta_dirty, modified, ret;
+ int cmp_n, meta_dirty, modified, ret;
COMPQUIET(info, NULL);
REC_PRINT(__qam_add_print);
diff --git a/libdb/qam/qam_stat.c b/libdb/qam/qam_stat.c
index a8a5331..ad7b1fb 100644
--- a/libdb/qam/qam_stat.c
+++ b/libdb/qam/qam_stat.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -29,12 +29,12 @@ static const gchar revid[] = "$Id$";
* __qam_stat --
* Gather/print the qam statistics
*
- * PUBLIC: gint __qam_stat __P((DB *, gpointer , u_int32_t));
+ * PUBLIC: int __qam_stat __P((DB *, void *, u_int32_t));
*/
-gint
+int
__qam_stat(dbp, spp, flags)
DB *dbp;
- gpointer spp;
+ void *spp;
u_int32_t flags;
{
DBC *dbc;
@@ -48,7 +48,7 @@ __qam_stat(dbp, spp, flags)
db_indx_t indx;
db_pgno_t first, last, pgno, pg_ext, stop;
u_int32_t re_len;
- gint ret, t_ret;
+ int ret, t_ret;
PANIC_CHECK(dbp->dbenv);
DB_ILLEGAL_BEFORE_OPEN(dbp, "DB->stat");
diff --git a/libdb/qam/qam_upgrade.c b/libdb/qam/qam_upgrade.c
index 59cc40a..a30fa67 100644
--- a/libdb/qam/qam_upgrade.c
+++ b/libdb/qam/qam_upgrade.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -24,12 +24,12 @@ static const gchar revid[] = "$Id$";
* __qam_31_qammeta --
* Upgrade the database from version 1 to version 2.
*
- * PUBLIC: gint __qam_31_qammeta __P((DB *, gchar *, u_int8_t *));
+ * PUBLIC: int __qam_31_qammeta __P((DB *, char *, u_int8_t *));
*/
-gint
+int
__qam_31_qammeta(dbp, real_name, buf)
DB *dbp;
- gchar *real_name;
+ char *real_name;
u_int8_t *buf;
{
QMETA31 *newmeta;
@@ -68,12 +68,12 @@ __qam_31_qammeta(dbp, real_name, buf)
* __qam_32_qammeta --
* Upgrade the database from version 2 to version 3.
*
- * PUBLIC: gint __qam_32_qammeta __P((DB *, gchar *, u_int8_t *));
+ * PUBLIC: int __qam_32_qammeta __P((DB *, char *, u_int8_t *));
*/
-gint
+int
__qam_32_qammeta(dbp, real_name, buf)
DB *dbp;
- gchar *real_name;
+ char *real_name;
u_int8_t *buf;
{
QMETA32 *newmeta;
diff --git a/libdb/qam/qam_verify.c b/libdb/qam/qam_verify.c
index 3619ac9..49b36d0 100644
--- a/libdb/qam/qam_verify.c
+++ b/libdb/qam/qam_verify.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -26,10 +26,10 @@ static const gchar revid[] = "$Id$";
* __qam_vrfy_meta --
* Verify the queue-specific part of a metadata page.
*
- * PUBLIC: gint __qam_vrfy_meta __P((DB *, VRFY_DBINFO *, QMETA *,
+ * PUBLIC: int __qam_vrfy_meta __P((DB *, VRFY_DBINFO *, QMETA *,
* PUBLIC: db_pgno_t, u_int32_t));
*/
-gint
+int
__qam_vrfy_meta(dbp, vdp, meta, pgno, flags)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -38,7 +38,7 @@ __qam_vrfy_meta(dbp, vdp, meta, pgno, flags)
u_int32_t flags;
{
VRFY_PAGEINFO *pip;
- gint isbad, ret, t_ret;
+ int isbad, ret, t_ret;
if ((ret = __db_vrfy_getpageinfo(vdp, pgno, &pip)) != 0)
return (ret);
@@ -93,10 +93,10 @@ err: if ((t_ret =
* __qam_vrfy_data --
* Verify a queue data page.
*
- * PUBLIC: gint __qam_vrfy_data __P((DB *, VRFY_DBINFO *, QPAGE *,
+ * PUBLIC: int __qam_vrfy_data __P((DB *, VRFY_DBINFO *, QPAGE *,
* PUBLIC: db_pgno_t, u_int32_t));
*/
-gint
+int
__qam_vrfy_data(dbp, vdp, h, pgno, flags)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -147,9 +147,9 @@ __qam_vrfy_data(dbp, vdp, h, pgno, flags)
* __qam_vrfy_structure --
* Verify a queue database structure, such as it is.
*
- * PUBLIC: gint __qam_vrfy_structure __P((DB *, VRFY_DBINFO *, u_int32_t));
+ * PUBLIC: int __qam_vrfy_structure __P((DB *, VRFY_DBINFO *, u_int32_t));
*/
-gint
+int
__qam_vrfy_structure(dbp, vdp, flags)
DB *dbp;
VRFY_DBINFO *vdp;
@@ -157,7 +157,7 @@ __qam_vrfy_structure(dbp, vdp, flags)
{
VRFY_PAGEINFO *pip;
db_pgno_t i;
- gint ret, isbad;
+ int ret, isbad;
isbad = 0;
diff --git a/libdb/rep/rep_method.c b/libdb/rep/rep_method.c
index e9c4e20..6857c89 100644
--- a/libdb/rep/rep_method.c
+++ b/libdb/rep/rep_method.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -34,33 +34,33 @@ static const gchar revid[] = "$Id$";
#include "dbinc_auto/rpc_client_ext.h"
#endif
-static gint __rep_abort_prepared __P((DB_ENV *));
-static gint __rep_bt_cmp __P((DB *, const DBT *, const DBT *));
-static gint __rep_client_dbinit __P((DB_ENV *, int));
-static gint __rep_elect __P((DB_ENV *, int, int, u_int32_t, gint *));
-static gint __rep_elect_init __P((DB_ENV *, DB_LSN *, int, int, int, gint *));
-static gint __rep_flush __P((DB_ENV *));
-static gint __rep_restore_prepared __P((DB_ENV *));
-static gint __rep_set_limit __P((DB_ENV *, u_int32_t, u_int32_t));
-static gint __rep_set_request __P((DB_ENV *, u_int32_t, u_int32_t));
-static gint __rep_set_rep_transport __P((DB_ENV *, int,
- gint (*)(DB_ENV *, const DBT *, const DBT *, int, u_int32_t)));
-static gint __rep_start __P((DB_ENV *, DBT *, u_int32_t));
-static gint __rep_stat __P((DB_ENV *, DB_REP_STAT **, u_int32_t));
-static gint __rep_wait __P((DB_ENV *, u_int32_t, gint *, u_int32_t));
+static int __rep_abort_prepared __P((DB_ENV *));
+static int __rep_bt_cmp __P((DB *, const DBT *, const DBT *));
+static int __rep_client_dbinit __P((DB_ENV *, int));
+static int __rep_elect __P((DB_ENV *, int, int, u_int32_t, int *));
+static int __rep_elect_init __P((DB_ENV *, DB_LSN *, int, int, int, int *));
+static int __rep_flush __P((DB_ENV *));
+static int __rep_restore_prepared __P((DB_ENV *));
+static int __rep_set_limit __P((DB_ENV *, u_int32_t, u_int32_t));
+static int __rep_set_request __P((DB_ENV *, u_int32_t, u_int32_t));
+static int __rep_set_rep_transport __P((DB_ENV *, int,
+ int (*)(DB_ENV *, const DBT *, const DBT *, int, u_int32_t)));
+static int __rep_start __P((DB_ENV *, DBT *, u_int32_t));
+static int __rep_stat __P((DB_ENV *, DB_REP_STAT **, u_int32_t));
+static int __rep_wait __P((DB_ENV *, u_int32_t, int *, u_int32_t));
/*
* __rep_dbenv_create --
* Replication-specific initialization of the DB_ENV structure.
*
- * PUBLIC: gint __rep_dbenv_create __P((DB_ENV *));
+ * PUBLIC: int __rep_dbenv_create __P((DB_ENV *));
*/
-gint
+int
__rep_dbenv_create(dbenv)
DB_ENV *dbenv;
{
DB_REP *db_rep;
- gint ret;
+ int ret;
#ifdef HAVE_RPC
if (F_ISSET(dbenv, DB_ENV_RPCCLIENT)) {
@@ -120,7 +120,7 @@ __rep_start(dbenv, dbt, flags)
DB_LSN lsn;
DB_REP *db_rep;
REP *rep;
- gint announce, init_db, redo_prepared, ret;
+ int announce, init_db, redo_prepared, ret;
PANIC_CHECK(dbenv);
ENV_ILLEGAL_BEFORE_OPEN(dbenv, "rep_start");
@@ -288,11 +288,11 @@ __rep_start(dbenv, dbt, flags)
static int
__rep_client_dbinit(dbenv, startup)
DB_ENV *dbenv;
- gint startup;
+ int startup;
{
DB_REP *db_rep;
DB *dbp;
- gint ret, t_ret;
+ int ret, t_ret;
u_int32_t flags;
PANIC_CHECK(dbenv);
@@ -400,7 +400,7 @@ __rep_abort_prepared(dbenv)
DB_PREPLIST prep[PREPLISTSIZE], *p;
DB_TXNMGR *mgr;
DB_TXNREGION *region;
- gint do_aborts, ret;
+ int do_aborts, ret;
long count, i;
u_int32_t op;
@@ -451,9 +451,9 @@ __rep_restore_prepared(dbenv)
__txn_ckp_args *ckp_args;
__txn_regop_args *regop_args;
__txn_xa_regop_args *prep_args;
- gint ret, t_ret;
+ int ret, t_ret;
u_int32_t hi_txn, low_txn, rectype;
- gpointer txninfo;
+ void *txninfo;
txninfo = NULL;
ckp_args = NULL;
@@ -709,8 +709,8 @@ __rep_set_request(dbenv, min, max)
static int
__rep_set_rep_transport(dbenv, eid, f_send)
DB_ENV *dbenv;
- gint eid;
- gint (*f_send) __P((DB_ENV *, const DBT *, const DBT *, int, u_int32_t));
+ int eid;
+ int (*f_send) __P((DB_ENV *, const DBT *, const DBT *, int, u_int32_t));
{
DB_REP *db_rep;
@@ -748,15 +748,15 @@ __rep_set_rep_transport(dbenv, eid, f_send)
static int
__rep_elect(dbenv, nsites, priority, timeout, eidp)
DB_ENV *dbenv;
- gint nsites, priority;
+ int nsites, priority;
u_int32_t timeout;
- gint *eidp;
+ int *eidp;
{
DB_LOG *dblp;
DB_LSN lsn;
DB_REP *db_rep;
REP *rep;
- gint in_progress, ret, send_vote, tiebreaker;
+ int in_progress, ret, send_vote, tiebreaker;
u_int32_t pid, sec, usec;
PANIC_CHECK(dbenv);
@@ -900,11 +900,11 @@ static int
__rep_elect_init(dbenv, lsnp, nsites, priority, tiebreaker, beginp)
DB_ENV *dbenv;
DB_LSN *lsnp;
- gint nsites, priority, tiebreaker, *beginp;
+ int nsites, priority, tiebreaker, *beginp;
{
DB_REP *db_rep;
REP *rep;
- gint ret, *tally;
+ int ret, *tally;
db_rep = dbenv->rep_handle;
rep = db_rep->region;
@@ -970,12 +970,12 @@ static int
__rep_wait(dbenv, timeout, eidp, flags)
DB_ENV *dbenv;
u_int32_t timeout;
- gint *eidp;
+ int *eidp;
u_int32_t flags;
{
DB_REP *db_rep;
REP *rep;
- gint done, ret;
+ int done, ret;
u_int32_t sleeptime;
done = 0;
@@ -1022,7 +1022,7 @@ __rep_flush(dbenv)
DBT rec;
DB_LOGC *logc;
DB_LSN lsn;
- gint ret, t_ret;
+ int ret, t_ret;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv, dbenv->tx_handle, "rep_stat", DB_INIT_TXN);
@@ -1060,7 +1060,7 @@ __rep_stat(dbenv, statp, flags)
LOG *lp;
REP *rep;
u_int32_t queued;
- gint ret;
+ int ret;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv, dbenv->tx_handle, "rep_stat", DB_INIT_TXN);
diff --git a/libdb/rep/rep_record.c b/libdb/rep/rep_record.c
index 53dbfb8..4025fa6 100644
--- a/libdb/rep/rep_record.c
+++ b/libdb/rep/rep_record.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -23,10 +23,10 @@ static const gchar revid[] = "$Id$";
#include "dbinc/rep.h"
#include "dbinc/txn.h"
-static gint __rep_apply __P((DB_ENV *, REP_CONTROL *, DBT *));
-static gint __rep_collect_txn __P((DB_ENV *, DB_LSN *, LSN_COLLECTION *));
-static gint __rep_lsn_cmp __P((gconstpointer , gconstpointer ));
-static gint __rep_newfile __P((DB_ENV *, REP_CONTROL *, DBT *, DB_LSN *));
+static int __rep_apply __P((DB_ENV *, REP_CONTROL *, DBT *));
+static int __rep_collect_txn __P((DB_ENV *, DB_LSN *, LSN_COLLECTION *));
+static int __rep_lsn_cmp __P((const void *, const void *));
+static int __rep_newfile __P((DB_ENV *, REP_CONTROL *, DBT *, DB_LSN *));
#define IS_SIMPLE(R) ((R) != DB___txn_regop && \
(R) != DB___txn_ckp && (R) != DB___dbreg_register)
@@ -42,13 +42,13 @@ static gint __rep_newfile __P((DB_ENV *, REP_CONTROL *, DBT *, DB_LSN *));
* in the case of a DB_NEWMASTER message, returns the eid
* of the new master.
*
- * PUBLIC: gint __rep_process_message __P((DB_ENV *, DBT *, DBT *, gint *));
+ * PUBLIC: int __rep_process_message __P((DB_ENV *, DBT *, DBT *, int *));
*/
-gint
+int
__rep_process_message(dbenv, control, rec, eidp)
DB_ENV *dbenv;
DBT *control, *rec;
- gint *eidp;
+ int *eidp;
{
DB_LOG *dblp;
DB_LOGC *logc;
@@ -60,8 +60,8 @@ __rep_process_message(dbenv, control, rec, eidp)
REP_CONTROL *rp;
REP_VOTE_INFO *vi;
u_int32_t bytes, gen, gbytes, type, unused;
- gint check_limit, cmp, done, do_req, i;
- gint master, old, recovering, ret, t_ret, *tally;
+ int check_limit, cmp, done, do_req, i;
+ int master, old, recovering, ret, t_ret, *tally;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv, dbenv->tx_handle, "rep_stat", DB_INIT_TXN);
@@ -331,7 +331,7 @@ send: ret = __rep_send_message(dbenv, *eidp,
* There are three different cases here.
* 1. We asked for a particular LSN and got it.
* 2. We asked for an LSN of X,0 which is invalid and got the
- * first log record in a particular file.
+ * first log record in a particular file.
* 3. We asked for an LSN and it's not found because it is
* beyond the end of a log file and we need a NEWFILE msg.
*/
@@ -765,7 +765,7 @@ __rep_apply(dbenv, rp, rec)
REP *rep;
REP_CONTROL lsn_rc;
u_int32_t rectype, txnid;
- gint cmp, do_req, eid, have_mutex, ret, t_ret;
+ int cmp, do_req, eid, have_mutex, ret, t_ret;
db_rep = dbenv->rep_handle;
rep = db_rep->region;
@@ -1249,9 +1249,9 @@ err: if (dbc != NULL && (t_ret = dbc->c_close(dbc)) != 0 && ret == 0)
* This is the routine that actually gets a transaction ready for
* processing.
*
- * PUBLIC: gint __rep_process_txn __P((DB_ENV *, DBT *));
+ * PUBLIC: int __rep_process_txn __P((DB_ENV *, DBT *));
*/
-gint
+int
__rep_process_txn(dbenv, rec)
DB_ENV *dbenv;
DBT *rec;
@@ -1266,10 +1266,10 @@ __rep_process_txn(dbenv, rec)
__txn_regop_args *txn_args;
__txn_xa_regop_args *prep_args;
u_int32_t lockid, op, rectype;
- gint i, ret, t_ret;
- gint (**dtab)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int i, ret, t_ret;
+ int (**dtab)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t dtabsize;
- gpointer txninfo;
+ void *txninfo;
db_rep = dbenv->rep_handle;
rep = db_rep->region;
@@ -1405,7 +1405,7 @@ __rep_collect_txn(dbenv, lsnp, lc)
DB_LSN c_lsn;
DBT data;
u_int32_t rectype;
- gint nalloc, ret, t_ret;
+ int nalloc, ret, t_ret;
memset(&data, 0, sizeof(data));
F_SET(&data, DB_DBT_REALLOC);
@@ -1463,7 +1463,7 @@ err: if ((t_ret = logc->close(logc, 0)) != 0 && ret == 0)
*/
static int
__rep_lsn_cmp(lsn1, lsn2)
- gconstpointer lsn1, *lsn2;
+ const void *lsn1, *lsn2;
{
return (log_compare((DB_LSN *)lsn1, (DB_LSN *)lsn2));
diff --git a/libdb/rep/rep_region.c b/libdb/rep/rep_region.c
index 08f2317..f766fd9 100644
--- a/libdb/rep/rep_region.c
+++ b/libdb/rep/rep_region.c
@@ -7,7 +7,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -23,9 +23,9 @@ static const gchar revid[] = "$Id$";
* __rep_region_init --
* Initialize the shared memory state for the replication system.
*
- * PUBLIC: gint __rep_region_init __P((DB_ENV *));
+ * PUBLIC: int __rep_region_init __P((DB_ENV *));
*/
-gint
+int
__rep_region_init(dbenv)
DB_ENV *dbenv;
{
@@ -34,7 +34,7 @@ __rep_region_init(dbenv)
DB_MUTEX *db_mutexp;
DB_REP *db_rep;
REP *rep;
- gint ret;
+ int ret;
db_rep = dbenv->rep_handle;
infop = dbenv->reginfo;
@@ -106,14 +106,14 @@ err: MUTEX_UNLOCK(dbenv, &renv->mutex);
* __rep_region_destroy --
* Destroy any system resources allocated in the replication region.
*
- * PUBLIC: gint __rep_region_destroy __P((DB_ENV *));
+ * PUBLIC: int __rep_region_destroy __P((DB_ENV *));
*/
-gint
+int
__rep_region_destroy(dbenv)
DB_ENV *dbenv;
{
DB_REP *db_rep;
- gint ret, t_ret;
+ int ret, t_ret;
ret = t_ret = 0;
db_rep = (DB_REP *)dbenv->rep_handle;
@@ -132,9 +132,9 @@ __rep_region_destroy(dbenv)
* __rep_dbenv_close --
* Replication-specific destruction of the DB_ENV structure.
*
- * PUBLIC: gint __rep_dbenv_close __P((DB_ENV *));
+ * PUBLIC: int __rep_dbenv_close __P((DB_ENV *));
*/
-gint
+int
__rep_dbenv_close(dbenv)
DB_ENV *dbenv;
{
@@ -156,16 +156,16 @@ __rep_dbenv_close(dbenv)
* actually closing the environment, close all databases we've opened
* while applying messages.
*
- * PUBLIC: gint __rep_preclose __P((DB_ENV *, int));
+ * PUBLIC: int __rep_preclose __P((DB_ENV *, int));
*/
-gint
+int
__rep_preclose(dbenv, do_closefiles)
DB_ENV *dbenv;
- gint do_closefiles;
+ int do_closefiles;
{
DB *dbp;
DB_REP *db_rep;
- gint ret, t_ret;
+ int ret, t_ret;
ret = t_ret = 0;
diff --git a/libdb/rep/rep_util.c b/libdb/rep/rep_util.c
index f994901..0f16100 100644
--- a/libdb/rep/rep_util.c
+++ b/libdb/rep/rep_util.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -31,8 +31,8 @@ static const gchar revid[] = "$Id$";
* Miscellaneous replication-related utility functions, including
* those called by other subsystems.
*/
-static gint __rep_cmp_bylsn __P((gconstpointer , gconstpointer ));
-static gint __rep_cmp_bypage __P((gconstpointer , gconstpointer ));
+static int __rep_cmp_bylsn __P((const void *, const void *));
+static int __rep_cmp_bypage __P((const void *, const void *));
#ifdef REP_DIAGNOSTIC
static void __rep_print_logmsg __P((DB_ENV *, const DBT *, DB_LSN *));
@@ -44,15 +44,15 @@ static void __rep_print_logmsg __P((DB_ENV *, const DBT *, DB_LSN *));
* (This function is called by the __*_getpgnos() functions in
* *.src.)
*
- * PUBLIC: gint __rep_check_alloc __P((DB_ENV *, TXN_RECS *, int));
+ * PUBLIC: int __rep_check_alloc __P((DB_ENV *, TXN_RECS *, int));
*/
-gint
+int
__rep_check_alloc(dbenv, r, n)
DB_ENV *dbenv;
TXN_RECS *r;
- gint n;
+ int n;
{
- gint nalloc, ret;
+ int nalloc, ret;
while (r->nalloc < r->npages + n) {
nalloc = r->nalloc == 0 ? 20 : r->nalloc * 2;
@@ -72,13 +72,13 @@ __rep_check_alloc(dbenv, r, n)
* This is a wrapper for sending a message. It takes care of constructing
* the REP_CONTROL structure and calling the user's specified send function.
*
- * PUBLIC: gint __rep_send_message __P((DB_ENV *, int,
+ * PUBLIC: int __rep_send_message __P((DB_ENV *, int,
* PUBLIC: u_int32_t, DB_LSN *, const DBT *, u_int32_t));
*/
-gint
+int
__rep_send_message(dbenv, eid, rtype, lsnp, dbtp, flags)
DB_ENV *dbenv;
- gint eid;
+ int eid;
u_int32_t rtype;
DB_LSN *lsnp;
const DBT *dbtp;
@@ -89,7 +89,7 @@ __rep_send_message(dbenv, eid, rtype, lsnp, dbtp, flags)
DBT cdbt, scrap_dbt;
REP_CONTROL cntrl;
u_int32_t send_flags;
- gint ret;
+ int ret;
db_rep = dbenv->rep_handle;
rep = db_rep->region;
@@ -157,8 +157,8 @@ __rep_print_logmsg(dbenv, logdbt, lsnp)
DB_LSN *lsnp;
{
/* Static structures to hold the printing functions. */
- static gint (**ptab)__P((DB_ENV *,
- DBT *, DB_LSN *, db_recops, gpointer )) = NULL;
+ static int (**ptab)__P((DB_ENV *,
+ DBT *, DB_LSN *, db_recops, void *)) = NULL;
size_t ptabsize = 0;
if (ptabsize == 0) {
@@ -188,13 +188,13 @@ __rep_print_logmsg(dbenv, logdbt, lsnp)
* need to enforce that in __rep_process_record, but right now, we have
* no way to identify the master.
*
- * PUBLIC: gint __rep_new_master __P((DB_ENV *, REP_CONTROL *, int));
+ * PUBLIC: int __rep_new_master __P((DB_ENV *, REP_CONTROL *, int));
*/
-gint
+int
__rep_new_master(dbenv, cntrl, eid)
DB_ENV *dbenv;
REP_CONTROL *cntrl;
- gint eid;
+ int eid;
{
DB_LOG *dblp;
DB_LOGC *logc;
@@ -203,7 +203,7 @@ __rep_new_master(dbenv, cntrl, eid)
DBT dbt;
LOG *lp;
REP *rep;
- gint change, ret, t_ret;
+ int change, ret, t_ret;
db_rep = dbenv->rep_handle;
rep = db_rep->region;
@@ -281,17 +281,17 @@ empty: MUTEX_LOCK(dbenv, db_rep->mutexp);
* __rep_lockpgno_init
* Create a dispatch table for acquiring locks on each log record.
*
- * PUBLIC: gint __rep_lockpgno_init __P((DB_ENV *,
- * PUBLIC: gint (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ),
+ * PUBLIC: int __rep_lockpgno_init __P((DB_ENV *,
+ * PUBLIC: int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *),
* PUBLIC: size_t *));
*/
-gint
+int
__rep_lockpgno_init(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
/* Initialize dispatch table. */
*dtabsizep = 0;
@@ -313,9 +313,9 @@ __rep_lockpgno_init(dbenv, dtabp, dtabsizep)
* __rep_unlockpages --
* Unlock the pages locked in __rep_lockpages.
*
- * PUBLIC: gint __rep_unlockpages __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __rep_unlockpages __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__rep_unlockpages(dbenv, lid)
DB_ENV *dbenv;
u_int32_t lid;
@@ -335,14 +335,14 @@ __rep_unlockpages(dbenv, lid)
* to the joint LSN. A non-NULL max_lsn means that we are applying
* a transaction whose commit is at max_lsn.
*
- * PUBLIC: gint __rep_lockpages __P((DB_ENV *,
- * PUBLIC: gint (**)(DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ),
+ * PUBLIC: int __rep_lockpages __P((DB_ENV *,
+ * PUBLIC: int (**)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *),
* PUBLIC: size_t, DB_LSN *, DB_LSN *, TXN_RECS *, u_int32_t));
*/
-gint
+int
__rep_lockpages(dbenv, dtab, dtabsize, key_lsn, max_lsn, recs, lid)
DB_ENV *dbenv;
- gint (**dtab)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (**dtab)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t dtabsize;
DB_LSN *key_lsn, *max_lsn;
TXN_RECS *recs;
@@ -356,7 +356,7 @@ __rep_lockpages(dbenv, dtab, dtabsize, key_lsn, max_lsn, recs, lid)
TXN_RECS tmp, *t;
db_pgno_t cur_pgno;
linfo_t locks;
- gint i, ret, t_ret, unique;
+ int i, ret, t_ret, unique;
u_int32_t cur_fid;
/*
@@ -526,7 +526,7 @@ out2: if ((ret != 0 || recs == NULL) && t->nalloc != 0) {
*/
static int
__rep_cmp_bypage(a, b)
- gconstpointer a, *b;
+ const void *a, *b;
{
LSN_PAGE *ap, *bp;
@@ -562,7 +562,7 @@ __rep_cmp_bypage(a, b)
static int
__rep_cmp_bylsn(a, b)
- gconstpointer a, *b;
+ const void *a, *b;
{
LSN_PAGE *ap, *bp;
@@ -601,15 +601,15 @@ __rep_cmp_bylsn(a, b)
* Used by other subsystems to figure out if this is a replication
* client sites.
*
- * PUBLIC: gint __rep_is_client __P((DB_ENV *));
+ * PUBLIC: int __rep_is_client __P((DB_ENV *));
*/
-gint
+int
__rep_is_client(dbenv)
DB_ENV *dbenv;
{
DB_REP *db_rep;
REP *rep;
- gint ret;
+ int ret;
if ((db_rep = dbenv->rep_handle) == NULL)
return (0);
@@ -625,13 +625,13 @@ __rep_is_client(dbenv)
* __rep_send_vote
* Send this site's vote for the election.
*
- * PUBLIC: gint __rep_send_vote __P((DB_ENV *, DB_LSN *, int, int, int));
+ * PUBLIC: int __rep_send_vote __P((DB_ENV *, DB_LSN *, int, int, int));
*/
-gint
+int
__rep_send_vote(dbenv, lsnp, nsites, pri, tiebreaker)
DB_ENV *dbenv;
DB_LSN *lsnp;
- gint nsites, pri, tiebreaker;
+ int nsites, pri, tiebreaker;
{
DBT vote_dbt;
REP_VOTE_INFO vi;
@@ -657,17 +657,17 @@ __rep_send_vote(dbenv, lsnp, nsites, pri, tiebreaker)
* we need to make sure that we *never* acquire those mutexes in the
* opposite order.
*
- * PUBLIC: gint __rep_grow_sites __P((DB_ENV *dbenv, gint nsites));
+ * PUBLIC: int __rep_grow_sites __P((DB_ENV *dbenv, int nsites));
*/
-gint
+int
__rep_grow_sites(dbenv, nsites)
DB_ENV *dbenv;
- gint nsites;
+ int nsites;
{
REGENV *renv;
REGINFO *infop;
REP *rep;
- gint nalloc, ret, *tally;
+ int nalloc, ret, *tally;
rep = ((DB_REP *)dbenv->rep_handle)->region;
@@ -697,7 +697,7 @@ __rep_grow_sites(dbenv, nsites)
}
#ifdef NOTYET
-static gint __rep_send_file __P((DB_ENV *, DBT *, u_int32_t));
+static int __rep_send_file __P((DB_ENV *, DBT *, u_int32_t));
/*
* __rep_send_file --
* Send an entire file, one block at a time.
@@ -715,7 +715,7 @@ __rep_send_file(dbenv, rec, eid)
DBT rec_dbt;
PAGE *pagep;
db_pgno_t last_pgno, pgno;
- gint ret, t_ret;
+ int ret, t_ret;
dbp = NULL;
dbc = NULL;
@@ -776,16 +776,16 @@ err: if (LOCK_ISSET(lk) && (t_ret = __LPUT(dbc, lk)) != 0 && ret == 0)
#if 0
/*
- * PUBLIC: void __rep_print_message __P((DB_ENV *, int, REP_CONTROL *, gchar *));
+ * PUBLIC: void __rep_print_message __P((DB_ENV *, int, REP_CONTROL *, char *));
*/
void
__rep_print_message(dbenv, eid, rp, str)
DB_ENV *dbenv;
- gint eid;
+ int eid;
REP_CONTROL *rp;
- gchar *str;
+ char *str;
{
- gchar *type;
+ char *type;
switch (rp->rectype) {
case REP_ALIVE:
type = "alive";
diff --git a/libdb/rpc_client/client.c b/libdb/rpc_client/client.c
index 92ee188..bc6b9f6 100644
--- a/libdb/rpc_client/client.c
+++ b/libdb/rpc_client/client.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifdef HAVE_RPC
@@ -34,21 +34,21 @@ static const gchar revid[] = "$Id$";
#include "dbinc_auto/db_server.h"
#include "dbinc_auto/rpc_client_ext.h"
-static gint __dbcl_c_destroy __P((DBC *));
-static gint __dbcl_txn_close __P((DB_ENV *));
+static int __dbcl_c_destroy __P((DBC *));
+static int __dbcl_txn_close __P((DB_ENV *));
/*
* __dbcl_envrpcserver --
* Initialize an environment's server.
*
- * PUBLIC: gint __dbcl_envrpcserver
- * PUBLIC: __P((DB_ENV *, gpointer , const gchar *, long, long, u_int32_t));
+ * PUBLIC: int __dbcl_envrpcserver
+ * PUBLIC: __P((DB_ENV *, void *, const char *, long, long, u_int32_t));
*/
-gint
+int
__dbcl_envrpcserver(dbenv, clnt, host, tsec, ssec, flags)
DB_ENV *dbenv;
- gpointer clnt;
- const gchar *host;
+ void *clnt;
+ const char *host;
long tsec, ssec;
u_int32_t flags;
{
@@ -72,15 +72,15 @@ __dbcl_envrpcserver(dbenv, clnt, host, tsec, ssec, flags)
* did not pass us a client structure to begin with.
*/
if (clnt == NULL) {
- if ((cl = clnt_create((gchar *)host, DB_RPC_SERVERPROG,
+ if ((cl = clnt_create((char *)host, DB_RPC_SERVERPROG,
DB_RPC_SERVERVERS, "tcp")) == NULL) {
- __db_err(dbenv, clnt_spcreateerror((gchar *)host));
+ __db_err(dbenv, clnt_spcreateerror((char *)host));
return (DB_NOSERVER);
}
if (tsec != 0) {
tp.tv_sec = tsec;
tp.tv_usec = 0;
- (void)clnt_control(cl, CLSET_TIMEOUT, (gchar *)&tp);
+ (void)clnt_control(cl, CLSET_TIMEOUT, (char *)&tp);
}
} else {
cl = (CLIENT *)clnt;
@@ -97,17 +97,17 @@ __dbcl_envrpcserver(dbenv, clnt, host, tsec, ssec, flags)
* We need a wrapper function to deal with DB_USE_ENVIRON* flags
* and we don't want to complicate the generated code for env_open.
*
- * PUBLIC: gint __dbcl_env_open_wrap
- * PUBLIC: __P((DB_ENV *, const gchar *, u_int32_t, int));
+ * PUBLIC: int __dbcl_env_open_wrap
+ * PUBLIC: __P((DB_ENV *, const char *, u_int32_t, int));
*/
-gint
+int
__dbcl_env_open_wrap(dbenv, home, flags, mode)
DB_ENV * dbenv;
- const gchar * home;
+ const char * home;
u_int32_t flags;
- gint mode;
+ int mode;
{
- gint ret;
+ int ret;
if (LF_ISSET(DB_THREAD)) {
__db_err(dbenv, "DB_THREAD not allowed on RPC clients");
@@ -124,19 +124,19 @@ __dbcl_env_open_wrap(dbenv, home, flags, mode)
* We need a wrapper function to error on DB_THREAD flag.
* and we don't want to complicate the generated code.
*
- * PUBLIC: gint __dbcl_db_open_wrap
- * PUBLIC: __P((DB *, DB_TXN *, const gchar *, const gchar *,
+ * PUBLIC: int __dbcl_db_open_wrap
+ * PUBLIC: __P((DB *, DB_TXN *, const char *, const char *,
* PUBLIC: DBTYPE, u_int32_t, int));
*/
-gint
+int
__dbcl_db_open_wrap(dbp, txnp, name, subdb, type, flags, mode)
DB * dbp;
DB_TXN * txnp;
- const gchar * name;
- const gchar * subdb;
+ const char * name;
+ const char * subdb;
DBTYPE type;
u_int32_t flags;
- gint mode;
+ int mode;
{
if (LF_ISSET(DB_THREAD)) {
__db_err(dbp->dbenv, "DB_THREAD not allowed on RPC clients");
@@ -149,14 +149,14 @@ __dbcl_db_open_wrap(dbp, txnp, name, subdb, type, flags, mode)
* __dbcl_refresh --
* Clean up an environment.
*
- * PUBLIC: gint __dbcl_refresh __P((DB_ENV *));
+ * PUBLIC: int __dbcl_refresh __P((DB_ENV *));
*/
-gint
+int
__dbcl_refresh(dbenv)
DB_ENV *dbenv;
{
CLIENT *cl;
- gint ret;
+ int ret;
cl = (CLIENT *)dbenv->cl_handle;
@@ -185,19 +185,19 @@ __dbcl_refresh(dbenv)
* Copy the returned data into the user's DBT, handling allocation flags,
* but not DB_DBT_PARTIAL.
*
- * PUBLIC: gint __dbcl_retcopy __P((DB_ENV *, DBT *,
- * PUBLIC: gpointer , u_int32_t, gpointer *, u_int32_t *));
+ * PUBLIC: int __dbcl_retcopy __P((DB_ENV *, DBT *,
+ * PUBLIC: void *, u_int32_t, void **, u_int32_t *));
*/
-gint
+int
__dbcl_retcopy(dbenv, dbt, data, len, memp, memsize)
DB_ENV *dbenv;
DBT *dbt;
- gpointer data;
+ void *data;
u_int32_t len;
- gpointer *memp;
+ void **memp;
u_int32_t *memsize;
{
- gint ret;
+ int ret;
u_int32_t orig_flags;
/*
@@ -215,13 +215,13 @@ __dbcl_retcopy(dbenv, dbt, data, len, memp, memsize)
* __dbcl_txn_close --
* Clean up an environment's transactions.
*/
-gint
+int
__dbcl_txn_close(dbenv)
DB_ENV *dbenv;
{
DB_TXN *txnp;
DB_TXNMGR *tmgrp;
- gint ret;
+ int ret;
ret = 0;
tmgrp = dbenv->tx_handle;
@@ -377,16 +377,16 @@ __dbcl_c_refresh(dbc)
* __dbcl_c_setup --
* Allocate a cursor.
*
- * PUBLIC: gint __dbcl_c_setup __P((long, DB *, DBC **));
+ * PUBLIC: int __dbcl_c_setup __P((long, DB *, DBC **));
*/
-gint
+int
__dbcl_c_setup(cl_id, dbp, dbcp)
long cl_id;
DB *dbp;
DBC **dbcp;
{
DBC *dbc, tmpdbc;
- gint ret;
+ int ret;
if ((dbc = TAILQ_FIRST(&dbp->free_queue)) != NULL)
TAILQ_REMOVE(&dbp->free_queue, dbc, links);
@@ -422,13 +422,13 @@ __dbcl_c_setup(cl_id, dbp, dbcp)
* __dbcl_dbclose_common --
* Common code for closing/cleaning a dbp.
*
- * PUBLIC: gint __dbcl_dbclose_common __P((DB *));
+ * PUBLIC: int __dbcl_dbclose_common __P((DB *));
*/
-gint
+int
__dbcl_dbclose_common(dbp)
DB *dbp;
{
- gint ret, t_ret;
+ int ret, t_ret;
DBC *dbc;
/*
diff --git a/libdb/rpc_client/db_server_clnt.c b/libdb/rpc_client/db_server_clnt.c
index b8c1f2e..9b57a23 100644
--- a/libdb/rpc_client/db_server_clnt.c
+++ b/libdb/rpc_client/db_server_clnt.c
@@ -25,7 +25,7 @@ __db_env_cachesize_4001(argp, clnt)
{
static __env_cachesize_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_env_cachesize,
(xdrproc_t) xdr___env_cachesize_msg, (caddr_t) argp,
(xdrproc_t) xdr___env_cachesize_reply, (caddr_t) &clnt_res,
@@ -42,7 +42,7 @@ __db_env_close_4001(argp, clnt)
{
static __env_close_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_env_close,
(xdrproc_t) xdr___env_close_msg, (caddr_t) argp,
(xdrproc_t) xdr___env_close_reply, (caddr_t) &clnt_res,
@@ -59,7 +59,7 @@ __db_env_create_4001(argp, clnt)
{
static __env_create_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_env_create,
(xdrproc_t) xdr___env_create_msg, (caddr_t) argp,
(xdrproc_t) xdr___env_create_reply, (caddr_t) &clnt_res,
@@ -76,7 +76,7 @@ __db_env_dbremove_4001(argp, clnt)
{
static __env_dbremove_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_env_dbremove,
(xdrproc_t) xdr___env_dbremove_msg, (caddr_t) argp,
(xdrproc_t) xdr___env_dbremove_reply, (caddr_t) &clnt_res,
@@ -93,7 +93,7 @@ __db_env_dbrename_4001(argp, clnt)
{
static __env_dbrename_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_env_dbrename,
(xdrproc_t) xdr___env_dbrename_msg, (caddr_t) argp,
(xdrproc_t) xdr___env_dbrename_reply, (caddr_t) &clnt_res,
@@ -110,7 +110,7 @@ __db_env_encrypt_4001(argp, clnt)
{
static __env_encrypt_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_env_encrypt,
(xdrproc_t) xdr___env_encrypt_msg, (caddr_t) argp,
(xdrproc_t) xdr___env_encrypt_reply, (caddr_t) &clnt_res,
@@ -127,7 +127,7 @@ __db_env_flags_4001(argp, clnt)
{
static __env_flags_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_env_flags,
(xdrproc_t) xdr___env_flags_msg, (caddr_t) argp,
(xdrproc_t) xdr___env_flags_reply, (caddr_t) &clnt_res,
@@ -144,7 +144,7 @@ __db_env_open_4001(argp, clnt)
{
static __env_open_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_env_open,
(xdrproc_t) xdr___env_open_msg, (caddr_t) argp,
(xdrproc_t) xdr___env_open_reply, (caddr_t) &clnt_res,
@@ -161,7 +161,7 @@ __db_env_remove_4001(argp, clnt)
{
static __env_remove_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_env_remove,
(xdrproc_t) xdr___env_remove_msg, (caddr_t) argp,
(xdrproc_t) xdr___env_remove_reply, (caddr_t) &clnt_res,
@@ -178,7 +178,7 @@ __db_txn_abort_4001(argp, clnt)
{
static __txn_abort_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_txn_abort,
(xdrproc_t) xdr___txn_abort_msg, (caddr_t) argp,
(xdrproc_t) xdr___txn_abort_reply, (caddr_t) &clnt_res,
@@ -195,7 +195,7 @@ __db_txn_begin_4001(argp, clnt)
{
static __txn_begin_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_txn_begin,
(xdrproc_t) xdr___txn_begin_msg, (caddr_t) argp,
(xdrproc_t) xdr___txn_begin_reply, (caddr_t) &clnt_res,
@@ -212,7 +212,7 @@ __db_txn_commit_4001(argp, clnt)
{
static __txn_commit_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_txn_commit,
(xdrproc_t) xdr___txn_commit_msg, (caddr_t) argp,
(xdrproc_t) xdr___txn_commit_reply, (caddr_t) &clnt_res,
@@ -229,7 +229,7 @@ __db_txn_discard_4001(argp, clnt)
{
static __txn_discard_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_txn_discard,
(xdrproc_t) xdr___txn_discard_msg, (caddr_t) argp,
(xdrproc_t) xdr___txn_discard_reply, (caddr_t) &clnt_res,
@@ -246,7 +246,7 @@ __db_txn_prepare_4001(argp, clnt)
{
static __txn_prepare_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_txn_prepare,
(xdrproc_t) xdr___txn_prepare_msg, (caddr_t) argp,
(xdrproc_t) xdr___txn_prepare_reply, (caddr_t) &clnt_res,
@@ -263,7 +263,7 @@ __db_txn_recover_4001(argp, clnt)
{
static __txn_recover_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_txn_recover,
(xdrproc_t) xdr___txn_recover_msg, (caddr_t) argp,
(xdrproc_t) xdr___txn_recover_reply, (caddr_t) &clnt_res,
@@ -280,7 +280,7 @@ __db_db_associate_4001(argp, clnt)
{
static __db_associate_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_associate,
(xdrproc_t) xdr___db_associate_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_associate_reply, (caddr_t) &clnt_res,
@@ -297,7 +297,7 @@ __db_db_bt_maxkey_4001(argp, clnt)
{
static __db_bt_maxkey_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_bt_maxkey,
(xdrproc_t) xdr___db_bt_maxkey_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_bt_maxkey_reply, (caddr_t) &clnt_res,
@@ -314,7 +314,7 @@ __db_db_bt_minkey_4001(argp, clnt)
{
static __db_bt_minkey_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_bt_minkey,
(xdrproc_t) xdr___db_bt_minkey_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_bt_minkey_reply, (caddr_t) &clnt_res,
@@ -331,7 +331,7 @@ __db_db_close_4001(argp, clnt)
{
static __db_close_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_close,
(xdrproc_t) xdr___db_close_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_close_reply, (caddr_t) &clnt_res,
@@ -348,7 +348,7 @@ __db_db_create_4001(argp, clnt)
{
static __db_create_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_create,
(xdrproc_t) xdr___db_create_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_create_reply, (caddr_t) &clnt_res,
@@ -365,7 +365,7 @@ __db_db_del_4001(argp, clnt)
{
static __db_del_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_del,
(xdrproc_t) xdr___db_del_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_del_reply, (caddr_t) &clnt_res,
@@ -382,7 +382,7 @@ __db_db_encrypt_4001(argp, clnt)
{
static __db_encrypt_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_encrypt,
(xdrproc_t) xdr___db_encrypt_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_encrypt_reply, (caddr_t) &clnt_res,
@@ -399,7 +399,7 @@ __db_db_extentsize_4001(argp, clnt)
{
static __db_extentsize_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_extentsize,
(xdrproc_t) xdr___db_extentsize_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_extentsize_reply, (caddr_t) &clnt_res,
@@ -416,7 +416,7 @@ __db_db_flags_4001(argp, clnt)
{
static __db_flags_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_flags,
(xdrproc_t) xdr___db_flags_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_flags_reply, (caddr_t) &clnt_res,
@@ -433,7 +433,7 @@ __db_db_get_4001(argp, clnt)
{
static __db_get_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_get,
(xdrproc_t) xdr___db_get_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_get_reply, (caddr_t) &clnt_res,
@@ -450,7 +450,7 @@ __db_db_h_ffactor_4001(argp, clnt)
{
static __db_h_ffactor_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_h_ffactor,
(xdrproc_t) xdr___db_h_ffactor_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_h_ffactor_reply, (caddr_t) &clnt_res,
@@ -467,7 +467,7 @@ __db_db_h_nelem_4001(argp, clnt)
{
static __db_h_nelem_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_h_nelem,
(xdrproc_t) xdr___db_h_nelem_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_h_nelem_reply, (caddr_t) &clnt_res,
@@ -484,7 +484,7 @@ __db_db_key_range_4001(argp, clnt)
{
static __db_key_range_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_key_range,
(xdrproc_t) xdr___db_key_range_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_key_range_reply, (caddr_t) &clnt_res,
@@ -501,7 +501,7 @@ __db_db_lorder_4001(argp, clnt)
{
static __db_lorder_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_lorder,
(xdrproc_t) xdr___db_lorder_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_lorder_reply, (caddr_t) &clnt_res,
@@ -518,7 +518,7 @@ __db_db_open_4001(argp, clnt)
{
static __db_open_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_open,
(xdrproc_t) xdr___db_open_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_open_reply, (caddr_t) &clnt_res,
@@ -535,7 +535,7 @@ __db_db_pagesize_4001(argp, clnt)
{
static __db_pagesize_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_pagesize,
(xdrproc_t) xdr___db_pagesize_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_pagesize_reply, (caddr_t) &clnt_res,
@@ -552,7 +552,7 @@ __db_db_pget_4001(argp, clnt)
{
static __db_pget_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_pget,
(xdrproc_t) xdr___db_pget_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_pget_reply, (caddr_t) &clnt_res,
@@ -569,7 +569,7 @@ __db_db_put_4001(argp, clnt)
{
static __db_put_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_put,
(xdrproc_t) xdr___db_put_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_put_reply, (caddr_t) &clnt_res,
@@ -586,7 +586,7 @@ __db_db_re_delim_4001(argp, clnt)
{
static __db_re_delim_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_re_delim,
(xdrproc_t) xdr___db_re_delim_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_re_delim_reply, (caddr_t) &clnt_res,
@@ -603,7 +603,7 @@ __db_db_re_len_4001(argp, clnt)
{
static __db_re_len_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_re_len,
(xdrproc_t) xdr___db_re_len_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_re_len_reply, (caddr_t) &clnt_res,
@@ -620,7 +620,7 @@ __db_db_re_pad_4001(argp, clnt)
{
static __db_re_pad_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_re_pad,
(xdrproc_t) xdr___db_re_pad_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_re_pad_reply, (caddr_t) &clnt_res,
@@ -637,7 +637,7 @@ __db_db_remove_4001(argp, clnt)
{
static __db_remove_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_remove,
(xdrproc_t) xdr___db_remove_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_remove_reply, (caddr_t) &clnt_res,
@@ -654,7 +654,7 @@ __db_db_rename_4001(argp, clnt)
{
static __db_rename_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_rename,
(xdrproc_t) xdr___db_rename_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_rename_reply, (caddr_t) &clnt_res,
@@ -671,7 +671,7 @@ __db_db_stat_4001(argp, clnt)
{
static __db_stat_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_stat,
(xdrproc_t) xdr___db_stat_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_stat_reply, (caddr_t) &clnt_res,
@@ -688,7 +688,7 @@ __db_db_sync_4001(argp, clnt)
{
static __db_sync_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_sync,
(xdrproc_t) xdr___db_sync_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_sync_reply, (caddr_t) &clnt_res,
@@ -705,7 +705,7 @@ __db_db_truncate_4001(argp, clnt)
{
static __db_truncate_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_truncate,
(xdrproc_t) xdr___db_truncate_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_truncate_reply, (caddr_t) &clnt_res,
@@ -722,7 +722,7 @@ __db_db_cursor_4001(argp, clnt)
{
static __db_cursor_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_cursor,
(xdrproc_t) xdr___db_cursor_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_cursor_reply, (caddr_t) &clnt_res,
@@ -739,7 +739,7 @@ __db_db_join_4001(argp, clnt)
{
static __db_join_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_db_join,
(xdrproc_t) xdr___db_join_msg, (caddr_t) argp,
(xdrproc_t) xdr___db_join_reply, (caddr_t) &clnt_res,
@@ -756,7 +756,7 @@ __db_dbc_close_4001(argp, clnt)
{
static __dbc_close_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_dbc_close,
(xdrproc_t) xdr___dbc_close_msg, (caddr_t) argp,
(xdrproc_t) xdr___dbc_close_reply, (caddr_t) &clnt_res,
@@ -773,7 +773,7 @@ __db_dbc_count_4001(argp, clnt)
{
static __dbc_count_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_dbc_count,
(xdrproc_t) xdr___dbc_count_msg, (caddr_t) argp,
(xdrproc_t) xdr___dbc_count_reply, (caddr_t) &clnt_res,
@@ -790,7 +790,7 @@ __db_dbc_del_4001(argp, clnt)
{
static __dbc_del_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_dbc_del,
(xdrproc_t) xdr___dbc_del_msg, (caddr_t) argp,
(xdrproc_t) xdr___dbc_del_reply, (caddr_t) &clnt_res,
@@ -807,7 +807,7 @@ __db_dbc_dup_4001(argp, clnt)
{
static __dbc_dup_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_dbc_dup,
(xdrproc_t) xdr___dbc_dup_msg, (caddr_t) argp,
(xdrproc_t) xdr___dbc_dup_reply, (caddr_t) &clnt_res,
@@ -824,7 +824,7 @@ __db_dbc_get_4001(argp, clnt)
{
static __dbc_get_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_dbc_get,
(xdrproc_t) xdr___dbc_get_msg, (caddr_t) argp,
(xdrproc_t) xdr___dbc_get_reply, (caddr_t) &clnt_res,
@@ -841,7 +841,7 @@ __db_dbc_pget_4001(argp, clnt)
{
static __dbc_pget_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_dbc_pget,
(xdrproc_t) xdr___dbc_pget_msg, (caddr_t) argp,
(xdrproc_t) xdr___dbc_pget_reply, (caddr_t) &clnt_res,
@@ -858,7 +858,7 @@ __db_dbc_put_4001(argp, clnt)
{
static __dbc_put_reply clnt_res;
- memset((gchar *)&clnt_res, 0, sizeof (clnt_res));
+ memset((char *)&clnt_res, 0, sizeof (clnt_res));
if (clnt_call(clnt, __DB_dbc_put,
(xdrproc_t) xdr___dbc_put_msg, (caddr_t) argp,
(xdrproc_t) xdr___dbc_put_reply, (caddr_t) &clnt_res,
diff --git a/libdb/rpc_client/gen_client.c b/libdb/rpc_client/gen_client.c
index d040c48..aed4946 100644
--- a/libdb/rpc_client/gen_client.c
+++ b/libdb/rpc_client/gen_client.c
@@ -17,7 +17,7 @@
#include "dbinc_auto/db_server.h"
#include "dbinc_auto/rpc_client_ext.h"
-static gint __dbcl_noserver __P((DB_ENV *));
+static int __dbcl_noserver __P((DB_ENV *));
static int
__dbcl_noserver(dbenv)
@@ -27,27 +27,27 @@ __dbcl_noserver(dbenv)
return (DB_NOSERVER);
}
-static gint __dbcl_rpc_illegal __P((DB_ENV *, gchar *));
+static int __dbcl_rpc_illegal __P((DB_ENV *, char *));
static int
__dbcl_rpc_illegal(dbenv, name)
DB_ENV *dbenv;
- gchar *name;
+ char *name;
{
__db_err(dbenv, "%s method meaningless in an RPC environment", name);
return (__db_eopnotsup(dbenv));
}
/*
- * PUBLIC: gint __dbcl_env_alloc __P((DB_ENV *, gpointer (*)(size_t),
- * PUBLIC: gpointer (*)(gpointer , size_t), void (*)(gpointer)));
+ * PUBLIC: int __dbcl_env_alloc __P((DB_ENV *, void *(*)(size_t),
+ * PUBLIC: void *(*)(void *, size_t), void (*)(void *)));
*/
-gint
+int
__dbcl_env_alloc(dbenv, func0, func1, func2)
DB_ENV * dbenv;
- gpointer (*func0) __P((size_t));
- gpointer (*func1) __P((gpointer , size_t));
- void (*func2) __P((gpointer));
+ void *(*func0) __P((size_t));
+ void *(*func1) __P((void *, size_t));
+ void (*func2) __P((void *));
{
COMPQUIET(func0, 0);
COMPQUIET(func1, 0);
@@ -56,32 +56,32 @@ __dbcl_env_alloc(dbenv, func0, func1, func2)
}
/*
- * PUBLIC: gint __dbcl_set_app_dispatch __P((DB_ENV *, gint (*)(DB_ENV *, DBT *,
+ * PUBLIC: int __dbcl_set_app_dispatch __P((DB_ENV *, int (*)(DB_ENV *, DBT *,
* PUBLIC: DB_LSN *, db_recops)));
*/
-gint
+int
__dbcl_set_app_dispatch(dbenv, func0)
DB_ENV * dbenv;
- gint (*func0) __P((DB_ENV *, DBT *, DB_LSN *, db_recops));
+ int (*func0) __P((DB_ENV *, DBT *, DB_LSN *, db_recops));
{
COMPQUIET(func0, 0);
return (__dbcl_rpc_illegal(dbenv, "set_app_dispatch"));
}
/*
- * PUBLIC: gint __dbcl_env_cachesize __P((DB_ENV *, u_int32_t, u_int32_t, int));
+ * PUBLIC: int __dbcl_env_cachesize __P((DB_ENV *, u_int32_t, u_int32_t, int));
*/
-gint
+int
__dbcl_env_cachesize(dbenv, gbytes, bytes, ncache)
DB_ENV * dbenv;
u_int32_t gbytes;
u_int32_t bytes;
- gint ncache;
+ int ncache;
{
CLIENT *cl;
__env_cachesize_msg msg;
__env_cachesize_reply *replyp = NULL;
- gint ret;
+ int ret;
ret = 0;
if (dbenv == NULL || !RPC_ON(dbenv))
@@ -106,14 +106,14 @@ __dbcl_env_cachesize(dbenv, gbytes, bytes, ncache)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___env_cachesize_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___env_cachesize_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_env_close __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __dbcl_env_close __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__dbcl_env_close(dbenv, flags)
DB_ENV * dbenv;
u_int32_t flags;
@@ -121,7 +121,7 @@ __dbcl_env_close(dbenv, flags)
CLIENT *cl;
__env_close_msg msg;
__env_close_reply *replyp = NULL;
- gint ret;
+ int ret;
ret = 0;
if (dbenv == NULL || !RPC_ON(dbenv))
@@ -144,14 +144,14 @@ __dbcl_env_close(dbenv, flags)
ret = __dbcl_env_close_ret(dbenv, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___env_close_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___env_close_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_env_create __P((DB_ENV *, long));
+ * PUBLIC: int __dbcl_env_create __P((DB_ENV *, long));
*/
-gint
+int
__dbcl_env_create(dbenv, timeout)
DB_ENV * dbenv;
long timeout;
@@ -159,7 +159,7 @@ __dbcl_env_create(dbenv, timeout)
CLIENT *cl;
__env_create_msg msg;
__env_create_reply *replyp = NULL;
- gint ret;
+ int ret;
ret = 0;
if (dbenv == NULL || !RPC_ON(dbenv))
@@ -178,38 +178,38 @@ __dbcl_env_create(dbenv, timeout)
ret = __dbcl_env_create_ret(dbenv, timeout, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___env_create_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___env_create_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_set_data_dir __P((DB_ENV *, const gchar *));
+ * PUBLIC: int __dbcl_set_data_dir __P((DB_ENV *, const char *));
*/
-gint
+int
__dbcl_set_data_dir(dbenv, dir)
DB_ENV * dbenv;
- const gchar * dir;
+ const char * dir;
{
COMPQUIET(dir, NULL);
return (__dbcl_rpc_illegal(dbenv, "set_data_dir"));
}
/*
- * PUBLIC: gint __dbcl_env_dbremove __P((DB_ENV *, DB_TXN *, const gchar *,
- * PUBLIC: const gchar *, u_int32_t));
+ * PUBLIC: int __dbcl_env_dbremove __P((DB_ENV *, DB_TXN *, const char *,
+ * PUBLIC: const char *, u_int32_t));
*/
-gint
+int
__dbcl_env_dbremove(dbenv, txnp, name, subdb, flags)
DB_ENV * dbenv;
DB_TXN * txnp;
- const gchar * name;
- const gchar * subdb;
+ const char * name;
+ const char * subdb;
u_int32_t flags;
{
CLIENT *cl;
__env_dbremove_msg msg;
__env_dbremove_reply *replyp = NULL;
- gint ret;
+ int ret;
ret = 0;
if (dbenv == NULL || !RPC_ON(dbenv))
@@ -228,11 +228,11 @@ __dbcl_env_dbremove(dbenv, txnp, name, subdb, flags)
if (name == NULL)
msg.name = "";
else
- msg.name = (gchar *)name;
+ msg.name = (char *)name;
if (subdb == NULL)
msg.subdb = "";
else
- msg.subdb = (gchar *)subdb;
+ msg.subdb = (char *)subdb;
msg.flags = flags;
replyp = __db_env_dbremove_4001(&msg, cl);
@@ -244,27 +244,27 @@ __dbcl_env_dbremove(dbenv, txnp, name, subdb, flags)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___env_dbremove_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___env_dbremove_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_env_dbrename __P((DB_ENV *, DB_TXN *, const gchar *,
- * PUBLIC: const gchar *, const gchar *, u_int32_t));
+ * PUBLIC: int __dbcl_env_dbrename __P((DB_ENV *, DB_TXN *, const char *,
+ * PUBLIC: const char *, const char *, u_int32_t));
*/
-gint
+int
__dbcl_env_dbrename(dbenv, txnp, name, subdb, newname, flags)
DB_ENV * dbenv;
DB_TXN * txnp;
- const gchar * name;
- const gchar * subdb;
- const gchar * newname;
+ const char * name;
+ const char * subdb;
+ const char * newname;
u_int32_t flags;
{
CLIENT *cl;
__env_dbrename_msg msg;
__env_dbrename_reply *replyp = NULL;
- gint ret;
+ int ret;
ret = 0;
if (dbenv == NULL || !RPC_ON(dbenv))
@@ -283,15 +283,15 @@ __dbcl_env_dbrename(dbenv, txnp, name, subdb, newname, flags)
if (name == NULL)
msg.name = "";
else
- msg.name = (gchar *)name;
+ msg.name = (char *)name;
if (subdb == NULL)
msg.subdb = "";
else
- msg.subdb = (gchar *)subdb;
+ msg.subdb = (char *)subdb;
if (newname == NULL)
msg.newname = "";
else
- msg.newname = (gchar *)newname;
+ msg.newname = (char *)newname;
msg.flags = flags;
replyp = __db_env_dbrename_4001(&msg, cl);
@@ -303,23 +303,23 @@ __dbcl_env_dbrename(dbenv, txnp, name, subdb, newname, flags)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___env_dbrename_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___env_dbrename_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_env_encrypt __P((DB_ENV *, const gchar *, u_int32_t));
+ * PUBLIC: int __dbcl_env_encrypt __P((DB_ENV *, const char *, u_int32_t));
*/
-gint
+int
__dbcl_env_encrypt(dbenv, passwd, flags)
DB_ENV * dbenv;
- const gchar * passwd;
+ const char * passwd;
u_int32_t flags;
{
CLIENT *cl;
__env_encrypt_msg msg;
__env_encrypt_reply *replyp = NULL;
- gint ret;
+ int ret;
ret = 0;
if (dbenv == NULL || !RPC_ON(dbenv))
@@ -334,7 +334,7 @@ __dbcl_env_encrypt(dbenv, passwd, flags)
if (passwd == NULL)
msg.passwd = "";
else
- msg.passwd = (gchar *)passwd;
+ msg.passwd = (char *)passwd;
msg.flags = flags;
replyp = __db_env_encrypt_4001(&msg, cl);
@@ -346,15 +346,15 @@ __dbcl_env_encrypt(dbenv, passwd, flags)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___env_encrypt_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___env_encrypt_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_env_set_feedback __P((DB_ENV *, void (*)(DB_ENV *, int,
+ * PUBLIC: int __dbcl_env_set_feedback __P((DB_ENV *, void (*)(DB_ENV *, int,
* PUBLIC: int)));
*/
-gint
+int
__dbcl_env_set_feedback(dbenv, func0)
DB_ENV * dbenv;
void (*func0) __P((DB_ENV *, int, int));
@@ -364,18 +364,18 @@ __dbcl_env_set_feedback(dbenv, func0)
}
/*
- * PUBLIC: gint __dbcl_env_flags __P((DB_ENV *, u_int32_t, int));
+ * PUBLIC: int __dbcl_env_flags __P((DB_ENV *, u_int32_t, int));
*/
-gint
+int
__dbcl_env_flags(dbenv, flags, onoff)
DB_ENV * dbenv;
u_int32_t flags;
- gint onoff;
+ int onoff;
{
CLIENT *cl;
__env_flags_msg msg;
__env_flags_reply *replyp = NULL;
- gint ret;
+ int ret;
ret = 0;
if (dbenv == NULL || !RPC_ON(dbenv))
@@ -399,14 +399,14 @@ __dbcl_env_flags(dbenv, flags, onoff)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___env_flags_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___env_flags_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_set_lg_bsize __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __dbcl_set_lg_bsize __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__dbcl_set_lg_bsize(dbenv, bsize)
DB_ENV * dbenv;
u_int32_t bsize;
@@ -416,21 +416,21 @@ __dbcl_set_lg_bsize(dbenv, bsize)
}
/*
- * PUBLIC: gint __dbcl_set_lg_dir __P((DB_ENV *, const gchar *));
+ * PUBLIC: int __dbcl_set_lg_dir __P((DB_ENV *, const char *));
*/
-gint
+int
__dbcl_set_lg_dir(dbenv, dir)
DB_ENV * dbenv;
- const gchar * dir;
+ const char * dir;
{
COMPQUIET(dir, NULL);
return (__dbcl_rpc_illegal(dbenv, "set_lg_dir"));
}
/*
- * PUBLIC: gint __dbcl_set_lg_max __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __dbcl_set_lg_max __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__dbcl_set_lg_max(dbenv, max)
DB_ENV * dbenv;
u_int32_t max;
@@ -440,9 +440,9 @@ __dbcl_set_lg_max(dbenv, max)
}
/*
- * PUBLIC: gint __dbcl_set_lg_regionmax __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __dbcl_set_lg_regionmax __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__dbcl_set_lg_regionmax(dbenv, max)
DB_ENV * dbenv;
u_int32_t max;
@@ -452,13 +452,13 @@ __dbcl_set_lg_regionmax(dbenv, max)
}
/*
- * PUBLIC: gint __dbcl_set_lk_conflict __P((DB_ENV *, u_int8_t *, int));
+ * PUBLIC: int __dbcl_set_lk_conflict __P((DB_ENV *, u_int8_t *, int));
*/
-gint
+int
__dbcl_set_lk_conflict(dbenv, conflicts, modes)
DB_ENV * dbenv;
u_int8_t * conflicts;
- gint modes;
+ int modes;
{
COMPQUIET(conflicts, 0);
COMPQUIET(modes, 0);
@@ -466,9 +466,9 @@ __dbcl_set_lk_conflict(dbenv, conflicts, modes)
}
/*
- * PUBLIC: gint __dbcl_set_lk_detect __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __dbcl_set_lk_detect __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__dbcl_set_lk_detect(dbenv, detect)
DB_ENV * dbenv;
u_int32_t detect;
@@ -478,9 +478,9 @@ __dbcl_set_lk_detect(dbenv, detect)
}
/*
- * PUBLIC: gint __dbcl_set_lk_max __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __dbcl_set_lk_max __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__dbcl_set_lk_max(dbenv, max)
DB_ENV * dbenv;
u_int32_t max;
@@ -490,9 +490,9 @@ __dbcl_set_lk_max(dbenv, max)
}
/*
- * PUBLIC: gint __dbcl_set_lk_max_locks __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __dbcl_set_lk_max_locks __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__dbcl_set_lk_max_locks(dbenv, max)
DB_ENV * dbenv;
u_int32_t max;
@@ -502,9 +502,9 @@ __dbcl_set_lk_max_locks(dbenv, max)
}
/*
- * PUBLIC: gint __dbcl_set_lk_max_lockers __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __dbcl_set_lk_max_lockers __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__dbcl_set_lk_max_lockers(dbenv, max)
DB_ENV * dbenv;
u_int32_t max;
@@ -514,9 +514,9 @@ __dbcl_set_lk_max_lockers(dbenv, max)
}
/*
- * PUBLIC: gint __dbcl_set_lk_max_objects __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __dbcl_set_lk_max_objects __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__dbcl_set_lk_max_objects(dbenv, max)
DB_ENV * dbenv;
u_int32_t max;
@@ -526,9 +526,9 @@ __dbcl_set_lk_max_objects(dbenv, max)
}
/*
- * PUBLIC: gint __dbcl_set_mp_mmapsize __P((DB_ENV *, size_t));
+ * PUBLIC: int __dbcl_set_mp_mmapsize __P((DB_ENV *, size_t));
*/
-gint
+int
__dbcl_set_mp_mmapsize(dbenv, mmapsize)
DB_ENV * dbenv;
size_t mmapsize;
@@ -538,19 +538,19 @@ __dbcl_set_mp_mmapsize(dbenv, mmapsize)
}
/*
- * PUBLIC: gint __dbcl_env_open __P((DB_ENV *, const gchar *, u_int32_t, int));
+ * PUBLIC: int __dbcl_env_open __P((DB_ENV *, const char *, u_int32_t, int));
*/
-gint
+int
__dbcl_env_open(dbenv, home, flags, mode)
DB_ENV * dbenv;
- const gchar * home;
+ const char * home;
u_int32_t flags;
- gint mode;
+ int mode;
{
CLIENT *cl;
__env_open_msg msg;
__env_open_reply *replyp = NULL;
- gint ret;
+ int ret;
ret = 0;
if (dbenv == NULL || !RPC_ON(dbenv))
@@ -565,7 +565,7 @@ __dbcl_env_open(dbenv, home, flags, mode)
if (home == NULL)
msg.home = "";
else
- msg.home = (gchar *)home;
+ msg.home = (char *)home;
msg.flags = flags;
msg.mode = mode;
@@ -578,14 +578,14 @@ __dbcl_env_open(dbenv, home, flags, mode)
ret = __dbcl_env_open_ret(dbenv, home, flags, mode, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___env_open_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___env_open_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_env_paniccall __P((DB_ENV *, void (*)(DB_ENV *, int)));
+ * PUBLIC: int __dbcl_env_paniccall __P((DB_ENV *, void (*)(DB_ENV *, int)));
*/
-gint
+int
__dbcl_env_paniccall(dbenv, func0)
DB_ENV * dbenv;
void (*func0) __P((DB_ENV *, int));
@@ -595,18 +595,18 @@ __dbcl_env_paniccall(dbenv, func0)
}
/*
- * PUBLIC: gint __dbcl_env_remove __P((DB_ENV *, const gchar *, u_int32_t));
+ * PUBLIC: int __dbcl_env_remove __P((DB_ENV *, const char *, u_int32_t));
*/
-gint
+int
__dbcl_env_remove(dbenv, home, flags)
DB_ENV * dbenv;
- const gchar * home;
+ const char * home;
u_int32_t flags;
{
CLIENT *cl;
__env_remove_msg msg;
__env_remove_reply *replyp = NULL;
- gint ret;
+ int ret;
ret = 0;
if (dbenv == NULL || !RPC_ON(dbenv))
@@ -621,7 +621,7 @@ __dbcl_env_remove(dbenv, home, flags)
if (home == NULL)
msg.home = "";
else
- msg.home = (gchar *)home;
+ msg.home = (char *)home;
msg.flags = flags;
replyp = __db_env_remove_4001(&msg, cl);
@@ -633,14 +633,14 @@ __dbcl_env_remove(dbenv, home, flags)
ret = __dbcl_env_remove_ret(dbenv, home, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___env_remove_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___env_remove_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_set_shm_key __P((DB_ENV *, long));
+ * PUBLIC: int __dbcl_set_shm_key __P((DB_ENV *, long));
*/
-gint
+int
__dbcl_set_shm_key(dbenv, shm_key)
DB_ENV * dbenv;
long shm_key;
@@ -650,9 +650,9 @@ __dbcl_set_shm_key(dbenv, shm_key)
}
/*
- * PUBLIC: gint __dbcl_set_tas_spins __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __dbcl_set_tas_spins __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__dbcl_set_tas_spins(dbenv, tas_spins)
DB_ENV * dbenv;
u_int32_t tas_spins;
@@ -662,9 +662,9 @@ __dbcl_set_tas_spins(dbenv, tas_spins)
}
/*
- * PUBLIC: gint __dbcl_set_timeout __P((DB_ENV *, u_int32_t, u_int32_t));
+ * PUBLIC: int __dbcl_set_timeout __P((DB_ENV *, u_int32_t, u_int32_t));
*/
-gint
+int
__dbcl_set_timeout(dbenv, timeout, flags)
DB_ENV * dbenv;
u_int32_t timeout;
@@ -676,21 +676,21 @@ __dbcl_set_timeout(dbenv, timeout, flags)
}
/*
- * PUBLIC: gint __dbcl_set_tmp_dir __P((DB_ENV *, const gchar *));
+ * PUBLIC: int __dbcl_set_tmp_dir __P((DB_ENV *, const char *));
*/
-gint
+int
__dbcl_set_tmp_dir(dbenv, dir)
DB_ENV * dbenv;
- const gchar * dir;
+ const char * dir;
{
COMPQUIET(dir, NULL);
return (__dbcl_rpc_illegal(dbenv, "set_tmp_dir"));
}
/*
- * PUBLIC: gint __dbcl_set_tx_max __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __dbcl_set_tx_max __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__dbcl_set_tx_max(dbenv, max)
DB_ENV * dbenv;
u_int32_t max;
@@ -700,9 +700,9 @@ __dbcl_set_tx_max(dbenv, max)
}
/*
- * PUBLIC: gint __dbcl_set_tx_timestamp __P((DB_ENV *, time_t *));
+ * PUBLIC: int __dbcl_set_tx_timestamp __P((DB_ENV *, time_t *));
*/
-gint
+int
__dbcl_set_tx_timestamp(dbenv, max)
DB_ENV * dbenv;
time_t * max;
@@ -712,13 +712,13 @@ __dbcl_set_tx_timestamp(dbenv, max)
}
/*
- * PUBLIC: gint __dbcl_set_verbose __P((DB_ENV *, u_int32_t, int));
+ * PUBLIC: int __dbcl_set_verbose __P((DB_ENV *, u_int32_t, int));
*/
-gint
+int
__dbcl_set_verbose(dbenv, which, onoff)
DB_ENV * dbenv;
u_int32_t which;
- gint onoff;
+ int onoff;
{
COMPQUIET(which, 0);
COMPQUIET(onoff, 0);
@@ -726,16 +726,16 @@ __dbcl_set_verbose(dbenv, which, onoff)
}
/*
- * PUBLIC: gint __dbcl_txn_abort __P((DB_TXN *));
+ * PUBLIC: int __dbcl_txn_abort __P((DB_TXN *));
*/
-gint
+int
__dbcl_txn_abort(txnp)
DB_TXN * txnp;
{
CLIENT *cl;
__txn_abort_msg msg;
__txn_abort_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -759,15 +759,15 @@ __dbcl_txn_abort(txnp)
ret = __dbcl_txn_abort_ret(txnp, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___txn_abort_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___txn_abort_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **,
+ * PUBLIC: int __dbcl_txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **,
* PUBLIC: u_int32_t));
*/
-gint
+int
__dbcl_txn_begin(dbenv, parent, txnpp, flags)
DB_ENV * dbenv;
DB_TXN * parent;
@@ -777,7 +777,7 @@ __dbcl_txn_begin(dbenv, parent, txnpp, flags)
CLIENT *cl;
__txn_begin_msg msg;
__txn_begin_reply *replyp = NULL;
- gint ret;
+ int ret;
ret = 0;
if (dbenv == NULL || !RPC_ON(dbenv))
@@ -804,15 +804,15 @@ __dbcl_txn_begin(dbenv, parent, txnpp, flags)
ret = __dbcl_txn_begin_ret(dbenv, parent, txnpp, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___txn_begin_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___txn_begin_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_txn_checkpoint __P((DB_ENV *, u_int32_t, u_int32_t,
+ * PUBLIC: int __dbcl_txn_checkpoint __P((DB_ENV *, u_int32_t, u_int32_t,
* PUBLIC: u_int32_t));
*/
-gint
+int
__dbcl_txn_checkpoint(dbenv, kbyte, min, flags)
DB_ENV * dbenv;
u_int32_t kbyte;
@@ -826,9 +826,9 @@ __dbcl_txn_checkpoint(dbenv, kbyte, min, flags)
}
/*
- * PUBLIC: gint __dbcl_txn_commit __P((DB_TXN *, u_int32_t));
+ * PUBLIC: int __dbcl_txn_commit __P((DB_TXN *, u_int32_t));
*/
-gint
+int
__dbcl_txn_commit(txnp, flags)
DB_TXN * txnp;
u_int32_t flags;
@@ -836,7 +836,7 @@ __dbcl_txn_commit(txnp, flags)
CLIENT *cl;
__txn_commit_msg msg;
__txn_commit_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -861,14 +861,14 @@ __dbcl_txn_commit(txnp, flags)
ret = __dbcl_txn_commit_ret(txnp, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___txn_commit_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___txn_commit_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_txn_discard __P((DB_TXN *, u_int32_t));
+ * PUBLIC: int __dbcl_txn_discard __P((DB_TXN *, u_int32_t));
*/
-gint
+int
__dbcl_txn_discard(txnp, flags)
DB_TXN * txnp;
u_int32_t flags;
@@ -876,7 +876,7 @@ __dbcl_txn_discard(txnp, flags)
CLIENT *cl;
__txn_discard_msg msg;
__txn_discard_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -901,14 +901,14 @@ __dbcl_txn_discard(txnp, flags)
ret = __dbcl_txn_discard_ret(txnp, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___txn_discard_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___txn_discard_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_txn_prepare __P((DB_TXN *, u_int8_t *));
+ * PUBLIC: int __dbcl_txn_prepare __P((DB_TXN *, u_int8_t *));
*/
-gint
+int
__dbcl_txn_prepare(txnp, gid)
DB_TXN * txnp;
u_int8_t * gid;
@@ -916,7 +916,7 @@ __dbcl_txn_prepare(txnp, gid)
CLIENT *cl;
__txn_prepare_msg msg;
__txn_prepare_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -941,15 +941,15 @@ __dbcl_txn_prepare(txnp, gid)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___txn_prepare_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___txn_prepare_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_txn_recover __P((DB_ENV *, DB_PREPLIST *, long, long *,
+ * PUBLIC: int __dbcl_txn_recover __P((DB_ENV *, DB_PREPLIST *, long, long *,
* PUBLIC: u_int32_t));
*/
-gint
+int
__dbcl_txn_recover(dbenv, preplist, count, retp, flags)
DB_ENV * dbenv;
DB_PREPLIST * preplist;
@@ -960,7 +960,7 @@ __dbcl_txn_recover(dbenv, preplist, count, retp, flags)
CLIENT *cl;
__txn_recover_msg msg;
__txn_recover_reply *replyp = NULL;
- gint ret;
+ int ret;
ret = 0;
if (dbenv == NULL || !RPC_ON(dbenv))
@@ -984,14 +984,14 @@ __dbcl_txn_recover(dbenv, preplist, count, retp, flags)
ret = __dbcl_txn_recover_ret(dbenv, preplist, count, retp, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___txn_recover_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___txn_recover_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_txn_stat __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
+ * PUBLIC: int __dbcl_txn_stat __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
*/
-gint
+int
__dbcl_txn_stat(dbenv, statp, flags)
DB_ENV * dbenv;
DB_TXN_STAT ** statp;
@@ -1003,9 +1003,9 @@ __dbcl_txn_stat(dbenv, statp, flags)
}
/*
- * PUBLIC: gint __dbcl_txn_timeout __P((DB_TXN *, u_int32_t, u_int32_t));
+ * PUBLIC: int __dbcl_txn_timeout __P((DB_TXN *, u_int32_t, u_int32_t));
*/
-gint
+int
__dbcl_txn_timeout(txnp, timeout, flags)
DB_TXN * txnp;
u_int32_t timeout;
@@ -1020,15 +1020,15 @@ __dbcl_txn_timeout(txnp, timeout, flags)
}
/*
- * PUBLIC: gint __dbcl_rep_elect __P((DB_ENV *, int, int, u_int32_t, gint *));
+ * PUBLIC: int __dbcl_rep_elect __P((DB_ENV *, int, int, u_int32_t, int *));
*/
-gint
+int
__dbcl_rep_elect(dbenv, nsites, pri, timeout, idp)
DB_ENV * dbenv;
- gint nsites;
- gint pri;
+ int nsites;
+ int pri;
u_int32_t timeout;
- gint * idp;
+ int * idp;
{
COMPQUIET(nsites, 0);
COMPQUIET(pri, 0);
@@ -1038,9 +1038,9 @@ __dbcl_rep_elect(dbenv, nsites, pri, timeout, idp)
}
/*
- * PUBLIC: gint __dbcl_rep_flush __P((DB_ENV *));
+ * PUBLIC: int __dbcl_rep_flush __P((DB_ENV *));
*/
-gint
+int
__dbcl_rep_flush(dbenv)
DB_ENV * dbenv;
{
@@ -1048,14 +1048,14 @@ __dbcl_rep_flush(dbenv)
}
/*
- * PUBLIC: gint __dbcl_rep_process_message __P((DB_ENV *, DBT *, DBT *, gint *));
+ * PUBLIC: int __dbcl_rep_process_message __P((DB_ENV *, DBT *, DBT *, int *));
*/
-gint
+int
__dbcl_rep_process_message(dbenv, rec, control, idp)
DB_ENV * dbenv;
DBT * rec;
DBT * control;
- gint * idp;
+ int * idp;
{
COMPQUIET(rec, NULL);
COMPQUIET(control, NULL);
@@ -1064,9 +1064,9 @@ __dbcl_rep_process_message(dbenv, rec, control, idp)
}
/*
- * PUBLIC: gint __dbcl_rep_set_limit __P((DB_ENV *, u_int32_t, u_int32_t));
+ * PUBLIC: int __dbcl_rep_set_limit __P((DB_ENV *, u_int32_t, u_int32_t));
*/
-gint
+int
__dbcl_rep_set_limit(dbenv, mbytes, bytes)
DB_ENV * dbenv;
u_int32_t mbytes;
@@ -1078,9 +1078,9 @@ __dbcl_rep_set_limit(dbenv, mbytes, bytes)
}
/*
- * PUBLIC: gint __dbcl_rep_set_request __P((DB_ENV *, u_int32_t, u_int32_t));
+ * PUBLIC: int __dbcl_rep_set_request __P((DB_ENV *, u_int32_t, u_int32_t));
*/
-gint
+int
__dbcl_rep_set_request(dbenv, min, max)
DB_ENV * dbenv;
u_int32_t min;
@@ -1092,14 +1092,14 @@ __dbcl_rep_set_request(dbenv, min, max)
}
/*
- * PUBLIC: gint __dbcl_rep_set_rep_transport __P((DB_ENV *, int,
- * PUBLIC: gint (*)(DB_ENV *, const DBT *, const DBT *, int, u_int32_t)));
+ * PUBLIC: int __dbcl_rep_set_rep_transport __P((DB_ENV *, int,
+ * PUBLIC: int (*)(DB_ENV *, const DBT *, const DBT *, int, u_int32_t)));
*/
-gint
+int
__dbcl_rep_set_rep_transport(dbenv, id, func0)
DB_ENV * dbenv;
- gint id;
- gint (*func0) __P((DB_ENV *, const DBT *, const DBT *, int, u_int32_t));
+ int id;
+ int (*func0) __P((DB_ENV *, const DBT *, const DBT *, int, u_int32_t));
{
COMPQUIET(id, 0);
COMPQUIET(func0, 0);
@@ -1107,9 +1107,9 @@ __dbcl_rep_set_rep_transport(dbenv, id, func0)
}
/*
- * PUBLIC: gint __dbcl_rep_start __P((DB_ENV *, DBT *, u_int32_t));
+ * PUBLIC: int __dbcl_rep_start __P((DB_ENV *, DBT *, u_int32_t));
*/
-gint
+int
__dbcl_rep_start(dbenv, cdata, flags)
DB_ENV * dbenv;
DBT * cdata;
@@ -1121,9 +1121,9 @@ __dbcl_rep_start(dbenv, cdata, flags)
}
/*
- * PUBLIC: gint __dbcl_rep_stat __P((DB_ENV *, DB_REP_STAT **, u_int32_t));
+ * PUBLIC: int __dbcl_rep_stat __P((DB_ENV *, DB_REP_STAT **, u_int32_t));
*/
-gint
+int
__dbcl_rep_stat(dbenv, statp, flags)
DB_ENV * dbenv;
DB_REP_STAT ** statp;
@@ -1135,15 +1135,15 @@ __dbcl_rep_stat(dbenv, statp, flags)
}
/*
- * PUBLIC: gint __dbcl_db_alloc __P((DB *, gpointer (*)(size_t), gpointer (*)(gpointer ,
- * PUBLIC: size_t), void (*)(gpointer)));
+ * PUBLIC: int __dbcl_db_alloc __P((DB *, void *(*)(size_t), void *(*)(void *,
+ * PUBLIC: size_t), void (*)(void *)));
*/
-gint
+int
__dbcl_db_alloc(dbp, func0, func1, func2)
DB * dbp;
- gpointer (*func0) __P((size_t));
- gpointer (*func1) __P((gpointer , size_t));
- void (*func2) __P((gpointer));
+ void *(*func0) __P((size_t));
+ void *(*func1) __P((void *, size_t));
+ void (*func2) __P((void *));
{
DB_ENV *dbenv;
@@ -1155,21 +1155,21 @@ __dbcl_db_alloc(dbp, func0, func1, func2)
}
/*
- * PUBLIC: gint __dbcl_db_associate __P((DB *, DB_TXN *, DB *, gint (*)(DB *,
+ * PUBLIC: int __dbcl_db_associate __P((DB *, DB_TXN *, DB *, int (*)(DB *,
* PUBLIC: const DBT *, const DBT *, DBT *), u_int32_t));
*/
-gint
+int
__dbcl_db_associate(dbp, txnp, sdbp, func0, flags)
DB * dbp;
DB_TXN * txnp;
DB * sdbp;
- gint (*func0) __P((DB *, const DBT *, const DBT *, DBT *));
+ int (*func0) __P((DB *, const DBT *, const DBT *, DBT *));
u_int32_t flags;
{
CLIENT *cl;
__db_associate_msg msg;
__db_associate_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -1206,18 +1206,18 @@ __dbcl_db_associate(dbp, txnp, sdbp, func0, flags)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_associate_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_associate_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_bt_compare __P((DB *, gint (*)(DB *, const DBT *,
+ * PUBLIC: int __dbcl_db_bt_compare __P((DB *, int (*)(DB *, const DBT *,
* PUBLIC: const DBT *)));
*/
-gint
+int
__dbcl_db_bt_compare(dbp, func0)
DB * dbp;
- gint (*func0) __P((DB *, const DBT *, const DBT *));
+ int (*func0) __P((DB *, const DBT *, const DBT *));
{
DB_ENV *dbenv;
@@ -1227,9 +1227,9 @@ __dbcl_db_bt_compare(dbp, func0)
}
/*
- * PUBLIC: gint __dbcl_db_bt_maxkey __P((DB *, u_int32_t));
+ * PUBLIC: int __dbcl_db_bt_maxkey __P((DB *, u_int32_t));
*/
-gint
+int
__dbcl_db_bt_maxkey(dbp, maxkey)
DB * dbp;
u_int32_t maxkey;
@@ -1237,7 +1237,7 @@ __dbcl_db_bt_maxkey(dbp, maxkey)
CLIENT *cl;
__db_bt_maxkey_msg msg;
__db_bt_maxkey_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -1262,14 +1262,14 @@ __dbcl_db_bt_maxkey(dbp, maxkey)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_bt_maxkey_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_bt_maxkey_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_bt_minkey __P((DB *, u_int32_t));
+ * PUBLIC: int __dbcl_db_bt_minkey __P((DB *, u_int32_t));
*/
-gint
+int
__dbcl_db_bt_minkey(dbp, minkey)
DB * dbp;
u_int32_t minkey;
@@ -1277,7 +1277,7 @@ __dbcl_db_bt_minkey(dbp, minkey)
CLIENT *cl;
__db_bt_minkey_msg msg;
__db_bt_minkey_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -1302,15 +1302,15 @@ __dbcl_db_bt_minkey(dbp, minkey)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_bt_minkey_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_bt_minkey_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_bt_prefix __P((DB *, size_t(*)(DB *, const DBT *,
+ * PUBLIC: int __dbcl_db_bt_prefix __P((DB *, size_t(*)(DB *, const DBT *,
* PUBLIC: const DBT *)));
*/
-gint
+int
__dbcl_db_bt_prefix(dbp, func0)
DB * dbp;
size_t (*func0) __P((DB *, const DBT *, const DBT *));
@@ -1323,13 +1323,13 @@ __dbcl_db_bt_prefix(dbp, func0)
}
/*
- * PUBLIC: gint __dbcl_db_set_append_recno __P((DB *, gint (*)(DB *, DBT *,
+ * PUBLIC: int __dbcl_db_set_append_recno __P((DB *, int (*)(DB *, DBT *,
* PUBLIC: db_recno_t)));
*/
-gint
+int
__dbcl_db_set_append_recno(dbp, func0)
DB * dbp;
- gint (*func0) __P((DB *, DBT *, db_recno_t));
+ int (*func0) __P((DB *, DBT *, db_recno_t));
{
DB_ENV *dbenv;
@@ -1339,9 +1339,9 @@ __dbcl_db_set_append_recno(dbp, func0)
}
/*
- * PUBLIC: gint __dbcl_db_cache_priority __P((DB *, DB_CACHE_PRIORITY));
+ * PUBLIC: int __dbcl_db_cache_priority __P((DB *, DB_CACHE_PRIORITY));
*/
-gint
+int
__dbcl_db_cache_priority(dbp, priority)
DB * dbp;
DB_CACHE_PRIORITY priority;
@@ -1354,14 +1354,14 @@ __dbcl_db_cache_priority(dbp, priority)
}
/*
- * PUBLIC: gint __dbcl_db_cachesize __P((DB *, u_int32_t, u_int32_t, int));
+ * PUBLIC: int __dbcl_db_cachesize __P((DB *, u_int32_t, u_int32_t, int));
*/
-gint
+int
__dbcl_db_cachesize(dbp, gbytes, bytes, ncache)
DB * dbp;
u_int32_t gbytes;
u_int32_t bytes;
- gint ncache;
+ int ncache;
{
DB_ENV *dbenv;
@@ -1373,9 +1373,9 @@ __dbcl_db_cachesize(dbp, gbytes, bytes, ncache)
}
/*
- * PUBLIC: gint __dbcl_db_close __P((DB *, u_int32_t));
+ * PUBLIC: int __dbcl_db_close __P((DB *, u_int32_t));
*/
-gint
+int
__dbcl_db_close(dbp, flags)
DB * dbp;
u_int32_t flags;
@@ -1383,7 +1383,7 @@ __dbcl_db_close(dbp, flags)
CLIENT *cl;
__db_close_msg msg;
__db_close_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -1408,14 +1408,14 @@ __dbcl_db_close(dbp, flags)
ret = __dbcl_db_close_ret(dbp, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_close_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_close_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_create __P((DB *, DB_ENV *, u_int32_t));
+ * PUBLIC: int __dbcl_db_create __P((DB *, DB_ENV *, u_int32_t));
*/
-gint
+int
__dbcl_db_create(dbp, dbenv, flags)
DB * dbp;
DB_ENV * dbenv;
@@ -1424,7 +1424,7 @@ __dbcl_db_create(dbp, dbenv, flags)
CLIENT *cl;
__db_create_msg msg;
__db_create_reply *replyp = NULL;
- gint ret;
+ int ret;
ret = 0;
if (dbenv == NULL || !RPC_ON(dbenv))
@@ -1447,14 +1447,14 @@ __dbcl_db_create(dbp, dbenv, flags)
ret = __dbcl_db_create_ret(dbp, dbenv, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_create_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_create_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_del __P((DB *, DB_TXN *, DBT *, u_int32_t));
+ * PUBLIC: int __dbcl_db_del __P((DB *, DB_TXN *, DBT *, u_int32_t));
*/
-gint
+int
__dbcl_db_del(dbp, txnp, key, flags)
DB * dbp;
DB_TXN * txnp;
@@ -1464,7 +1464,7 @@ __dbcl_db_del(dbp, txnp, key, flags)
CLIENT *cl;
__db_del_msg msg;
__db_del_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -1499,18 +1499,18 @@ __dbcl_db_del(dbp, txnp, key, flags)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_del_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_del_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_dup_compare __P((DB *, gint (*)(DB *, const DBT *,
+ * PUBLIC: int __dbcl_db_dup_compare __P((DB *, int (*)(DB *, const DBT *,
* PUBLIC: const DBT *)));
*/
-gint
+int
__dbcl_db_dup_compare(dbp, func0)
DB * dbp;
- gint (*func0) __P((DB *, const DBT *, const DBT *));
+ int (*func0) __P((DB *, const DBT *, const DBT *));
{
DB_ENV *dbenv;
@@ -1520,18 +1520,18 @@ __dbcl_db_dup_compare(dbp, func0)
}
/*
- * PUBLIC: gint __dbcl_db_encrypt __P((DB *, const gchar *, u_int32_t));
+ * PUBLIC: int __dbcl_db_encrypt __P((DB *, const char *, u_int32_t));
*/
-gint
+int
__dbcl_db_encrypt(dbp, passwd, flags)
DB * dbp;
- const gchar * passwd;
+ const char * passwd;
u_int32_t flags;
{
CLIENT *cl;
__db_encrypt_msg msg;
__db_encrypt_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -1548,7 +1548,7 @@ __dbcl_db_encrypt(dbp, passwd, flags)
if (passwd == NULL)
msg.passwd = "";
else
- msg.passwd = (gchar *)passwd;
+ msg.passwd = (char *)passwd;
msg.flags = flags;
replyp = __db_db_encrypt_4001(&msg, cl);
@@ -1560,14 +1560,14 @@ __dbcl_db_encrypt(dbp, passwd, flags)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_encrypt_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_encrypt_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_extentsize __P((DB *, u_int32_t));
+ * PUBLIC: int __dbcl_db_extentsize __P((DB *, u_int32_t));
*/
-gint
+int
__dbcl_db_extentsize(dbp, extentsize)
DB * dbp;
u_int32_t extentsize;
@@ -1575,7 +1575,7 @@ __dbcl_db_extentsize(dbp, extentsize)
CLIENT *cl;
__db_extentsize_msg msg;
__db_extentsize_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -1600,17 +1600,17 @@ __dbcl_db_extentsize(dbp, extentsize)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_extentsize_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_extentsize_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_fd __P((DB *, gint *));
+ * PUBLIC: int __dbcl_db_fd __P((DB *, int *));
*/
-gint
+int
__dbcl_db_fd(dbp, fdp)
DB * dbp;
- gint * fdp;
+ int * fdp;
{
DB_ENV *dbenv;
@@ -1620,9 +1620,9 @@ __dbcl_db_fd(dbp, fdp)
}
/*
- * PUBLIC: gint __dbcl_db_feedback __P((DB *, void (*)(DB *, int, int)));
+ * PUBLIC: int __dbcl_db_feedback __P((DB *, void (*)(DB *, int, int)));
*/
-gint
+int
__dbcl_db_feedback(dbp, func0)
DB * dbp;
void (*func0) __P((DB *, int, int));
@@ -1635,9 +1635,9 @@ __dbcl_db_feedback(dbp, func0)
}
/*
- * PUBLIC: gint __dbcl_db_flags __P((DB *, u_int32_t));
+ * PUBLIC: int __dbcl_db_flags __P((DB *, u_int32_t));
*/
-gint
+int
__dbcl_db_flags(dbp, flags)
DB * dbp;
u_int32_t flags;
@@ -1645,7 +1645,7 @@ __dbcl_db_flags(dbp, flags)
CLIENT *cl;
__db_flags_msg msg;
__db_flags_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -1670,14 +1670,14 @@ __dbcl_db_flags(dbp, flags)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_flags_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_flags_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+ * PUBLIC: int __dbcl_db_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
*/
-gint
+int
__dbcl_db_get(dbp, txnp, key, data, flags)
DB * dbp;
DB_TXN * txnp;
@@ -1688,7 +1688,7 @@ __dbcl_db_get(dbp, txnp, key, data, flags)
CLIENT *cl;
__db_get_msg msg;
__db_get_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -1729,14 +1729,14 @@ __dbcl_db_get(dbp, txnp, key, data, flags)
ret = __dbcl_db_get_ret(dbp, txnp, key, data, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_get_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_get_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_h_ffactor __P((DB *, u_int32_t));
+ * PUBLIC: int __dbcl_db_h_ffactor __P((DB *, u_int32_t));
*/
-gint
+int
__dbcl_db_h_ffactor(dbp, ffactor)
DB * dbp;
u_int32_t ffactor;
@@ -1744,7 +1744,7 @@ __dbcl_db_h_ffactor(dbp, ffactor)
CLIENT *cl;
__db_h_ffactor_msg msg;
__db_h_ffactor_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -1769,18 +1769,18 @@ __dbcl_db_h_ffactor(dbp, ffactor)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_h_ffactor_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_h_ffactor_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_h_hash __P((DB *, u_int32_t(*)(DB *, gconstpointer ,
+ * PUBLIC: int __dbcl_db_h_hash __P((DB *, u_int32_t(*)(DB *, const void *,
* PUBLIC: u_int32_t)));
*/
-gint
+int
__dbcl_db_h_hash(dbp, func0)
DB * dbp;
- u_int32_t (*func0) __P((DB *, gconstpointer , u_int32_t));
+ u_int32_t (*func0) __P((DB *, const void *, u_int32_t));
{
DB_ENV *dbenv;
@@ -1790,9 +1790,9 @@ __dbcl_db_h_hash(dbp, func0)
}
/*
- * PUBLIC: gint __dbcl_db_h_nelem __P((DB *, u_int32_t));
+ * PUBLIC: int __dbcl_db_h_nelem __P((DB *, u_int32_t));
*/
-gint
+int
__dbcl_db_h_nelem(dbp, nelem)
DB * dbp;
u_int32_t nelem;
@@ -1800,7 +1800,7 @@ __dbcl_db_h_nelem(dbp, nelem)
CLIENT *cl;
__db_h_nelem_msg msg;
__db_h_nelem_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -1825,15 +1825,15 @@ __dbcl_db_h_nelem(dbp, nelem)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_h_nelem_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_h_nelem_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_key_range __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *,
+ * PUBLIC: int __dbcl_db_key_range __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *,
* PUBLIC: u_int32_t));
*/
-gint
+int
__dbcl_db_key_range(dbp, txnp, key, range, flags)
DB * dbp;
DB_TXN * txnp;
@@ -1844,7 +1844,7 @@ __dbcl_db_key_range(dbp, txnp, key, range, flags)
CLIENT *cl;
__db_key_range_msg msg;
__db_key_range_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -1879,22 +1879,22 @@ __dbcl_db_key_range(dbp, txnp, key, range, flags)
ret = __dbcl_db_key_range_ret(dbp, txnp, key, range, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_key_range_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_key_range_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_lorder __P((DB *, int));
+ * PUBLIC: int __dbcl_db_lorder __P((DB *, int));
*/
-gint
+int
__dbcl_db_lorder(dbp, lorder)
DB * dbp;
- gint lorder;
+ int lorder;
{
CLIENT *cl;
__db_lorder_msg msg;
__db_lorder_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -1919,28 +1919,28 @@ __dbcl_db_lorder(dbp, lorder)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_lorder_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_lorder_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_open __P((DB *, DB_TXN *, const gchar *, const gchar *,
+ * PUBLIC: int __dbcl_db_open __P((DB *, DB_TXN *, const char *, const char *,
* PUBLIC: DBTYPE, u_int32_t, int));
*/
-gint
+int
__dbcl_db_open(dbp, txnp, name, subdb, type, flags, mode)
DB * dbp;
DB_TXN * txnp;
- const gchar * name;
- const gchar * subdb;
+ const char * name;
+ const char * subdb;
DBTYPE type;
u_int32_t flags;
- gint mode;
+ int mode;
{
CLIENT *cl;
__db_open_msg msg;
__db_open_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -1961,11 +1961,11 @@ __dbcl_db_open(dbp, txnp, name, subdb, type, flags, mode)
if (name == NULL)
msg.name = "";
else
- msg.name = (gchar *)name;
+ msg.name = (char *)name;
if (subdb == NULL)
msg.subdb = "";
else
- msg.subdb = (gchar *)subdb;
+ msg.subdb = (char *)subdb;
msg.type = type;
msg.flags = flags;
msg.mode = mode;
@@ -1979,14 +1979,14 @@ __dbcl_db_open(dbp, txnp, name, subdb, type, flags, mode)
ret = __dbcl_db_open_ret(dbp, txnp, name, subdb, type, flags, mode, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_open_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_open_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_pagesize __P((DB *, u_int32_t));
+ * PUBLIC: int __dbcl_db_pagesize __P((DB *, u_int32_t));
*/
-gint
+int
__dbcl_db_pagesize(dbp, pagesize)
DB * dbp;
u_int32_t pagesize;
@@ -1994,7 +1994,7 @@ __dbcl_db_pagesize(dbp, pagesize)
CLIENT *cl;
__db_pagesize_msg msg;
__db_pagesize_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2019,14 +2019,14 @@ __dbcl_db_pagesize(dbp, pagesize)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_pagesize_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_pagesize_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_panic __P((DB *, void (*)(DB_ENV *, int)));
+ * PUBLIC: int __dbcl_db_panic __P((DB *, void (*)(DB_ENV *, int)));
*/
-gint
+int
__dbcl_db_panic(dbp, func0)
DB * dbp;
void (*func0) __P((DB_ENV *, int));
@@ -2039,10 +2039,10 @@ __dbcl_db_panic(dbp, func0)
}
/*
- * PUBLIC: gint __dbcl_db_pget __P((DB *, DB_TXN *, DBT *, DBT *, DBT *,
+ * PUBLIC: int __dbcl_db_pget __P((DB *, DB_TXN *, DBT *, DBT *, DBT *,
* PUBLIC: u_int32_t));
*/
-gint
+int
__dbcl_db_pget(dbp, txnp, skey, pkey, data, flags)
DB * dbp;
DB_TXN * txnp;
@@ -2054,7 +2054,7 @@ __dbcl_db_pget(dbp, txnp, skey, pkey, data, flags)
CLIENT *cl;
__db_pget_msg msg;
__db_pget_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2101,14 +2101,14 @@ __dbcl_db_pget(dbp, txnp, skey, pkey, data, flags)
ret = __dbcl_db_pget_ret(dbp, txnp, skey, pkey, data, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_pget_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_pget_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+ * PUBLIC: int __dbcl_db_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
*/
-gint
+int
__dbcl_db_put(dbp, txnp, key, data, flags)
DB * dbp;
DB_TXN * txnp;
@@ -2119,7 +2119,7 @@ __dbcl_db_put(dbp, txnp, key, data, flags)
CLIENT *cl;
__db_put_msg msg;
__db_put_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2160,22 +2160,22 @@ __dbcl_db_put(dbp, txnp, key, data, flags)
ret = __dbcl_db_put_ret(dbp, txnp, key, data, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_put_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_put_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_re_delim __P((DB *, int));
+ * PUBLIC: int __dbcl_db_re_delim __P((DB *, int));
*/
-gint
+int
__dbcl_db_re_delim(dbp, delim)
DB * dbp;
- gint delim;
+ int delim;
{
CLIENT *cl;
__db_re_delim_msg msg;
__db_re_delim_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2200,14 +2200,14 @@ __dbcl_db_re_delim(dbp, delim)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_re_delim_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_re_delim_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_re_len __P((DB *, u_int32_t));
+ * PUBLIC: int __dbcl_db_re_len __P((DB *, u_int32_t));
*/
-gint
+int
__dbcl_db_re_len(dbp, len)
DB * dbp;
u_int32_t len;
@@ -2215,7 +2215,7 @@ __dbcl_db_re_len(dbp, len)
CLIENT *cl;
__db_re_len_msg msg;
__db_re_len_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2240,22 +2240,22 @@ __dbcl_db_re_len(dbp, len)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_re_len_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_re_len_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_re_pad __P((DB *, int));
+ * PUBLIC: int __dbcl_db_re_pad __P((DB *, int));
*/
-gint
+int
__dbcl_db_re_pad(dbp, pad)
DB * dbp;
- gint pad;
+ int pad;
{
CLIENT *cl;
__db_re_pad_msg msg;
__db_re_pad_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2280,17 +2280,17 @@ __dbcl_db_re_pad(dbp, pad)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_re_pad_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_re_pad_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_re_source __P((DB *, const gchar *));
+ * PUBLIC: int __dbcl_db_re_source __P((DB *, const char *));
*/
-gint
+int
__dbcl_db_re_source(dbp, re_source)
DB * dbp;
- const gchar * re_source;
+ const char * re_source;
{
DB_ENV *dbenv;
@@ -2300,20 +2300,20 @@ __dbcl_db_re_source(dbp, re_source)
}
/*
- * PUBLIC: gint __dbcl_db_remove __P((DB *, const gchar *, const gchar *,
+ * PUBLIC: int __dbcl_db_remove __P((DB *, const char *, const char *,
* PUBLIC: u_int32_t));
*/
-gint
+int
__dbcl_db_remove(dbp, name, subdb, flags)
DB * dbp;
- const gchar * name;
- const gchar * subdb;
+ const char * name;
+ const char * subdb;
u_int32_t flags;
{
CLIENT *cl;
__db_remove_msg msg;
__db_remove_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2330,11 +2330,11 @@ __dbcl_db_remove(dbp, name, subdb, flags)
if (name == NULL)
msg.name = "";
else
- msg.name = (gchar *)name;
+ msg.name = (char *)name;
if (subdb == NULL)
msg.subdb = "";
else
- msg.subdb = (gchar *)subdb;
+ msg.subdb = (char *)subdb;
msg.flags = flags;
replyp = __db_db_remove_4001(&msg, cl);
@@ -2346,26 +2346,26 @@ __dbcl_db_remove(dbp, name, subdb, flags)
ret = __dbcl_db_remove_ret(dbp, name, subdb, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_remove_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_remove_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_rename __P((DB *, const gchar *, const gchar *,
- * PUBLIC: const gchar *, u_int32_t));
+ * PUBLIC: int __dbcl_db_rename __P((DB *, const char *, const char *,
+ * PUBLIC: const char *, u_int32_t));
*/
-gint
+int
__dbcl_db_rename(dbp, name, subdb, newname, flags)
DB * dbp;
- const gchar * name;
- const gchar * subdb;
- const gchar * newname;
+ const char * name;
+ const char * subdb;
+ const char * newname;
u_int32_t flags;
{
CLIENT *cl;
__db_rename_msg msg;
__db_rename_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2382,15 +2382,15 @@ __dbcl_db_rename(dbp, name, subdb, newname, flags)
if (name == NULL)
msg.name = "";
else
- msg.name = (gchar *)name;
+ msg.name = (char *)name;
if (subdb == NULL)
msg.subdb = "";
else
- msg.subdb = (gchar *)subdb;
+ msg.subdb = (char *)subdb;
if (newname == NULL)
msg.newname = "";
else
- msg.newname = (gchar *)newname;
+ msg.newname = (char *)newname;
msg.flags = flags;
replyp = __db_db_rename_4001(&msg, cl);
@@ -2402,23 +2402,23 @@ __dbcl_db_rename(dbp, name, subdb, newname, flags)
ret = __dbcl_db_rename_ret(dbp, name, subdb, newname, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_rename_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_rename_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_stat __P((DB *, gpointer , u_int32_t));
+ * PUBLIC: int __dbcl_db_stat __P((DB *, void *, u_int32_t));
*/
-gint
+int
__dbcl_db_stat(dbp, sp, flags)
DB * dbp;
- gpointer sp;
+ void * sp;
u_int32_t flags;
{
CLIENT *cl;
__db_stat_msg msg;
__db_stat_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2443,14 +2443,14 @@ __dbcl_db_stat(dbp, sp, flags)
ret = __dbcl_db_stat_ret(dbp, sp, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_stat_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_stat_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_sync __P((DB *, u_int32_t));
+ * PUBLIC: int __dbcl_db_sync __P((DB *, u_int32_t));
*/
-gint
+int
__dbcl_db_sync(dbp, flags)
DB * dbp;
u_int32_t flags;
@@ -2458,7 +2458,7 @@ __dbcl_db_sync(dbp, flags)
CLIENT *cl;
__db_sync_msg msg;
__db_sync_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2483,15 +2483,15 @@ __dbcl_db_sync(dbp, flags)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_sync_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_sync_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_truncate __P((DB *, DB_TXN *, u_int32_t *,
+ * PUBLIC: int __dbcl_db_truncate __P((DB *, DB_TXN *, u_int32_t *,
* PUBLIC: u_int32_t));
*/
-gint
+int
__dbcl_db_truncate(dbp, txnp, countp, flags)
DB * dbp;
DB_TXN * txnp;
@@ -2501,7 +2501,7 @@ __dbcl_db_truncate(dbp, txnp, countp, flags)
CLIENT *cl;
__db_truncate_msg msg;
__db_truncate_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2530,17 +2530,17 @@ __dbcl_db_truncate(dbp, txnp, countp, flags)
ret = __dbcl_db_truncate_ret(dbp, txnp, countp, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_truncate_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_truncate_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_upgrade __P((DB *, const gchar *, u_int32_t));
+ * PUBLIC: int __dbcl_db_upgrade __P((DB *, const char *, u_int32_t));
*/
-gint
+int
__dbcl_db_upgrade(dbp, fname, flags)
DB * dbp;
- const gchar * fname;
+ const char * fname;
u_int32_t flags;
{
DB_ENV *dbenv;
@@ -2552,14 +2552,14 @@ __dbcl_db_upgrade(dbp, fname, flags)
}
/*
- * PUBLIC: gint __dbcl_db_verify __P((DB *, const gchar *, const gchar *, FILE *,
+ * PUBLIC: int __dbcl_db_verify __P((DB *, const char *, const char *, FILE *,
* PUBLIC: u_int32_t));
*/
-gint
+int
__dbcl_db_verify(dbp, fname, subdb, outfile, flags)
DB * dbp;
- const gchar * fname;
- const gchar * subdb;
+ const char * fname;
+ const char * subdb;
FILE * outfile;
u_int32_t flags;
{
@@ -2574,9 +2574,9 @@ __dbcl_db_verify(dbp, fname, subdb, outfile, flags)
}
/*
- * PUBLIC: gint __dbcl_db_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
+ * PUBLIC: int __dbcl_db_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
*/
-gint
+int
__dbcl_db_cursor(dbp, txnp, dbcpp, flags)
DB * dbp;
DB_TXN * txnp;
@@ -2586,7 +2586,7 @@ __dbcl_db_cursor(dbp, txnp, dbcpp, flags)
CLIENT *cl;
__db_cursor_msg msg;
__db_cursor_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2615,14 +2615,14 @@ __dbcl_db_cursor(dbp, txnp, dbcpp, flags)
ret = __dbcl_db_cursor_ret(dbp, txnp, dbcpp, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_cursor_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_cursor_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_db_join __P((DB *, DBC **, DBC **, u_int32_t));
+ * PUBLIC: int __dbcl_db_join __P((DB *, DBC **, DBC **, u_int32_t));
*/
-gint
+int
__dbcl_db_join(dbp, curs, dbcp, flags)
DB * dbp;
DBC ** curs;
@@ -2632,10 +2632,10 @@ __dbcl_db_join(dbp, curs, dbcp, flags)
CLIENT *cl;
__db_join_msg msg;
__db_join_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
DBC ** cursp;
- gint cursi;
+ int cursi;
u_int32_t * cursq;
ret = 0;
@@ -2669,21 +2669,21 @@ __dbcl_db_join(dbp, curs, dbcp, flags)
ret = __dbcl_db_join_ret(dbp, curs, dbcp, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___db_join_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___db_join_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_dbc_close __P((DBC *));
+ * PUBLIC: int __dbcl_dbc_close __P((DBC *));
*/
-gint
+int
__dbcl_dbc_close(dbc)
DBC * dbc;
{
CLIENT *cl;
__dbc_close_msg msg;
__dbc_close_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2707,14 +2707,14 @@ __dbcl_dbc_close(dbc)
ret = __dbcl_dbc_close_ret(dbc, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___dbc_close_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___dbc_close_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_dbc_count __P((DBC *, db_recno_t *, u_int32_t));
+ * PUBLIC: int __dbcl_dbc_count __P((DBC *, db_recno_t *, u_int32_t));
*/
-gint
+int
__dbcl_dbc_count(dbc, countp, flags)
DBC * dbc;
db_recno_t * countp;
@@ -2723,7 +2723,7 @@ __dbcl_dbc_count(dbc, countp, flags)
CLIENT *cl;
__dbc_count_msg msg;
__dbc_count_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2748,14 +2748,14 @@ __dbcl_dbc_count(dbc, countp, flags)
ret = __dbcl_dbc_count_ret(dbc, countp, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___dbc_count_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___dbc_count_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_dbc_del __P((DBC *, u_int32_t));
+ * PUBLIC: int __dbcl_dbc_del __P((DBC *, u_int32_t));
*/
-gint
+int
__dbcl_dbc_del(dbc, flags)
DBC * dbc;
u_int32_t flags;
@@ -2763,7 +2763,7 @@ __dbcl_dbc_del(dbc, flags)
CLIENT *cl;
__dbc_del_msg msg;
__dbc_del_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2788,14 +2788,14 @@ __dbcl_dbc_del(dbc, flags)
ret = replyp->status;
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___dbc_del_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___dbc_del_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_dbc_dup __P((DBC *, DBC **, u_int32_t));
+ * PUBLIC: int __dbcl_dbc_dup __P((DBC *, DBC **, u_int32_t));
*/
-gint
+int
__dbcl_dbc_dup(dbc, dbcp, flags)
DBC * dbc;
DBC ** dbcp;
@@ -2804,7 +2804,7 @@ __dbcl_dbc_dup(dbc, dbcp, flags)
CLIENT *cl;
__dbc_dup_msg msg;
__dbc_dup_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2829,14 +2829,14 @@ __dbcl_dbc_dup(dbc, dbcp, flags)
ret = __dbcl_dbc_dup_ret(dbc, dbcp, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___dbc_dup_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___dbc_dup_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_dbc_get __P((DBC *, DBT *, DBT *, u_int32_t));
+ * PUBLIC: int __dbcl_dbc_get __P((DBC *, DBT *, DBT *, u_int32_t));
*/
-gint
+int
__dbcl_dbc_get(dbc, key, data, flags)
DBC * dbc;
DBT * key;
@@ -2846,7 +2846,7 @@ __dbcl_dbc_get(dbc, key, data, flags)
CLIENT *cl;
__dbc_get_msg msg;
__dbc_get_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2883,14 +2883,14 @@ __dbcl_dbc_get(dbc, key, data, flags)
ret = __dbcl_dbc_get_ret(dbc, key, data, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___dbc_get_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___dbc_get_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_dbc_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
+ * PUBLIC: int __dbcl_dbc_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
*/
-gint
+int
__dbcl_dbc_pget(dbc, skey, pkey, data, flags)
DBC * dbc;
DBT * skey;
@@ -2901,7 +2901,7 @@ __dbcl_dbc_pget(dbc, skey, pkey, data, flags)
CLIENT *cl;
__dbc_pget_msg msg;
__dbc_pget_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2944,14 +2944,14 @@ __dbcl_dbc_pget(dbc, skey, pkey, data, flags)
ret = __dbcl_dbc_pget_ret(dbc, skey, pkey, data, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___dbc_pget_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___dbc_pget_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_dbc_put __P((DBC *, DBT *, DBT *, u_int32_t));
+ * PUBLIC: int __dbcl_dbc_put __P((DBC *, DBT *, DBT *, u_int32_t));
*/
-gint
+int
__dbcl_dbc_put(dbc, key, data, flags)
DBC * dbc;
DBT * key;
@@ -2961,7 +2961,7 @@ __dbcl_dbc_put(dbc, key, data, flags)
CLIENT *cl;
__dbc_put_msg msg;
__dbc_put_reply *replyp = NULL;
- gint ret;
+ int ret;
DB_ENV *dbenv;
ret = 0;
@@ -2998,19 +2998,19 @@ __dbcl_dbc_put(dbc, key, data, flags)
ret = __dbcl_dbc_put_ret(dbc, key, data, flags, replyp);
out:
if (replyp != NULL)
- xdr_free((xdrproc_t)xdr___dbc_put_reply, (gpointer)replyp);
+ xdr_free((xdrproc_t)xdr___dbc_put_reply, (void *)replyp);
return (ret);
}
/*
- * PUBLIC: gint __dbcl_lock_detect __P((DB_ENV *, u_int32_t, u_int32_t, gint *));
+ * PUBLIC: int __dbcl_lock_detect __P((DB_ENV *, u_int32_t, u_int32_t, int *));
*/
-gint
+int
__dbcl_lock_detect(dbenv, flags, atype, aborted)
DB_ENV * dbenv;
u_int32_t flags;
u_int32_t atype;
- gint * aborted;
+ int * aborted;
{
COMPQUIET(flags, 0);
COMPQUIET(atype, 0);
@@ -3019,10 +3019,10 @@ __dbcl_lock_detect(dbenv, flags, atype, aborted)
}
/*
- * PUBLIC: gint __dbcl_lock_get __P((DB_ENV *, u_int32_t, u_int32_t,
+ * PUBLIC: int __dbcl_lock_get __P((DB_ENV *, u_int32_t, u_int32_t,
* PUBLIC: const DBT *, db_lockmode_t, DB_LOCK *));
*/
-gint
+int
__dbcl_lock_get(dbenv, locker, flags, obj, mode, lock)
DB_ENV * dbenv;
u_int32_t locker;
@@ -3040,9 +3040,9 @@ __dbcl_lock_get(dbenv, locker, flags, obj, mode, lock)
}
/*
- * PUBLIC: gint __dbcl_lock_id __P((DB_ENV *, u_int32_t *));
+ * PUBLIC: int __dbcl_lock_id __P((DB_ENV *, u_int32_t *));
*/
-gint
+int
__dbcl_lock_id(dbenv, idp)
DB_ENV * dbenv;
u_int32_t * idp;
@@ -3052,9 +3052,9 @@ __dbcl_lock_id(dbenv, idp)
}
/*
- * PUBLIC: gint __dbcl_lock_id_free __P((DB_ENV *, u_int32_t));
+ * PUBLIC: int __dbcl_lock_id_free __P((DB_ENV *, u_int32_t));
*/
-gint
+int
__dbcl_lock_id_free(dbenv, id)
DB_ENV * dbenv;
u_int32_t id;
@@ -3064,9 +3064,9 @@ __dbcl_lock_id_free(dbenv, id)
}
/*
- * PUBLIC: gint __dbcl_lock_put __P((DB_ENV *, DB_LOCK *));
+ * PUBLIC: int __dbcl_lock_put __P((DB_ENV *, DB_LOCK *));
*/
-gint
+int
__dbcl_lock_put(dbenv, lock)
DB_ENV * dbenv;
DB_LOCK * lock;
@@ -3076,9 +3076,9 @@ __dbcl_lock_put(dbenv, lock)
}
/*
- * PUBLIC: gint __dbcl_lock_stat __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
+ * PUBLIC: int __dbcl_lock_stat __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
*/
-gint
+int
__dbcl_lock_stat(dbenv, statp, flags)
DB_ENV * dbenv;
DB_LOCK_STAT ** statp;
@@ -3090,16 +3090,16 @@ __dbcl_lock_stat(dbenv, statp, flags)
}
/*
- * PUBLIC: gint __dbcl_lock_vec __P((DB_ENV *, u_int32_t, u_int32_t,
+ * PUBLIC: int __dbcl_lock_vec __P((DB_ENV *, u_int32_t, u_int32_t,
* PUBLIC: DB_LOCKREQ *, int, DB_LOCKREQ **));
*/
-gint
+int
__dbcl_lock_vec(dbenv, locker, flags, list, nlist, elistp)
DB_ENV * dbenv;
u_int32_t locker;
u_int32_t flags;
DB_LOCKREQ * list;
- gint nlist;
+ int nlist;
DB_LOCKREQ ** elistp;
{
COMPQUIET(locker, 0);
@@ -3111,12 +3111,12 @@ __dbcl_lock_vec(dbenv, locker, flags, list, nlist, elistp)
}
/*
- * PUBLIC: gint __dbcl_log_archive __P((DB_ENV *, gchar ***, u_int32_t));
+ * PUBLIC: int __dbcl_log_archive __P((DB_ENV *, char ***, u_int32_t));
*/
-gint
+int
__dbcl_log_archive(dbenv, listp, flags)
DB_ENV * dbenv;
- gchar *** listp;
+ char *** listp;
u_int32_t flags;
{
COMPQUIET(listp, 0);
@@ -3125,9 +3125,9 @@ __dbcl_log_archive(dbenv, listp, flags)
}
/*
- * PUBLIC: gint __dbcl_log_cursor __P((DB_ENV *, DB_LOGC **, u_int32_t));
+ * PUBLIC: int __dbcl_log_cursor __P((DB_ENV *, DB_LOGC **, u_int32_t));
*/
-gint
+int
__dbcl_log_cursor(dbenv, logcp, flags)
DB_ENV * dbenv;
DB_LOGC ** logcp;
@@ -3139,13 +3139,13 @@ __dbcl_log_cursor(dbenv, logcp, flags)
}
/*
- * PUBLIC: gint __dbcl_log_file __P((DB_ENV *, const DB_LSN *, gchar *, size_t));
+ * PUBLIC: int __dbcl_log_file __P((DB_ENV *, const DB_LSN *, char *, size_t));
*/
-gint
+int
__dbcl_log_file(dbenv, lsn, namep, len)
DB_ENV * dbenv;
const DB_LSN * lsn;
- gchar * namep;
+ char * namep;
size_t len;
{
COMPQUIET(lsn, NULL);
@@ -3155,9 +3155,9 @@ __dbcl_log_file(dbenv, lsn, namep, len)
}
/*
- * PUBLIC: gint __dbcl_log_flush __P((DB_ENV *, const DB_LSN *));
+ * PUBLIC: int __dbcl_log_flush __P((DB_ENV *, const DB_LSN *));
*/
-gint
+int
__dbcl_log_flush(dbenv, lsn)
DB_ENV * dbenv;
const DB_LSN * lsn;
@@ -3167,10 +3167,10 @@ __dbcl_log_flush(dbenv, lsn)
}
/*
- * PUBLIC: gint __dbcl_log_put __P((DB_ENV *, DB_LSN *, const DBT *,
+ * PUBLIC: int __dbcl_log_put __P((DB_ENV *, DB_LSN *, const DBT *,
* PUBLIC: u_int32_t));
*/
-gint
+int
__dbcl_log_put(dbenv, lsn, data, flags)
DB_ENV * dbenv;
DB_LSN * lsn;
@@ -3184,9 +3184,9 @@ __dbcl_log_put(dbenv, lsn, data, flags)
}
/*
- * PUBLIC: gint __dbcl_log_stat __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
+ * PUBLIC: int __dbcl_log_stat __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
*/
-gint
+int
__dbcl_log_stat(dbenv, statp, flags)
DB_ENV * dbenv;
DB_LOG_STAT ** statp;
@@ -3198,9 +3198,9 @@ __dbcl_log_stat(dbenv, statp, flags)
}
/*
- * PUBLIC: gint __dbcl_memp_fcreate __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
+ * PUBLIC: int __dbcl_memp_fcreate __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
*/
-gint
+int
__dbcl_memp_fcreate(dbenv, mpf, flags)
DB_ENV * dbenv;
DB_MPOOLFILE ** mpf;
@@ -3212,15 +3212,15 @@ __dbcl_memp_fcreate(dbenv, mpf, flags)
}
/*
- * PUBLIC: gint __dbcl_memp_register __P((DB_ENV *, int, gint (*)(DB_ENV *,
- * PUBLIC: db_pgno_t, gpointer , DBT *), gint (*)(DB_ENV *, db_pgno_t, gpointer , DBT *)));
+ * PUBLIC: int __dbcl_memp_register __P((DB_ENV *, int, int (*)(DB_ENV *,
+ * PUBLIC: db_pgno_t, void *, DBT *), int (*)(DB_ENV *, db_pgno_t, void *, DBT *)));
*/
-gint
+int
__dbcl_memp_register(dbenv, ftype, func0, func1)
DB_ENV * dbenv;
- gint ftype;
- gint (*func0) __P((DB_ENV *, db_pgno_t, gpointer , DBT *));
- gint (*func1) __P((DB_ENV *, db_pgno_t, gpointer , DBT *));
+ int ftype;
+ int (*func0) __P((DB_ENV *, db_pgno_t, void *, DBT *));
+ int (*func1) __P((DB_ENV *, db_pgno_t, void *, DBT *));
{
COMPQUIET(ftype, 0);
COMPQUIET(func0, 0);
@@ -3229,10 +3229,10 @@ __dbcl_memp_register(dbenv, ftype, func0, func1)
}
/*
- * PUBLIC: gint __dbcl_memp_stat __P((DB_ENV *, DB_MPOOL_STAT **,
+ * PUBLIC: int __dbcl_memp_stat __P((DB_ENV *, DB_MPOOL_STAT **,
* PUBLIC: DB_MPOOL_FSTAT ***, u_int32_t));
*/
-gint
+int
__dbcl_memp_stat(dbenv, gstatp, fstatp, flags)
DB_ENV * dbenv;
DB_MPOOL_STAT ** gstatp;
@@ -3246,9 +3246,9 @@ __dbcl_memp_stat(dbenv, gstatp, fstatp, flags)
}
/*
- * PUBLIC: gint __dbcl_memp_sync __P((DB_ENV *, DB_LSN *));
+ * PUBLIC: int __dbcl_memp_sync __P((DB_ENV *, DB_LSN *));
*/
-gint
+int
__dbcl_memp_sync(dbenv, lsn)
DB_ENV * dbenv;
DB_LSN * lsn;
@@ -3258,13 +3258,13 @@ __dbcl_memp_sync(dbenv, lsn)
}
/*
- * PUBLIC: gint __dbcl_memp_trickle __P((DB_ENV *, int, gint *));
+ * PUBLIC: int __dbcl_memp_trickle __P((DB_ENV *, int, int *));
*/
-gint
+int
__dbcl_memp_trickle(dbenv, pct, nwrotep)
DB_ENV * dbenv;
- gint pct;
- gint * nwrotep;
+ int pct;
+ int * nwrotep;
{
COMPQUIET(pct, 0);
COMPQUIET(nwrotep, 0);
diff --git a/libdb/rpc_client/gen_client_ret.c b/libdb/rpc_client/gen_client_ret.c
index 450bfbe..70aae86 100644
--- a/libdb/rpc_client/gen_client_ret.c
+++ b/libdb/rpc_client/gen_client_ret.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifdef HAVE_RPC
@@ -29,16 +29,16 @@ static const gchar revid[] = "$Id$";
#include "dbinc_auto/rpc_client_ext.h"
/*
- * PUBLIC: gint __dbcl_env_close_ret
+ * PUBLIC: int __dbcl_env_close_ret
* PUBLIC: __P((DB_ENV *, u_int32_t, __env_close_reply *));
*/
-gint
+int
__dbcl_env_close_ret(dbenv, flags, replyp)
DB_ENV *dbenv;
u_int32_t flags;
__env_close_reply *replyp;
{
- gint ret;
+ int ret;
COMPQUIET(flags, 0);
@@ -51,10 +51,10 @@ __dbcl_env_close_ret(dbenv, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_env_create_ret
+ * PUBLIC: int __dbcl_env_create_ret
* PUBLIC: __P((DB_ENV *, long, __env_create_reply *));
*/
-gint
+int
__dbcl_env_create_ret(dbenv, timeout, replyp)
DB_ENV * dbenv;
long timeout;
@@ -70,19 +70,19 @@ __dbcl_env_create_ret(dbenv, timeout, replyp)
}
/*
- * PUBLIC: gint __dbcl_env_open_ret __P((DB_ENV *,
- * PUBLIC: const gchar *, u_int32_t, int, __env_open_reply *));
+ * PUBLIC: int __dbcl_env_open_ret __P((DB_ENV *,
+ * PUBLIC: const char *, u_int32_t, int, __env_open_reply *));
*/
-gint
+int
__dbcl_env_open_ret(dbenv, home, flags, mode, replyp)
DB_ENV *dbenv;
- const gchar *home;
+ const char *home;
u_int32_t flags;
- gint mode;
+ int mode;
__env_open_reply *replyp;
{
DB_TXNMGR *tmgrp;
- gint ret;
+ int ret;
COMPQUIET(home, NULL);
COMPQUIET(mode, 0);
@@ -111,17 +111,17 @@ __dbcl_env_open_ret(dbenv, home, flags, mode, replyp)
}
/*
- * PUBLIC: gint __dbcl_env_remove_ret
- * PUBLIC: __P((DB_ENV *, const gchar *, u_int32_t, __env_remove_reply *));
+ * PUBLIC: int __dbcl_env_remove_ret
+ * PUBLIC: __P((DB_ENV *, const char *, u_int32_t, __env_remove_reply *));
*/
-gint
+int
__dbcl_env_remove_ret(dbenv, home, flags, replyp)
DB_ENV *dbenv;
- const gchar *home;
+ const char *home;
u_int32_t flags;
__env_remove_reply *replyp;
{
- gint ret;
+ int ret;
COMPQUIET(home, NULL);
COMPQUIET(flags, 0);
@@ -135,9 +135,9 @@ __dbcl_env_remove_ret(dbenv, home, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_txn_abort_ret __P((DB_TXN *, __txn_abort_reply *));
+ * PUBLIC: int __dbcl_txn_abort_ret __P((DB_TXN *, __txn_abort_reply *));
*/
-gint
+int
__dbcl_txn_abort_ret(txnp, replyp)
DB_TXN *txnp;
__txn_abort_reply *replyp;
@@ -147,10 +147,10 @@ __dbcl_txn_abort_ret(txnp, replyp)
}
/*
- * PUBLIC: gint __dbcl_txn_begin_ret __P((DB_ENV *,
+ * PUBLIC: int __dbcl_txn_begin_ret __P((DB_ENV *,
* PUBLIC: DB_TXN *, DB_TXN **, u_int32_t, __txn_begin_reply *));
*/
-gint
+int
__dbcl_txn_begin_ret(envp, parent, txnpp, flags, replyp)
DB_ENV *envp;
DB_TXN *parent, **txnpp;
@@ -158,7 +158,7 @@ __dbcl_txn_begin_ret(envp, parent, txnpp, flags, replyp)
__txn_begin_reply *replyp;
{
DB_TXN *txn;
- gint ret;
+ int ret;
COMPQUIET(flags, 0);
@@ -173,10 +173,10 @@ __dbcl_txn_begin_ret(envp, parent, txnpp, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_txn_commit_ret
+ * PUBLIC: int __dbcl_txn_commit_ret
* PUBLIC: __P((DB_TXN *, u_int32_t, __txn_commit_reply *));
*/
-gint
+int
__dbcl_txn_commit_ret(txnp, flags, replyp)
DB_TXN *txnp;
u_int32_t flags;
@@ -189,10 +189,10 @@ __dbcl_txn_commit_ret(txnp, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_txn_discard_ret __P((DB_TXN *, u_int32_t,
+ * PUBLIC: int __dbcl_txn_discard_ret __P((DB_TXN *, u_int32_t,
* PUBLIC: __txn_discard_reply *));
*/
-gint
+int
__dbcl_txn_discard_ret(txnp, flags, replyp)
DB_TXN * txnp;
u_int32_t flags;
@@ -205,10 +205,10 @@ __dbcl_txn_discard_ret(txnp, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_txn_recover_ret __P((DB_ENV *, DB_PREPLIST *, long,
+ * PUBLIC: int __dbcl_txn_recover_ret __P((DB_ENV *, DB_PREPLIST *, long,
* PUBLIC: long *, u_int32_t, __txn_recover_reply *));
*/
-gint
+int
__dbcl_txn_recover_ret(dbenv, preplist, count, retp, flags, replyp)
DB_ENV * dbenv;
DB_PREPLIST * preplist;
@@ -220,7 +220,7 @@ __dbcl_txn_recover_ret(dbenv, preplist, count, retp, flags, replyp)
DB_PREPLIST *prep;
DB_TXN *txnarray, *txn;
u_int32_t i, *txnid;
- gint ret;
+ int ret;
u_int8_t *gid;
COMPQUIET(flags, 0);
@@ -263,15 +263,15 @@ __dbcl_txn_recover_ret(dbenv, preplist, count, retp, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_db_close_ret __P((DB *, u_int32_t, __db_close_reply *));
+ * PUBLIC: int __dbcl_db_close_ret __P((DB *, u_int32_t, __db_close_reply *));
*/
-gint
+int
__dbcl_db_close_ret(dbp, flags, replyp)
DB *dbp;
u_int32_t flags;
__db_close_reply *replyp;
{
- gint ret;
+ int ret;
COMPQUIET(flags, 0);
@@ -284,10 +284,10 @@ __dbcl_db_close_ret(dbp, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_db_create_ret
+ * PUBLIC: int __dbcl_db_create_ret
* PUBLIC: __P((DB *, DB_ENV *, u_int32_t, __db_create_reply *));
*/
-gint
+int
__dbcl_db_create_ret(dbp, dbenv, flags, replyp)
DB * dbp;
DB_ENV * dbenv;
@@ -304,10 +304,10 @@ __dbcl_db_create_ret(dbp, dbenv, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_db_get_ret
+ * PUBLIC: int __dbcl_db_get_ret
* PUBLIC: __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t, __db_get_reply *));
*/
-gint
+int
__dbcl_db_get_ret(dbp, txnp, key, data, flags, replyp)
DB *dbp;
DB_TXN *txnp;
@@ -316,8 +316,8 @@ __dbcl_db_get_ret(dbp, txnp, key, data, flags, replyp)
__db_get_reply *replyp;
{
DB_ENV *dbenv;
- gint ret;
- gpointer oldkey;
+ int ret;
+ void *oldkey;
COMPQUIET(txnp, NULL);
COMPQUIET(flags, 0);
@@ -347,10 +347,10 @@ __dbcl_db_get_ret(dbp, txnp, key, data, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_db_key_range_ret __P((DB *, DB_TXN *,
+ * PUBLIC: int __dbcl_db_key_range_ret __P((DB *, DB_TXN *,
* PUBLIC: DBT *, DB_KEY_RANGE *, u_int32_t, __db_key_range_reply *));
*/
-gint
+int
__dbcl_db_key_range_ret(dbp, txnp, key, range, flags, replyp)
DB *dbp;
DB_TXN *txnp;
@@ -373,17 +373,17 @@ __dbcl_db_key_range_ret(dbp, txnp, key, range, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_db_open_ret __P((DB *, DB_TXN *, const gchar *,
- * PUBLIC: const gchar *, DBTYPE, u_int32_t, int, __db_open_reply *));
+ * PUBLIC: int __dbcl_db_open_ret __P((DB *, DB_TXN *, const char *,
+ * PUBLIC: const char *, DBTYPE, u_int32_t, int, __db_open_reply *));
*/
-gint
+int
__dbcl_db_open_ret(dbp, txn, name, subdb, type, flags, mode, replyp)
DB *dbp;
DB_TXN *txn;
- const gchar *name, *subdb;
+ const char *name, *subdb;
DBTYPE type;
u_int32_t flags;
- gint mode;
+ int mode;
__db_open_reply *replyp;
{
COMPQUIET(txn, NULL);
@@ -419,10 +419,10 @@ __dbcl_db_open_ret(dbp, txn, name, subdb, type, flags, mode, replyp)
}
/*
- * PUBLIC: gint __dbcl_db_pget_ret __P((DB *, DB_TXN *, DBT *, DBT *, DBT *,
+ * PUBLIC: int __dbcl_db_pget_ret __P((DB *, DB_TXN *, DBT *, DBT *, DBT *,
* PUBLIC: u_int32_t, __db_pget_reply *));
*/
-gint
+int
__dbcl_db_pget_ret(dbp, txnp, skey, pkey, data, flags, replyp)
DB * dbp;
DB_TXN * txnp;
@@ -433,8 +433,8 @@ __dbcl_db_pget_ret(dbp, txnp, skey, pkey, data, flags, replyp)
__db_pget_reply *replyp;
{
DB_ENV *dbenv;
- gint ret;
- gpointer oldskey, *oldpkey;
+ int ret;
+ void *oldskey, *oldpkey;
COMPQUIET(txnp, NULL);
COMPQUIET(flags, 0);
@@ -477,10 +477,10 @@ __dbcl_db_pget_ret(dbp, txnp, skey, pkey, data, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_db_put_ret
+ * PUBLIC: int __dbcl_db_put_ret
* PUBLIC: __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t, __db_put_reply *));
*/
-gint
+int
__dbcl_db_put_ret(dbp, txnp, key, data, flags, replyp)
DB *dbp;
DB_TXN *txnp;
@@ -488,7 +488,7 @@ __dbcl_db_put_ret(dbp, txnp, key, data, flags, replyp)
u_int32_t flags;
__db_put_reply *replyp;
{
- gint ret;
+ int ret;
COMPQUIET(dbp, NULL);
COMPQUIET(txnp, NULL);
@@ -502,17 +502,17 @@ __dbcl_db_put_ret(dbp, txnp, key, data, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_db_remove_ret __P((DB *,
- * PUBLIC: const gchar *, const gchar *, u_int32_t, __db_remove_reply *));
+ * PUBLIC: int __dbcl_db_remove_ret __P((DB *,
+ * PUBLIC: const char *, const char *, u_int32_t, __db_remove_reply *));
*/
-gint
+int
__dbcl_db_remove_ret(dbp, name, subdb, flags, replyp)
DB *dbp;
- const gchar *name, *subdb;
+ const char *name, *subdb;
u_int32_t flags;
__db_remove_reply *replyp;
{
- gint ret;
+ int ret;
COMPQUIET(name, 0);
COMPQUIET(subdb, 0);
@@ -527,17 +527,17 @@ __dbcl_db_remove_ret(dbp, name, subdb, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_db_rename_ret __P((DB *, const gchar *,
- * PUBLIC: const gchar *, const gchar *, u_int32_t, __db_rename_reply *));
+ * PUBLIC: int __dbcl_db_rename_ret __P((DB *, const char *,
+ * PUBLIC: const char *, const char *, u_int32_t, __db_rename_reply *));
*/
-gint
+int
__dbcl_db_rename_ret(dbp, name, subdb, newname, flags, replyp)
DB *dbp;
- const gchar *name, *subdb, *newname;
+ const char *name, *subdb, *newname;
u_int32_t flags;
__db_rename_reply *replyp;
{
- gint ret;
+ int ret;
COMPQUIET(name, 0);
COMPQUIET(subdb, 0);
@@ -553,17 +553,17 @@ __dbcl_db_rename_ret(dbp, name, subdb, newname, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_db_stat_ret
- * PUBLIC: __P((DB *, gpointer , u_int32_t, __db_stat_reply *));
+ * PUBLIC: int __dbcl_db_stat_ret
+ * PUBLIC: __P((DB *, void *, u_int32_t, __db_stat_reply *));
*/
-gint
+int
__dbcl_db_stat_ret(dbp, sp, flags, replyp)
DB *dbp;
- gpointer sp;
+ void *sp;
u_int32_t flags;
__db_stat_reply *replyp;
{
- gint len, ret;
+ int len, ret;
u_int32_t i, *q, *p, *retsp;
COMPQUIET(flags, 0);
@@ -582,10 +582,10 @@ __dbcl_db_stat_ret(dbp, sp, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_db_truncate_ret __P((DB *, DB_TXN *, u_int32_t *,
+ * PUBLIC: int __dbcl_db_truncate_ret __P((DB *, DB_TXN *, u_int32_t *,
* PUBLIC: u_int32_t, __db_truncate_reply *));
*/
-gint
+int
__dbcl_db_truncate_ret(dbp, txnp, countp, flags, replyp)
DB *dbp;
DB_TXN *txnp;
@@ -604,10 +604,10 @@ __dbcl_db_truncate_ret(dbp, txnp, countp, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_db_cursor_ret
+ * PUBLIC: int __dbcl_db_cursor_ret
* PUBLIC: __P((DB *, DB_TXN *, DBC **, u_int32_t, __db_cursor_reply *));
*/
-gint
+int
__dbcl_db_cursor_ret(dbp, txnp, dbcp, flags, replyp)
DB *dbp;
DB_TXN *txnp;
@@ -625,10 +625,10 @@ __dbcl_db_cursor_ret(dbp, txnp, dbcp, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_db_join_ret
+ * PUBLIC: int __dbcl_db_join_ret
* PUBLIC: __P((DB *, DBC **, DBC **, u_int32_t, __db_join_reply *));
*/
-gint
+int
__dbcl_db_join_ret(dbp, curs, dbcp, flags, replyp)
DB *dbp;
DBC **curs, **dbcp;
@@ -652,9 +652,9 @@ __dbcl_db_join_ret(dbp, curs, dbcp, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_dbc_close_ret __P((DBC *, __dbc_close_reply *));
+ * PUBLIC: int __dbcl_dbc_close_ret __P((DBC *, __dbc_close_reply *));
*/
-gint
+int
__dbcl_dbc_close_ret(dbc, replyp)
DBC *dbc;
__dbc_close_reply *replyp;
@@ -664,10 +664,10 @@ __dbcl_dbc_close_ret(dbc, replyp)
}
/*
- * PUBLIC: gint __dbcl_dbc_count_ret
+ * PUBLIC: int __dbcl_dbc_count_ret
* PUBLIC: __P((DBC *, db_recno_t *, u_int32_t, __dbc_count_reply *));
*/
-gint
+int
__dbcl_dbc_count_ret(dbc, countp, flags, replyp)
DBC *dbc;
db_recno_t *countp;
@@ -685,10 +685,10 @@ __dbcl_dbc_count_ret(dbc, countp, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_dbc_dup_ret
+ * PUBLIC: int __dbcl_dbc_dup_ret
* PUBLIC: __P((DBC *, DBC **, u_int32_t, __dbc_dup_reply *));
*/
-gint
+int
__dbcl_dbc_dup_ret(dbc, dbcp, flags, replyp)
DBC *dbc, **dbcp;
u_int32_t flags;
@@ -703,10 +703,10 @@ __dbcl_dbc_dup_ret(dbc, dbcp, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_dbc_get_ret
+ * PUBLIC: int __dbcl_dbc_get_ret
* PUBLIC: __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_get_reply *));
*/
-gint
+int
__dbcl_dbc_get_ret(dbc, key, data, flags, replyp)
DBC *dbc;
DBT *key, *data;
@@ -714,8 +714,8 @@ __dbcl_dbc_get_ret(dbc, key, data, flags, replyp)
__dbc_get_reply *replyp;
{
DB_ENV *dbenv;
- gint ret;
- gpointer oldkey;
+ int ret;
+ void *oldkey;
COMPQUIET(flags, 0);
@@ -744,10 +744,10 @@ __dbcl_dbc_get_ret(dbc, key, data, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_dbc_pget_ret __P((DBC *, DBT *, DBT *, DBT *, u_int32_t,
+ * PUBLIC: int __dbcl_dbc_pget_ret __P((DBC *, DBT *, DBT *, DBT *, u_int32_t,
* PUBLIC: __dbc_pget_reply *));
*/
-gint
+int
__dbcl_dbc_pget_ret(dbc, skey, pkey, data, flags, replyp)
DBC * dbc;
DBT * skey;
@@ -757,8 +757,8 @@ __dbcl_dbc_pget_ret(dbc, skey, pkey, data, flags, replyp)
__dbc_pget_reply *replyp;
{
DB_ENV *dbenv;
- gint ret;
- gpointer oldskey, *oldpkey;
+ int ret;
+ void *oldskey, *oldpkey;
COMPQUIET(flags, 0);
@@ -800,10 +800,10 @@ __dbcl_dbc_pget_ret(dbc, skey, pkey, data, flags, replyp)
}
/*
- * PUBLIC: gint __dbcl_dbc_put_ret
+ * PUBLIC: int __dbcl_dbc_put_ret
* PUBLIC: __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_put_reply *));
*/
-gint
+int
__dbcl_dbc_put_ret(dbc, key, data, flags, replyp)
DBC *dbc;
DBT *key, *data;
diff --git a/libdb/rpc_server/c/db_server_proc.c b/libdb/rpc_server/c/db_server_proc.c
index 980a40c..6056749 100644
--- a/libdb/rpc_server/c/db_server_proc.c
+++ b/libdb/rpc_server/c/db_server_proc.c
@@ -9,7 +9,7 @@
#ifdef HAVE_RPC
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -42,7 +42,7 @@ __env_cachesize_proc(dbenvcl_id, gbytes, bytes,
{
DB_ENV *dbenv;
ct_entry *dbenv_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
@@ -83,7 +83,7 @@ __env_create_proc(timeout, replyp)
{
DB_ENV *dbenv;
ct_entry *ctp;
- gint ret;
+ int ret;
ctp = new_ct_ent(&replyp->status);
if (ctp == NULL)
@@ -105,7 +105,7 @@ __env_create_proc(timeout, replyp)
/* BEGIN __env_dbremove_proc */
/*
- * PUBLIC: void __env_dbremove_proc __P((long, long, gchar *, gchar *, u_int32_t,
+ * PUBLIC: void __env_dbremove_proc __P((long, long, char *, char *, u_int32_t,
* PUBLIC: __env_dbremove_reply *));
*/
void
@@ -113,13 +113,13 @@ __env_dbremove_proc(dbenvcl_id, txnpcl_id, name,
subdb, flags, replyp)
long dbenvcl_id;
long txnpcl_id;
- gchar *name;
- gchar *subdb;
+ char *name;
+ char *subdb;
u_int32_t flags;
__env_dbremove_reply *replyp;
/* END __env_dbremove_proc */
{
- gint ret;
+ int ret;
DB_ENV * dbenv;
ct_entry *dbenv_ctp;
DB_TXN * txnp;
@@ -142,7 +142,7 @@ __env_dbremove_proc(dbenvcl_id, txnpcl_id, name,
/* BEGIN __env_dbrename_proc */
/*
- * PUBLIC: void __env_dbrename_proc __P((long, long, gchar *, gchar *, gchar *,
+ * PUBLIC: void __env_dbrename_proc __P((long, long, char *, char *, char *,
* PUBLIC: u_int32_t, __env_dbrename_reply *));
*/
void
@@ -150,14 +150,14 @@ __env_dbrename_proc(dbenvcl_id, txnpcl_id, name,
subdb, newname, flags, replyp)
long dbenvcl_id;
long txnpcl_id;
- gchar *name;
- gchar *subdb;
- gchar *newname;
+ char *name;
+ char *subdb;
+ char *newname;
u_int32_t flags;
__env_dbrename_reply *replyp;
/* END __env_dbrename_proc */
{
- gint ret;
+ int ret;
DB_ENV * dbenv;
ct_entry *dbenv_ctp;
DB_TXN * txnp;
@@ -180,18 +180,18 @@ __env_dbrename_proc(dbenvcl_id, txnpcl_id, name,
/* BEGIN __env_encrypt_proc */
/*
- * PUBLIC: void __env_encrypt_proc __P((long, gchar *, u_int32_t,
+ * PUBLIC: void __env_encrypt_proc __P((long, char *, u_int32_t,
* PUBLIC: __env_encrypt_reply *));
*/
void
__env_encrypt_proc(dbenvcl_id, passwd, flags, replyp)
long dbenvcl_id;
- gchar *passwd;
+ char *passwd;
u_int32_t flags;
__env_encrypt_reply *replyp;
/* END __env_encrypt_proc */
{
- gint ret;
+ int ret;
DB_ENV * dbenv;
ct_entry *dbenv_ctp;
@@ -219,7 +219,7 @@ __env_flags_proc(dbenvcl_id, flags, onoff, replyp)
{
DB_ENV *dbenv;
ct_entry *dbenv_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
@@ -235,14 +235,14 @@ __env_flags_proc(dbenvcl_id, flags, onoff, replyp)
}
/* BEGIN __env_open_proc */
/*
- * PUBLIC: void __env_open_proc __P((long, gchar *, u_int32_t, u_int32_t,
+ * PUBLIC: void __env_open_proc __P((long, char *, u_int32_t, u_int32_t,
* PUBLIC: __env_open_reply *));
*/
void
__env_open_proc(dbenvcl_id, home, flags,
mode, replyp)
long dbenvcl_id;
- gchar *home;
+ char *home;
u_int32_t flags;
u_int32_t mode;
__env_open_reply *replyp;
@@ -251,7 +251,7 @@ __env_open_proc(dbenvcl_id, home, flags,
DB_ENV *dbenv;
ct_entry *dbenv_ctp, *new_ctp;
u_int32_t newflags, shareflags;
- gint ret;
+ int ret;
home_entry *fullhome;
ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
@@ -304,20 +304,20 @@ out: replyp->status = ret;
/* BEGIN __env_remove_proc */
/*
- * PUBLIC: void __env_remove_proc __P((long, gchar *, u_int32_t,
+ * PUBLIC: void __env_remove_proc __P((long, char *, u_int32_t,
* PUBLIC: __env_remove_reply *));
*/
void
__env_remove_proc(dbenvcl_id, home, flags, replyp)
long dbenvcl_id;
- gchar *home;
+ char *home;
u_int32_t flags;
__env_remove_reply *replyp;
/* END __env_remove_proc */
{
DB_ENV *dbenv;
ct_entry *dbenv_ctp;
- gint ret;
+ int ret;
home_entry *fullhome;
ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
@@ -347,7 +347,7 @@ __txn_abort_proc(txnpcl_id, replyp)
{
DB_TXN *txnp;
ct_entry *txnp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
txnp = (DB_TXN *)txnp_ctp->ct_anyp;
@@ -375,7 +375,7 @@ __txn_begin_proc(dbenvcl_id, parentcl_id,
DB_ENV *dbenv;
DB_TXN *parent, *txnp;
ct_entry *ctp, *dbenv_ctp, *parent_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
@@ -422,7 +422,7 @@ __txn_commit_proc(txnpcl_id, flags, replyp)
{
DB_TXN *txnp;
ct_entry *txnp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
txnp = (DB_TXN *)txnp_ctp->ct_anyp;
@@ -448,7 +448,7 @@ __txn_discard_proc(txnpcl_id, flags, replyp)
{
DB_TXN *txnp;
ct_entry *txnp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
txnp = (DB_TXN *)txnp_ctp->ct_anyp;
@@ -474,7 +474,7 @@ __txn_prepare_proc(txnpcl_id, gid, replyp)
{
DB_TXN *txnp;
ct_entry *txnp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
txnp = (DB_TXN *)txnp_ctp->ct_anyp;
@@ -487,7 +487,7 @@ __txn_prepare_proc(txnpcl_id, gid, replyp)
/* BEGIN __txn_recover_proc */
/*
* PUBLIC: void __txn_recover_proc __P((long, u_int32_t, u_int32_t,
- * PUBLIC: __txn_recover_reply *, gint *));
+ * PUBLIC: __txn_recover_reply *, int *));
*/
void
__txn_recover_proc(dbenvcl_id, count,
@@ -496,7 +496,7 @@ __txn_recover_proc(dbenvcl_id, count,
u_int32_t count;
u_int32_t flags;
__txn_recover_reply *replyp;
- gint * freep;
+ int * freep;
/* END __txn_recover_proc */
{
DB_ENV *dbenv;
@@ -504,7 +504,7 @@ __txn_recover_proc(dbenvcl_id, count,
ct_entry *dbenv_ctp, *ctp;
long erri, i, retcount;
u_int32_t *txnidp;
- gint ret;
+ int ret;
u_int8_t *gid;
ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
@@ -614,7 +614,7 @@ __db_bt_maxkey_proc(dbpcl_id, maxkey, replyp)
{
DB *dbp;
ct_entry *dbp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -643,7 +643,7 @@ __db_associate_proc(dbpcl_id, txnpcl_id, sdbpcl_id,
DB *dbp, *sdbp;
DB_TXN *txnp;
ct_entry *dbp_ctp, *sdbp_ctp, *txnp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -684,7 +684,7 @@ __db_bt_minkey_proc(dbpcl_id, minkey, replyp)
{
DB *dbp;
ct_entry *dbp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -727,7 +727,7 @@ __db_create_proc(dbenvcl_id, flags, replyp)
DB *dbp;
DB_ENV *dbenv;
ct_entry *dbenv_ctp, *dbp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
@@ -755,7 +755,7 @@ __db_create_proc(dbenvcl_id, flags, replyp)
/* BEGIN __db_del_proc */
/*
* PUBLIC: void __db_del_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC: u_int32_t, gpointer , u_int32_t, u_int32_t, __db_del_reply *));
+ * PUBLIC: u_int32_t, void *, u_int32_t, u_int32_t, __db_del_reply *));
*/
void
__db_del_proc(dbpcl_id, txnpcl_id, keydlen,
@@ -767,7 +767,7 @@ __db_del_proc(dbpcl_id, txnpcl_id, keydlen,
u_int32_t keydoff;
u_int32_t keyulen;
u_int32_t keyflags;
- gpointer keydata;
+ void *keydata;
u_int32_t keysize;
u_int32_t flags;
__db_del_reply *replyp;
@@ -777,7 +777,7 @@ __db_del_proc(dbpcl_id, txnpcl_id, keydlen,
DBT key;
DB_TXN *txnp;
ct_entry *dbp_ctp, *txnp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -805,18 +805,18 @@ __db_del_proc(dbpcl_id, txnpcl_id, keydlen,
/* BEGIN __db_encrypt_proc */
/*
- * PUBLIC: void __db_encrypt_proc __P((long, gchar *, u_int32_t,
+ * PUBLIC: void __db_encrypt_proc __P((long, char *, u_int32_t,
* PUBLIC: __db_encrypt_reply *));
*/
void
__db_encrypt_proc(dbpcl_id, passwd, flags, replyp)
long dbpcl_id;
- gchar *passwd;
+ char *passwd;
u_int32_t flags;
__db_encrypt_reply *replyp;
/* END __db_encrypt_proc */
{
- gint ret;
+ int ret;
DB * dbp;
ct_entry *dbp_ctp;
@@ -842,7 +842,7 @@ __db_extentsize_proc(dbpcl_id, extentsize, replyp)
{
DB *dbp;
ct_entry *dbp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -866,7 +866,7 @@ __db_flags_proc(dbpcl_id, flags, replyp)
{
DB *dbp;
ct_entry *dbp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -881,8 +881,8 @@ __db_flags_proc(dbpcl_id, flags, replyp)
/* BEGIN __db_get_proc */
/*
* PUBLIC: void __db_get_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC: u_int32_t, gpointer , u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer ,
- * PUBLIC: u_int32_t, u_int32_t, __db_get_reply *, gint *));
+ * PUBLIC: u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
+ * PUBLIC: u_int32_t, u_int32_t, __db_get_reply *, int *));
*/
void
__db_get_proc(dbpcl_id, txnpcl_id, keydlen,
@@ -895,24 +895,24 @@ __db_get_proc(dbpcl_id, txnpcl_id, keydlen,
u_int32_t keydoff;
u_int32_t keyulen;
u_int32_t keyflags;
- gpointer keydata;
+ void *keydata;
u_int32_t keysize;
u_int32_t datadlen;
u_int32_t datadoff;
u_int32_t dataulen;
u_int32_t dataflags;
- gpointer datadata;
+ void *datadata;
u_int32_t datasize;
u_int32_t flags;
__db_get_reply *replyp;
- gint * freep;
+ int * freep;
/* END __db_get_proc */
{
DB *dbp;
DBT key, data;
DB_TXN *txnp;
ct_entry *dbp_ctp, *txnp_ctp;
- gint key_alloc, bulk_alloc, ret;
+ int key_alloc, bulk_alloc, ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1042,7 +1042,7 @@ __db_h_ffactor_proc(dbpcl_id, ffactor, replyp)
{
DB *dbp;
ct_entry *dbp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1067,7 +1067,7 @@ __db_h_nelem_proc(dbpcl_id, nelem, replyp)
{
DB *dbp;
ct_entry *dbp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1081,7 +1081,7 @@ __db_h_nelem_proc(dbpcl_id, nelem, replyp)
/* BEGIN __db_key_range_proc */
/*
* PUBLIC: void __db_key_range_proc __P((long, long, u_int32_t, u_int32_t,
- * PUBLIC: u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, __db_key_range_reply *));
+ * PUBLIC: u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_key_range_reply *));
*/
void
__db_key_range_proc(dbpcl_id, txnpcl_id, keydlen,
@@ -1093,7 +1093,7 @@ __db_key_range_proc(dbpcl_id, txnpcl_id, keydlen,
u_int32_t keydoff;
u_int32_t keyulen;
u_int32_t keyflags;
- gpointer keydata;
+ void *keydata;
u_int32_t keysize;
u_int32_t flags;
__db_key_range_reply *replyp;
@@ -1104,7 +1104,7 @@ __db_key_range_proc(dbpcl_id, txnpcl_id, keydlen,
DB_KEY_RANGE range;
DB_TXN *txnp;
ct_entry *dbp_ctp, *txnp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1145,7 +1145,7 @@ __db_lorder_proc(dbpcl_id, lorder, replyp)
{
DB *dbp;
ct_entry *dbp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1158,7 +1158,7 @@ __db_lorder_proc(dbpcl_id, lorder, replyp)
/* BEGIN __db_open_proc */
/*
- * PUBLIC: void __db_open_proc __P((long, long, gchar *, gchar *, u_int32_t,
+ * PUBLIC: void __db_open_proc __P((long, long, char *, char *, u_int32_t,
* PUBLIC: u_int32_t, u_int32_t, __db_open_reply *));
*/
void
@@ -1166,8 +1166,8 @@ __db_open_proc(dbpcl_id, txnpcl_id, name,
subdb, type, flags, mode, replyp)
long dbpcl_id;
long txnpcl_id;
- gchar *name;
- gchar *subdb;
+ char *name;
+ char *subdb;
u_int32_t type;
u_int32_t flags;
u_int32_t mode;
@@ -1178,7 +1178,7 @@ __db_open_proc(dbpcl_id, txnpcl_id, name,
DB_TXN *txnp;
DBTYPE dbtype;
ct_entry *dbp_ctp, *new_ctp, *txnp_ctp;
- gint isswapped, ret;
+ int isswapped, ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1260,7 +1260,7 @@ __db_pagesize_proc(dbpcl_id, pagesize, replyp)
{
DB *dbp;
ct_entry *dbp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1274,9 +1274,9 @@ __db_pagesize_proc(dbpcl_id, pagesize, replyp)
/* BEGIN __db_pget_proc */
/*
* PUBLIC: void __db_pget_proc __P((long, long, u_int32_t, u_int32_t,
- * PUBLIC: u_int32_t, u_int32_t, gpointer , u_int32_t, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC: u_int32_t, gpointer , u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer ,
- * PUBLIC: u_int32_t, u_int32_t, __db_pget_reply *, gint *));
+ * PUBLIC: u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t,
+ * PUBLIC: u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
+ * PUBLIC: u_int32_t, u_int32_t, __db_pget_reply *, int *));
*/
void
__db_pget_proc(dbpcl_id, txnpcl_id, skeydlen,
@@ -1291,30 +1291,30 @@ __db_pget_proc(dbpcl_id, txnpcl_id, skeydlen,
u_int32_t skeydoff;
u_int32_t skeyulen;
u_int32_t skeyflags;
- gpointer skeydata;
+ void *skeydata;
u_int32_t skeysize;
u_int32_t pkeydlen;
u_int32_t pkeydoff;
u_int32_t pkeyulen;
u_int32_t pkeyflags;
- gpointer pkeydata;
+ void *pkeydata;
u_int32_t pkeysize;
u_int32_t datadlen;
u_int32_t datadoff;
u_int32_t dataulen;
u_int32_t dataflags;
- gpointer datadata;
+ void *datadata;
u_int32_t datasize;
u_int32_t flags;
__db_pget_reply *replyp;
- gint * freep;
+ int * freep;
/* END __db_pget_proc */
{
DB *dbp;
DBT skey, pkey, data;
DB_TXN *txnp;
ct_entry *dbp_ctp, *txnp_ctp;
- gint key_alloc, ret;
+ int key_alloc, ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1468,8 +1468,8 @@ err: replyp->skeydata.skeydata_val = NULL;
/* BEGIN __db_put_proc */
/*
* PUBLIC: void __db_put_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC: u_int32_t, gpointer , u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer ,
- * PUBLIC: u_int32_t, u_int32_t, __db_put_reply *, gint *));
+ * PUBLIC: u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
+ * PUBLIC: u_int32_t, u_int32_t, __db_put_reply *, int *));
*/
void
__db_put_proc(dbpcl_id, txnpcl_id, keydlen,
@@ -1482,24 +1482,24 @@ __db_put_proc(dbpcl_id, txnpcl_id, keydlen,
u_int32_t keydoff;
u_int32_t keyulen;
u_int32_t keyflags;
- gpointer keydata;
+ void *keydata;
u_int32_t keysize;
u_int32_t datadlen;
u_int32_t datadoff;
u_int32_t dataulen;
u_int32_t dataflags;
- gpointer datadata;
+ void *datadata;
u_int32_t datasize;
u_int32_t flags;
__db_put_reply *replyp;
- gint * freep;
+ int * freep;
/* END __db_put_proc */
{
DB *dbp;
DBT key, data;
DB_TXN *txnp;
ct_entry *dbp_ctp, *txnp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1587,7 +1587,7 @@ __db_re_delim_proc(dbpcl_id, delim, replyp)
{
DB *dbp;
ct_entry *dbp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1611,7 +1611,7 @@ __db_re_len_proc(dbpcl_id, len, replyp)
{
DB *dbp;
ct_entry *dbp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1635,7 +1635,7 @@ __db_re_pad_proc(dbpcl_id, pad, replyp)
{
DB *dbp;
ct_entry *dbp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1648,22 +1648,22 @@ __db_re_pad_proc(dbpcl_id, pad, replyp)
/* BEGIN __db_remove_proc */
/*
- * PUBLIC: void __db_remove_proc __P((long, gchar *, gchar *, u_int32_t,
+ * PUBLIC: void __db_remove_proc __P((long, char *, char *, u_int32_t,
* PUBLIC: __db_remove_reply *));
*/
void
__db_remove_proc(dbpcl_id, name, subdb,
flags, replyp)
long dbpcl_id;
- gchar *name;
- gchar *subdb;
+ char *name;
+ char *subdb;
u_int32_t flags;
__db_remove_reply *replyp;
/* END __db_remove_proc */
{
DB *dbp;
ct_entry *dbp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1677,23 +1677,23 @@ __db_remove_proc(dbpcl_id, name, subdb,
/* BEGIN __db_rename_proc */
/*
- * PUBLIC: void __db_rename_proc __P((long, gchar *, gchar *, gchar *, u_int32_t,
+ * PUBLIC: void __db_rename_proc __P((long, char *, char *, char *, u_int32_t,
* PUBLIC: __db_rename_reply *));
*/
void
__db_rename_proc(dbpcl_id, name, subdb,
newname, flags, replyp)
long dbpcl_id;
- gchar *name;
- gchar *subdb;
- gchar *newname;
+ char *name;
+ char *subdb;
+ char *newname;
u_int32_t flags;
__db_rename_reply *replyp;
/* END __db_rename_proc */
{
DB *dbp;
ct_entry *dbp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1708,22 +1708,22 @@ __db_rename_proc(dbpcl_id, name, subdb,
/* BEGIN __db_stat_proc */
/*
* PUBLIC: void __db_stat_proc __P((long, u_int32_t, __db_stat_reply *,
- * PUBLIC: gint *));
+ * PUBLIC: int *));
*/
void
__db_stat_proc(dbpcl_id, flags, replyp, freep)
long dbpcl_id;
u_int32_t flags;
__db_stat_reply *replyp;
- gint * freep;
+ int * freep;
/* END __db_stat_proc */
{
DB *dbp;
DBTYPE type;
ct_entry *dbp_ctp;
u_int32_t *q, *p, *retsp;
- gint i, len, ret;
- gpointer sp;
+ int i, len, ret;
+ void *sp;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1778,7 +1778,7 @@ __db_sync_proc(dbpcl_id, flags, replyp)
{
DB *dbp;
ct_entry *dbp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1807,7 +1807,7 @@ __db_truncate_proc(dbpcl_id, txnpcl_id,
DB_TXN *txnp;
ct_entry *dbp_ctp, *txnp_ctp;
u_int32_t count;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1842,7 +1842,7 @@ __db_cursor_proc(dbpcl_id, txnpcl_id,
DBC *dbc;
DB_TXN *txnp;
ct_entry *dbc_ctp, *env_ctp, *dbp_ctp, *txnp_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -1894,7 +1894,7 @@ __db_join_proc(dbpcl_id, curs, curslen,
ct_entry *dbc_ctp, *ctp, *dbp_ctp;
size_t size;
u_int32_t *cl, i;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
dbp = (DB *)dbp_ctp->ct_anyp;
@@ -2010,7 +2010,7 @@ __dbc_count_proc(dbccl_id, flags, replyp)
DBC *dbc;
ct_entry *dbc_ctp;
db_recno_t num;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
dbc = (DBC *)dbc_ctp->ct_anyp;
@@ -2035,7 +2035,7 @@ __dbc_del_proc(dbccl_id, flags, replyp)
{
DBC *dbc;
ct_entry *dbc_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
dbc = (DBC *)dbc_ctp->ct_anyp;
@@ -2059,7 +2059,7 @@ __dbc_dup_proc(dbccl_id, flags, replyp)
{
DBC *dbc, *newdbc;
ct_entry *dbc_ctp, *new_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
dbc = (DBC *)dbc_ctp->ct_anyp;
@@ -2091,8 +2091,8 @@ __dbc_dup_proc(dbccl_id, flags, replyp)
/* BEGIN __dbc_get_proc */
/*
* PUBLIC: void __dbc_get_proc __P((long, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC: u_int32_t, gpointer , u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer ,
- * PUBLIC: u_int32_t, u_int32_t, __dbc_get_reply *, gint *));
+ * PUBLIC: u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
+ * PUBLIC: u_int32_t, u_int32_t, __dbc_get_reply *, int *));
*/
void
__dbc_get_proc(dbccl_id, keydlen, keydoff,
@@ -2104,24 +2104,24 @@ __dbc_get_proc(dbccl_id, keydlen, keydoff,
u_int32_t keydoff;
u_int32_t keyulen;
u_int32_t keyflags;
- gpointer keydata;
+ void *keydata;
u_int32_t keysize;
u_int32_t datadlen;
u_int32_t datadoff;
u_int32_t dataulen;
u_int32_t dataflags;
- gpointer datadata;
+ void *datadata;
u_int32_t datasize;
u_int32_t flags;
__dbc_get_reply *replyp;
- gint * freep;
+ int * freep;
/* END __dbc_get_proc */
{
DBC *dbc;
DBT key, data;
DB_ENV *dbenv;
ct_entry *dbc_ctp;
- gint key_alloc, bulk_alloc, ret;
+ int key_alloc, bulk_alloc, ret;
ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
dbc = (DBC *)dbc_ctp->ct_anyp;
@@ -2232,9 +2232,9 @@ err: replyp->keydata.keydata_val = NULL;
/* BEGIN __dbc_pget_proc */
/*
* PUBLIC: void __dbc_pget_proc __P((long, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC: u_int32_t, gpointer , u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer ,
- * PUBLIC: u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer , u_int32_t,
- * PUBLIC: u_int32_t, __dbc_pget_reply *, gint *));
+ * PUBLIC: u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
+ * PUBLIC: u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t,
+ * PUBLIC: u_int32_t, __dbc_pget_reply *, int *));
*/
void
__dbc_pget_proc(dbccl_id, skeydlen, skeydoff,
@@ -2248,30 +2248,30 @@ __dbc_pget_proc(dbccl_id, skeydlen, skeydoff,
u_int32_t skeydoff;
u_int32_t skeyulen;
u_int32_t skeyflags;
- gpointer skeydata;
+ void *skeydata;
u_int32_t skeysize;
u_int32_t pkeydlen;
u_int32_t pkeydoff;
u_int32_t pkeyulen;
u_int32_t pkeyflags;
- gpointer pkeydata;
+ void *pkeydata;
u_int32_t pkeysize;
u_int32_t datadlen;
u_int32_t datadoff;
u_int32_t dataulen;
u_int32_t dataflags;
- gpointer datadata;
+ void *datadata;
u_int32_t datasize;
u_int32_t flags;
__dbc_pget_reply *replyp;
- gint * freep;
+ int * freep;
/* END __dbc_pget_proc */
{
DBC *dbc;
DBT skey, pkey, data;
DB_ENV *dbenv;
ct_entry *dbc_ctp;
- gint key_alloc, ret;
+ int key_alloc, ret;
ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
dbc = (DBC *)dbc_ctp->ct_anyp;
@@ -2420,8 +2420,8 @@ err: replyp->skeydata.skeydata_val = NULL;
/* BEGIN __dbc_put_proc */
/*
* PUBLIC: void __dbc_put_proc __P((long, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC: u_int32_t, gpointer , u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, gpointer ,
- * PUBLIC: u_int32_t, u_int32_t, __dbc_put_reply *, gint *));
+ * PUBLIC: u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
+ * PUBLIC: u_int32_t, u_int32_t, __dbc_put_reply *, int *));
*/
void
__dbc_put_proc(dbccl_id, keydlen, keydoff,
@@ -2433,24 +2433,24 @@ __dbc_put_proc(dbccl_id, keydlen, keydoff,
u_int32_t keydoff;
u_int32_t keyulen;
u_int32_t keyflags;
- gpointer keydata;
+ void *keydata;
u_int32_t keysize;
u_int32_t datadlen;
u_int32_t datadoff;
u_int32_t dataulen;
u_int32_t dataflags;
- gpointer datadata;
+ void *datadata;
u_int32_t datasize;
u_int32_t flags;
__dbc_put_reply *replyp;
- gint * freep;
+ int * freep;
/* END __dbc_put_proc */
{
DB *dbp;
DBC *dbc;
DBT key, data;
ct_entry *dbc_ctp;
- gint ret;
+ int ret;
ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
dbc = (DBC *)dbc_ctp->ct_anyp;
diff --git a/libdb/rpc_server/c/db_server_svc.c b/libdb/rpc_server/c/db_server_svc.c
index f4dcee2..96dd959 100644
--- a/libdb/rpc_server/c/db_server_svc.c
+++ b/libdb/rpc_server/c/db_server_svc.c
@@ -81,322 +81,322 @@ db_rpc_serverprog_4001(rqstp, transp)
__dbc_pget_msg __db_dbc_pget_4001_arg;
__dbc_put_msg __db_dbc_put_4001_arg;
} argument;
- gchar *result;
+ char *result;
bool_t (*xdr_argument)(), (*xdr_result)();
- gchar *(*local)();
+ char *(*local)();
switch (rqstp->rq_proc) {
case NULLPROC:
(void) svc_sendreply(transp, (xdrproc_t)xdr_void,
- (gchar *)NULL);
+ (char *)NULL);
return;
case __DB_env_cachesize:
xdr_argument = xdr___env_cachesize_msg;
xdr_result = xdr___env_cachesize_reply;
- local = (gchar *(*)()) __db_env_cachesize_4001;
+ local = (char *(*)()) __db_env_cachesize_4001;
break;
case __DB_env_close:
xdr_argument = xdr___env_close_msg;
xdr_result = xdr___env_close_reply;
- local = (gchar *(*)()) __db_env_close_4001;
+ local = (char *(*)()) __db_env_close_4001;
break;
case __DB_env_create:
xdr_argument = xdr___env_create_msg;
xdr_result = xdr___env_create_reply;
- local = (gchar *(*)()) __db_env_create_4001;
+ local = (char *(*)()) __db_env_create_4001;
break;
case __DB_env_dbremove:
xdr_argument = xdr___env_dbremove_msg;
xdr_result = xdr___env_dbremove_reply;
- local = (gchar *(*)()) __db_env_dbremove_4001;
+ local = (char *(*)()) __db_env_dbremove_4001;
break;
case __DB_env_dbrename:
xdr_argument = xdr___env_dbrename_msg;
xdr_result = xdr___env_dbrename_reply;
- local = (gchar *(*)()) __db_env_dbrename_4001;
+ local = (char *(*)()) __db_env_dbrename_4001;
break;
case __DB_env_encrypt:
xdr_argument = xdr___env_encrypt_msg;
xdr_result = xdr___env_encrypt_reply;
- local = (gchar *(*)()) __db_env_encrypt_4001;
+ local = (char *(*)()) __db_env_encrypt_4001;
break;
case __DB_env_flags:
xdr_argument = xdr___env_flags_msg;
xdr_result = xdr___env_flags_reply;
- local = (gchar *(*)()) __db_env_flags_4001;
+ local = (char *(*)()) __db_env_flags_4001;
break;
case __DB_env_open:
xdr_argument = xdr___env_open_msg;
xdr_result = xdr___env_open_reply;
- local = (gchar *(*)()) __db_env_open_4001;
+ local = (char *(*)()) __db_env_open_4001;
break;
case __DB_env_remove:
xdr_argument = xdr___env_remove_msg;
xdr_result = xdr___env_remove_reply;
- local = (gchar *(*)()) __db_env_remove_4001;
+ local = (char *(*)()) __db_env_remove_4001;
break;
case __DB_txn_abort:
xdr_argument = xdr___txn_abort_msg;
xdr_result = xdr___txn_abort_reply;
- local = (gchar *(*)()) __db_txn_abort_4001;
+ local = (char *(*)()) __db_txn_abort_4001;
break;
case __DB_txn_begin:
xdr_argument = xdr___txn_begin_msg;
xdr_result = xdr___txn_begin_reply;
- local = (gchar *(*)()) __db_txn_begin_4001;
+ local = (char *(*)()) __db_txn_begin_4001;
break;
case __DB_txn_commit:
xdr_argument = xdr___txn_commit_msg;
xdr_result = xdr___txn_commit_reply;
- local = (gchar *(*)()) __db_txn_commit_4001;
+ local = (char *(*)()) __db_txn_commit_4001;
break;
case __DB_txn_discard:
xdr_argument = xdr___txn_discard_msg;
xdr_result = xdr___txn_discard_reply;
- local = (gchar *(*)()) __db_txn_discard_4001;
+ local = (char *(*)()) __db_txn_discard_4001;
break;
case __DB_txn_prepare:
xdr_argument = xdr___txn_prepare_msg;
xdr_result = xdr___txn_prepare_reply;
- local = (gchar *(*)()) __db_txn_prepare_4001;
+ local = (char *(*)()) __db_txn_prepare_4001;
break;
case __DB_txn_recover:
xdr_argument = xdr___txn_recover_msg;
xdr_result = xdr___txn_recover_reply;
- local = (gchar *(*)()) __db_txn_recover_4001;
+ local = (char *(*)()) __db_txn_recover_4001;
break;
case __DB_db_associate:
xdr_argument = xdr___db_associate_msg;
xdr_result = xdr___db_associate_reply;
- local = (gchar *(*)()) __db_db_associate_4001;
+ local = (char *(*)()) __db_db_associate_4001;
break;
case __DB_db_bt_maxkey:
xdr_argument = xdr___db_bt_maxkey_msg;
xdr_result = xdr___db_bt_maxkey_reply;
- local = (gchar *(*)()) __db_db_bt_maxkey_4001;
+ local = (char *(*)()) __db_db_bt_maxkey_4001;
break;
case __DB_db_bt_minkey:
xdr_argument = xdr___db_bt_minkey_msg;
xdr_result = xdr___db_bt_minkey_reply;
- local = (gchar *(*)()) __db_db_bt_minkey_4001;
+ local = (char *(*)()) __db_db_bt_minkey_4001;
break;
case __DB_db_close:
xdr_argument = xdr___db_close_msg;
xdr_result = xdr___db_close_reply;
- local = (gchar *(*)()) __db_db_close_4001;
+ local = (char *(*)()) __db_db_close_4001;
break;
case __DB_db_create:
xdr_argument = xdr___db_create_msg;
xdr_result = xdr___db_create_reply;
- local = (gchar *(*)()) __db_db_create_4001;
+ local = (char *(*)()) __db_db_create_4001;
break;
case __DB_db_del:
xdr_argument = xdr___db_del_msg;
xdr_result = xdr___db_del_reply;
- local = (gchar *(*)()) __db_db_del_4001;
+ local = (char *(*)()) __db_db_del_4001;
break;
case __DB_db_encrypt:
xdr_argument = xdr___db_encrypt_msg;
xdr_result = xdr___db_encrypt_reply;
- local = (gchar *(*)()) __db_db_encrypt_4001;
+ local = (char *(*)()) __db_db_encrypt_4001;
break;
case __DB_db_extentsize:
xdr_argument = xdr___db_extentsize_msg;
xdr_result = xdr___db_extentsize_reply;
- local = (gchar *(*)()) __db_db_extentsize_4001;
+ local = (char *(*)()) __db_db_extentsize_4001;
break;
case __DB_db_flags:
xdr_argument = xdr___db_flags_msg;
xdr_result = xdr___db_flags_reply;
- local = (gchar *(*)()) __db_db_flags_4001;
+ local = (char *(*)()) __db_db_flags_4001;
break;
case __DB_db_get:
xdr_argument = xdr___db_get_msg;
xdr_result = xdr___db_get_reply;
- local = (gchar *(*)()) __db_db_get_4001;
+ local = (char *(*)()) __db_db_get_4001;
break;
case __DB_db_h_ffactor:
xdr_argument = xdr___db_h_ffactor_msg;
xdr_result = xdr___db_h_ffactor_reply;
- local = (gchar *(*)()) __db_db_h_ffactor_4001;
+ local = (char *(*)()) __db_db_h_ffactor_4001;
break;
case __DB_db_h_nelem:
xdr_argument = xdr___db_h_nelem_msg;
xdr_result = xdr___db_h_nelem_reply;
- local = (gchar *(*)()) __db_db_h_nelem_4001;
+ local = (char *(*)()) __db_db_h_nelem_4001;
break;
case __DB_db_key_range:
xdr_argument = xdr___db_key_range_msg;
xdr_result = xdr___db_key_range_reply;
- local = (gchar *(*)()) __db_db_key_range_4001;
+ local = (char *(*)()) __db_db_key_range_4001;
break;
case __DB_db_lorder:
xdr_argument = xdr___db_lorder_msg;
xdr_result = xdr___db_lorder_reply;
- local = (gchar *(*)()) __db_db_lorder_4001;
+ local = (char *(*)()) __db_db_lorder_4001;
break;
case __DB_db_open:
xdr_argument = xdr___db_open_msg;
xdr_result = xdr___db_open_reply;
- local = (gchar *(*)()) __db_db_open_4001;
+ local = (char *(*)()) __db_db_open_4001;
break;
case __DB_db_pagesize:
xdr_argument = xdr___db_pagesize_msg;
xdr_result = xdr___db_pagesize_reply;
- local = (gchar *(*)()) __db_db_pagesize_4001;
+ local = (char *(*)()) __db_db_pagesize_4001;
break;
case __DB_db_pget:
xdr_argument = xdr___db_pget_msg;
xdr_result = xdr___db_pget_reply;
- local = (gchar *(*)()) __db_db_pget_4001;
+ local = (char *(*)()) __db_db_pget_4001;
break;
case __DB_db_put:
xdr_argument = xdr___db_put_msg;
xdr_result = xdr___db_put_reply;
- local = (gchar *(*)()) __db_db_put_4001;
+ local = (char *(*)()) __db_db_put_4001;
break;
case __DB_db_re_delim:
xdr_argument = xdr___db_re_delim_msg;
xdr_result = xdr___db_re_delim_reply;
- local = (gchar *(*)()) __db_db_re_delim_4001;
+ local = (char *(*)()) __db_db_re_delim_4001;
break;
case __DB_db_re_len:
xdr_argument = xdr___db_re_len_msg;
xdr_result = xdr___db_re_len_reply;
- local = (gchar *(*)()) __db_db_re_len_4001;
+ local = (char *(*)()) __db_db_re_len_4001;
break;
case __DB_db_re_pad:
xdr_argument = xdr___db_re_pad_msg;
xdr_result = xdr___db_re_pad_reply;
- local = (gchar *(*)()) __db_db_re_pad_4001;
+ local = (char *(*)()) __db_db_re_pad_4001;
break;
case __DB_db_remove:
xdr_argument = xdr___db_remove_msg;
xdr_result = xdr___db_remove_reply;
- local = (gchar *(*)()) __db_db_remove_4001;
+ local = (char *(*)()) __db_db_remove_4001;
break;
case __DB_db_rename:
xdr_argument = xdr___db_rename_msg;
xdr_result = xdr___db_rename_reply;
- local = (gchar *(*)()) __db_db_rename_4001;
+ local = (char *(*)()) __db_db_rename_4001;
break;
case __DB_db_stat:
xdr_argument = xdr___db_stat_msg;
xdr_result = xdr___db_stat_reply;
- local = (gchar *(*)()) __db_db_stat_4001;
+ local = (char *(*)()) __db_db_stat_4001;
break;
case __DB_db_sync:
xdr_argument = xdr___db_sync_msg;
xdr_result = xdr___db_sync_reply;
- local = (gchar *(*)()) __db_db_sync_4001;
+ local = (char *(*)()) __db_db_sync_4001;
break;
case __DB_db_truncate:
xdr_argument = xdr___db_truncate_msg;
xdr_result = xdr___db_truncate_reply;
- local = (gchar *(*)()) __db_db_truncate_4001;
+ local = (char *(*)()) __db_db_truncate_4001;
break;
case __DB_db_cursor:
xdr_argument = xdr___db_cursor_msg;
xdr_result = xdr___db_cursor_reply;
- local = (gchar *(*)()) __db_db_cursor_4001;
+ local = (char *(*)()) __db_db_cursor_4001;
break;
case __DB_db_join:
xdr_argument = xdr___db_join_msg;
xdr_result = xdr___db_join_reply;
- local = (gchar *(*)()) __db_db_join_4001;
+ local = (char *(*)()) __db_db_join_4001;
break;
case __DB_dbc_close:
xdr_argument = xdr___dbc_close_msg;
xdr_result = xdr___dbc_close_reply;
- local = (gchar *(*)()) __db_dbc_close_4001;
+ local = (char *(*)()) __db_dbc_close_4001;
break;
case __DB_dbc_count:
xdr_argument = xdr___dbc_count_msg;
xdr_result = xdr___dbc_count_reply;
- local = (gchar *(*)()) __db_dbc_count_4001;
+ local = (char *(*)()) __db_dbc_count_4001;
break;
case __DB_dbc_del:
xdr_argument = xdr___dbc_del_msg;
xdr_result = xdr___dbc_del_reply;
- local = (gchar *(*)()) __db_dbc_del_4001;
+ local = (char *(*)()) __db_dbc_del_4001;
break;
case __DB_dbc_dup:
xdr_argument = xdr___dbc_dup_msg;
xdr_result = xdr___dbc_dup_reply;
- local = (gchar *(*)()) __db_dbc_dup_4001;
+ local = (char *(*)()) __db_dbc_dup_4001;
break;
case __DB_dbc_get:
xdr_argument = xdr___dbc_get_msg;
xdr_result = xdr___dbc_get_reply;
- local = (gchar *(*)()) __db_dbc_get_4001;
+ local = (char *(*)()) __db_dbc_get_4001;
break;
case __DB_dbc_pget:
xdr_argument = xdr___dbc_pget_msg;
xdr_result = xdr___dbc_pget_reply;
- local = (gchar *(*)()) __db_dbc_pget_4001;
+ local = (char *(*)()) __db_dbc_pget_4001;
break;
case __DB_dbc_put:
xdr_argument = xdr___dbc_put_msg;
xdr_result = xdr___dbc_put_reply;
- local = (gchar *(*)()) __db_dbc_put_4001;
+ local = (char *(*)()) __db_dbc_put_4001;
break;
default:
svcerr_noproc(transp);
return;
}
- (void) memset((gchar *)&argument, 0, sizeof (argument));
- if (!svc_getargs(transp, (xdrproc_t)xdr_argument, (gchar *)&argument)) {
+ (void) memset((char *)&argument, 0, sizeof (argument));
+ if (!svc_getargs(transp, (xdrproc_t)xdr_argument, (char *)&argument)) {
svcerr_decode(transp);
return;
}
@@ -404,7 +404,7 @@ db_rpc_serverprog_4001(rqstp, transp)
if (result != NULL && !svc_sendreply(transp, (xdrproc_t)xdr_result, result)) {
svcerr_systemerr(transp);
}
- if (!svc_freeargs(transp, (xdrproc_t)xdr_argument, (gchar *)&argument)) {
+ if (!svc_freeargs(transp, (xdrproc_t)xdr_argument, (char *)&argument)) {
fprintf(stderr, "unable to free arguments");
exit(1);
}
diff --git a/libdb/rpc_server/c/db_server_util.c b/libdb/rpc_server/c/db_server_util.c
index 5a2a531..869bf0c 100644
--- a/libdb/rpc_server/c/db_server_util.c
+++ b/libdb/rpc_server/c/db_server_util.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -42,10 +42,10 @@ static const gchar revid[] = "$Id$";
#include "dbinc_auto/rpc_server_ext.h"
#include "dbinc_auto/common_ext.h"
-extern gint __dbsrv_main __P((void));
-static gint add_home __P((gchar *));
-static gint add_passwd __P((gchar *));
-static gint env_recover __P((gchar *));
+extern int __dbsrv_main __P((void));
+static int add_home __P((char *));
+static int add_passwd __P((char *));
+static int env_recover __P((char *));
static void __dbclear_child __P((ct_entry *));
static LIST_HEAD(cthead, ct_entry) __dbsrv_head;
@@ -53,23 +53,23 @@ static LIST_HEAD(homehead, home_entry) __dbsrv_home;
static long __dbsrv_defto = DB_SERVER_TIMEOUT;
static long __dbsrv_maxto = DB_SERVER_MAXTIMEOUT;
static long __dbsrv_idleto = DB_SERVER_IDLETIMEOUT;
-static gchar *logfile = NULL;
-static gchar *prog;
+static char *logfile = NULL;
+static char *prog;
-static void usage __P((gchar *));
+static void usage __P((char *));
static void version_check __P((void));
-gint __dbsrv_verbose = 0;
+int __dbsrv_verbose = 0;
-gint
+int
main(argc, argv)
- gint argc;
- gchar **argv;
+ int argc;
+ char **argv;
{
- extern gchar *optarg;
+ extern char *optarg;
CLIENT *cl;
- gint ch, ret;
- gchar *passwd;
+ int ch, ret;
+ char *passwd;
prog = argv[0];
@@ -191,7 +191,7 @@ main(argc, argv)
static void
usage(prog)
- gchar *prog;
+ char *prog;
{
fprintf(stderr, "usage: %s %s\n\t%s\n", prog,
"[-Vv] [-h home] [-P passwd]",
@@ -202,7 +202,7 @@ usage(prog)
static void
version_check()
{
- gint v_major, v_minor, v_patch;
+ int v_major, v_minor, v_patch;
/* Make sure we're loaded with the right version of the DB library. */
(void)db_version(&v_major, &v_minor, &v_patch);
@@ -237,7 +237,7 @@ __dbsrv_settimeout(ctp, to)
*/
void
__dbsrv_timeout(force)
- gint force;
+ int force;
{
static long to_hint = -1;
time_t t;
@@ -386,15 +386,15 @@ __dbdel_ctp(parent)
}
/*
- * PUBLIC: ct_entry *new_ct_ent __P((gint *));
+ * PUBLIC: ct_entry *new_ct_ent __P((int *));
*/
ct_entry *
new_ct_ent(errp)
- gint *errp;
+ int *errp;
{
time_t t;
ct_entry *ctp, *octp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(NULL, sizeof(ct_entry), &ctp)) != 0) {
*errp = ret;
@@ -443,13 +443,13 @@ get_tableent(id)
}
/*
- * PUBLIC: ct_entry *__dbsrv_sharedb __P((ct_entry *, const gchar *,
- * PUBLIC: const gchar *, DBTYPE, u_int32_t));
+ * PUBLIC: ct_entry *__dbsrv_sharedb __P((ct_entry *, const char *,
+ * PUBLIC: const char *, DBTYPE, u_int32_t));
*/
ct_entry *
__dbsrv_sharedb(db_ctp, name, subdb, type, flags)
ct_entry *db_ctp;
- const gchar *name, *subdb;
+ const char *name, *subdb;
DBTYPE type;
u_int32_t flags;
{
@@ -574,15 +574,15 @@ __dbsrv_active(ctp)
}
/*
- * PUBLIC: gint __db_close_int __P((long, u_int32_t));
+ * PUBLIC: int __db_close_int __P((long, u_int32_t));
*/
-gint
+int
__db_close_int(id, flags)
long id;
u_int32_t flags;
{
DB *dbp;
- gint ret;
+ int ret;
ct_entry *ctp;
ret = 0;
@@ -605,14 +605,14 @@ __db_close_int(id, flags)
}
/*
- * PUBLIC: gint __dbc_close_int __P((ct_entry *));
+ * PUBLIC: int __dbc_close_int __P((ct_entry *));
*/
-gint
+int
__dbc_close_int(dbc_ctp)
ct_entry *dbc_ctp;
{
DBC *dbc;
- gint ret;
+ int ret;
ct_entry *ctp;
dbc = (DBC *)dbc_ctp->ct_anyp;
@@ -642,16 +642,16 @@ __dbc_close_int(dbc_ctp)
}
/*
- * PUBLIC: gint __dbenv_close_int __P((long, u_int32_t, int));
+ * PUBLIC: int __dbenv_close_int __P((long, u_int32_t, int));
*/
-gint
+int
__dbenv_close_int(id, flags, force)
long id;
u_int32_t flags;
- gint force;
+ int force;
{
DB_ENV *dbenv;
- gint ret;
+ int ret;
ct_entry *ctp;
ret = 0;
@@ -679,10 +679,10 @@ __dbenv_close_int(id, flags, force)
static int
add_home(home)
- gchar *home;
+ char *home;
{
home_entry *hp, *homep;
- gint ret;
+ int ret;
if ((ret = __os_malloc(NULL, sizeof(home_entry), &hp)) != 0)
return (ret);
@@ -724,7 +724,7 @@ add_home(home)
static int
add_passwd(passwd)
- gchar *passwd;
+ char *passwd;
{
home_entry *hp;
@@ -745,11 +745,11 @@ add_passwd(passwd)
}
/*
- * PUBLIC: home_entry *get_home __P((gchar *));
+ * PUBLIC: home_entry *get_home __P((char *));
*/
home_entry *
get_home(name)
- gchar *name;
+ char *name;
{
home_entry *hp;
@@ -762,12 +762,12 @@ get_home(name)
static int
env_recover(progname)
- gchar *progname;
+ char *progname;
{
DB_ENV *dbenv;
home_entry *hp;
u_int32_t flags;
- gint exitval, ret;
+ int exitval, ret;
for (hp = LIST_FIRST(&__dbsrv_home); hp != NULL;
hp = LIST_NEXT(hp, entries)) {
diff --git a/libdb/rpc_server/c/db_server_xdr.c b/libdb/rpc_server/c/db_server_xdr.c
index 471782d..bfe2b6c 100644
--- a/libdb/rpc_server/c/db_server_xdr.c
+++ b/libdb/rpc_server/c/db_server_xdr.c
@@ -406,10 +406,10 @@ xdr___txn_recover_reply(xdrs, objp)
if (!xdr_int(xdrs, &objp->status))
return (FALSE);
- if (!xdr_array(xdrs, (gchar **)&objp->txn.txn_val, (u_int *) &objp->txn.txn_len, ~0,
+ if (!xdr_array(xdrs, (char **)&objp->txn.txn_val, (u_int *) &objp->txn.txn_len, ~0,
sizeof (u_int), (xdrproc_t) xdr_u_int))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->gid.gid_val, (u_int *) &objp->gid.gid_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->gid.gid_val, (u_int *) &objp->gid.gid_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->retcount))
return (FALSE);
@@ -560,7 +560,7 @@ xdr___db_del_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->keyflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->flags))
return (FALSE);
@@ -670,7 +670,7 @@ xdr___db_get_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->keyflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->datadlen))
return (FALSE);
@@ -680,7 +680,7 @@ xdr___db_get_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->dataflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->flags))
return (FALSE);
@@ -695,9 +695,9 @@ xdr___db_get_reply(xdrs, objp)
if (!xdr_int(xdrs, &objp->status))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
return (FALSE);
return (TRUE);
}
@@ -768,7 +768,7 @@ xdr___db_key_range_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->keyflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->flags))
return (FALSE);
@@ -900,7 +900,7 @@ xdr___db_pget_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->skeyflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->skeydata.skeydata_val, (u_int *) &objp->skeydata.skeydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->skeydata.skeydata_val, (u_int *) &objp->skeydata.skeydata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->pkeydlen))
return (FALSE);
@@ -910,7 +910,7 @@ xdr___db_pget_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->pkeyflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->pkeydata.pkeydata_val, (u_int *) &objp->pkeydata.pkeydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->pkeydata.pkeydata_val, (u_int *) &objp->pkeydata.pkeydata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->datadlen))
return (FALSE);
@@ -920,7 +920,7 @@ xdr___db_pget_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->dataflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->flags))
return (FALSE);
@@ -935,11 +935,11 @@ xdr___db_pget_reply(xdrs, objp)
if (!xdr_int(xdrs, &objp->status))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->skeydata.skeydata_val, (u_int *) &objp->skeydata.skeydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->skeydata.skeydata_val, (u_int *) &objp->skeydata.skeydata_len, ~0))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->pkeydata.pkeydata_val, (u_int *) &objp->pkeydata.pkeydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->pkeydata.pkeydata_val, (u_int *) &objp->pkeydata.pkeydata_len, ~0))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
return (FALSE);
return (TRUE);
}
@@ -962,7 +962,7 @@ xdr___db_put_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->keyflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->datadlen))
return (FALSE);
@@ -972,7 +972,7 @@ xdr___db_put_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->dataflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->flags))
return (FALSE);
@@ -987,7 +987,7 @@ xdr___db_put_reply(xdrs, objp)
if (!xdr_int(xdrs, &objp->status))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
return (FALSE);
return (TRUE);
}
@@ -1143,7 +1143,7 @@ xdr___db_stat_reply(xdrs, objp)
if (!xdr_int(xdrs, &objp->status))
return (FALSE);
- if (!xdr_array(xdrs, (gchar **)&objp->stats.stats_val, (u_int *) &objp->stats.stats_len, ~0,
+ if (!xdr_array(xdrs, (char **)&objp->stats.stats_val, (u_int *) &objp->stats.stats_len, ~0,
sizeof (u_int), (xdrproc_t) xdr_u_int))
return (FALSE);
return (TRUE);
@@ -1237,7 +1237,7 @@ xdr___db_join_msg(xdrs, objp)
if (!xdr_u_int(xdrs, &objp->dbpcl_id))
return (FALSE);
- if (!xdr_array(xdrs, (gchar **)&objp->curs.curs_val, (u_int *) &objp->curs.curs_len, ~0,
+ if (!xdr_array(xdrs, (char **)&objp->curs.curs_val, (u_int *) &objp->curs.curs_len, ~0,
sizeof (u_int), (xdrproc_t) xdr_u_int))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->flags))
@@ -1372,7 +1372,7 @@ xdr___dbc_get_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->keyflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->datadlen))
return (FALSE);
@@ -1382,7 +1382,7 @@ xdr___dbc_get_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->dataflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->flags))
return (FALSE);
@@ -1397,9 +1397,9 @@ xdr___dbc_get_reply(xdrs, objp)
if (!xdr_int(xdrs, &objp->status))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
return (FALSE);
return (TRUE);
}
@@ -1420,7 +1420,7 @@ xdr___dbc_pget_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->skeyflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->skeydata.skeydata_val, (u_int *) &objp->skeydata.skeydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->skeydata.skeydata_val, (u_int *) &objp->skeydata.skeydata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->pkeydlen))
return (FALSE);
@@ -1430,7 +1430,7 @@ xdr___dbc_pget_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->pkeyflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->pkeydata.pkeydata_val, (u_int *) &objp->pkeydata.pkeydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->pkeydata.pkeydata_val, (u_int *) &objp->pkeydata.pkeydata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->datadlen))
return (FALSE);
@@ -1440,7 +1440,7 @@ xdr___dbc_pget_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->dataflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->flags))
return (FALSE);
@@ -1455,11 +1455,11 @@ xdr___dbc_pget_reply(xdrs, objp)
if (!xdr_int(xdrs, &objp->status))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->skeydata.skeydata_val, (u_int *) &objp->skeydata.skeydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->skeydata.skeydata_val, (u_int *) &objp->skeydata.skeydata_len, ~0))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->pkeydata.pkeydata_val, (u_int *) &objp->pkeydata.pkeydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->pkeydata.pkeydata_val, (u_int *) &objp->pkeydata.pkeydata_len, ~0))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
return (FALSE);
return (TRUE);
}
@@ -1480,7 +1480,7 @@ xdr___dbc_put_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->keyflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->datadlen))
return (FALSE);
@@ -1490,7 +1490,7 @@ xdr___dbc_put_msg(xdrs, objp)
return (FALSE);
if (!xdr_u_int(xdrs, &objp->dataflags))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
return (FALSE);
if (!xdr_u_int(xdrs, &objp->flags))
return (FALSE);
@@ -1505,7 +1505,7 @@ xdr___dbc_put_reply(xdrs, objp)
if (!xdr_int(xdrs, &objp->status))
return (FALSE);
- if (!xdr_bytes(xdrs, (gchar **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
+ if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
return (FALSE);
return (TRUE);
}
diff --git a/libdb/rpc_server/c/gen_db_server.c b/libdb/rpc_server/c/gen_db_server.c
index d610354..d5a4cca 100644
--- a/libdb/rpc_server/c/gen_db_server.c
+++ b/libdb/rpc_server/c/gen_db_server.c
@@ -304,11 +304,11 @@ __db_txn_recover_4001(msg, req)
struct svc_req *req;
{
static __txn_recover_reply reply; /* must be static */
- static gint __txn_recover_free = 0; /* must be static */
+ static int __txn_recover_free = 0; /* must be static */
COMPQUIET(req, NULL);
if (__txn_recover_free)
- xdr_free((xdrproc_t)xdr___txn_recover_reply, (gpointer)&reply);
+ xdr_free((xdrproc_t)xdr___txn_recover_reply, (void *)&reply);
__txn_recover_free = 0;
/* Reinitialize allocated fields */
@@ -514,11 +514,11 @@ __db_db_get_4001(msg, req)
struct svc_req *req;
{
static __db_get_reply reply; /* must be static */
- static gint __db_get_free = 0; /* must be static */
+ static int __db_get_free = 0; /* must be static */
COMPQUIET(req, NULL);
if (__db_get_free)
- xdr_free((xdrproc_t)xdr___db_get_reply, (gpointer)&reply);
+ xdr_free((xdrproc_t)xdr___db_get_reply, (void *)&reply);
__db_get_free = 0;
/* Reinitialize allocated fields */
@@ -681,11 +681,11 @@ __db_db_pget_4001(msg, req)
struct svc_req *req;
{
static __db_pget_reply reply; /* must be static */
- static gint __db_pget_free = 0; /* must be static */
+ static int __db_pget_free = 0; /* must be static */
COMPQUIET(req, NULL);
if (__db_pget_free)
- xdr_free((xdrproc_t)xdr___db_pget_reply, (gpointer)&reply);
+ xdr_free((xdrproc_t)xdr___db_pget_reply, (void *)&reply);
__db_pget_free = 0;
/* Reinitialize allocated fields */
@@ -729,11 +729,11 @@ __db_db_put_4001(msg, req)
struct svc_req *req;
{
static __db_put_reply reply; /* must be static */
- static gint __db_put_free = 0; /* must be static */
+ static int __db_put_free = 0; /* must be static */
COMPQUIET(req, NULL);
if (__db_put_free)
- xdr_free((xdrproc_t)xdr___db_put_reply, (gpointer)&reply);
+ xdr_free((xdrproc_t)xdr___db_put_reply, (void *)&reply);
__db_put_free = 0;
/* Reinitialize allocated fields */
@@ -869,11 +869,11 @@ __db_db_stat_4001(msg, req)
struct svc_req *req;
{
static __db_stat_reply reply; /* must be static */
- static gint __db_stat_free = 0; /* must be static */
+ static int __db_stat_free = 0; /* must be static */
COMPQUIET(req, NULL);
if (__db_stat_free)
- xdr_free((xdrproc_t)xdr___db_stat_reply, (gpointer)&reply);
+ xdr_free((xdrproc_t)xdr___db_stat_reply, (void *)&reply);
__db_stat_free = 0;
/* Reinitialize allocated fields */
@@ -1051,11 +1051,11 @@ __db_dbc_get_4001(msg, req)
struct svc_req *req;
{
static __dbc_get_reply reply; /* must be static */
- static gint __dbc_get_free = 0; /* must be static */
+ static int __dbc_get_free = 0; /* must be static */
COMPQUIET(req, NULL);
if (__dbc_get_free)
- xdr_free((xdrproc_t)xdr___dbc_get_reply, (gpointer)&reply);
+ xdr_free((xdrproc_t)xdr___dbc_get_reply, (void *)&reply);
__dbc_get_free = 0;
/* Reinitialize allocated fields */
@@ -1091,11 +1091,11 @@ __db_dbc_pget_4001(msg, req)
struct svc_req *req;
{
static __dbc_pget_reply reply; /* must be static */
- static gint __dbc_pget_free = 0; /* must be static */
+ static int __dbc_pget_free = 0; /* must be static */
COMPQUIET(req, NULL);
if (__dbc_pget_free)
- xdr_free((xdrproc_t)xdr___dbc_pget_reply, (gpointer)&reply);
+ xdr_free((xdrproc_t)xdr___dbc_pget_reply, (void *)&reply);
__dbc_pget_free = 0;
/* Reinitialize allocated fields */
@@ -1138,11 +1138,11 @@ __db_dbc_put_4001(msg, req)
struct svc_req *req;
{
static __dbc_put_reply reply; /* must be static */
- static gint __dbc_put_free = 0; /* must be static */
+ static int __dbc_put_free = 0; /* must be static */
COMPQUIET(req, NULL);
if (__dbc_put_free)
- xdr_free((xdrproc_t)xdr___dbc_put_reply, (gpointer)&reply);
+ xdr_free((xdrproc_t)xdr___dbc_put_reply, (void *)&reply);
__dbc_put_free = 0;
/* Reinitialize allocated fields */
diff --git a/libdb/tcl/tcl_compat.c b/libdb/tcl/tcl_compat.c
index 18dc39c..d2dda70 100644
--- a/libdb/tcl/tcl_compat.c
+++ b/libdb/tcl/tcl_compat.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#if CONFIG_TEST
@@ -31,15 +31,15 @@ static const gchar revid[] = "$Id$";
* bdb_HCommand --
* Implements h* functions.
*
- * PUBLIC: gint bdb_HCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
+ * PUBLIC: int bdb_HCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
*/
-gint
+int
bdb_HCommand(interp, objc, objv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *hcmds[] = {
+ static char *hcmds[] = {
"hcreate",
"hdestroy",
"hsearch",
@@ -50,7 +50,7 @@ bdb_HCommand(interp, objc, objv)
HHDESTROY,
HHSEARCH
};
- static gchar *srchacts[] = {
+ static char *srchacts[] = {
"enter",
"find",
NULL
@@ -61,7 +61,7 @@ bdb_HCommand(interp, objc, objv)
};
ENTRY item, *hres;
ACTION action;
- gint actindex, cmdindex, nelem, result, ret;
+ int actindex, cmdindex, nelem, result, ret;
Tcl_Obj *res;
result = TCL_OK;
@@ -118,7 +118,7 @@ bdb_HCommand(interp, objc, objv)
if (hres == NULL)
Tcl_SetResult(interp, "-1", TCL_STATIC);
else if (action == FIND)
- Tcl_SetResult(interp, (gchar *)hres->data, TCL_STATIC);
+ Tcl_SetResult(interp, (char *)hres->data, TCL_STATIC);
else
/* action is ENTER */
Tcl_SetResult(interp, "0", TCL_STATIC);
@@ -152,17 +152,17 @@ bdb_HCommand(interp, objc, objv)
* Opens an ndbm database.
*
* PUBLIC: #if DB_DBM_HSEARCH != 0
- * PUBLIC: gint bdb_NdbmOpen __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DBM **));
+ * PUBLIC: int bdb_NdbmOpen __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DBM **));
* PUBLIC: #endif
*/
-gint
+int
bdb_NdbmOpen(interp, objc, objv, dbpp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DBM **dbpp; /* Dbm pointer */
{
- static gchar *ndbopen[] = {
+ static char *ndbopen[] = {
"-create",
"-mode",
"-rdonly",
@@ -179,8 +179,8 @@ bdb_NdbmOpen(interp, objc, objv, dbpp)
};
u_int32_t open_flags;
- gint endarg, i, mode, optindex, read_only, result, ret;
- gchar *arg, *db;
+ int endarg, i, mode, optindex, read_only, result, ret;
+ char *arg, *db;
result = TCL_OK;
open_flags = 0;
@@ -295,19 +295,19 @@ error:
* Implements "dbm" commands.
*
* PUBLIC: #if DB_DBM_HSEARCH != 0
- * PUBLIC: gint bdb_DbmCommand
+ * PUBLIC: int bdb_DbmCommand
* PUBLIC: __P((Tcl_Interp *, int, Tcl_Obj * CONST*, int, DBM *));
* PUBLIC: #endif
*/
-gint
+int
bdb_DbmCommand(interp, objc, objv, flag, dbm)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
- gint flag; /* Which db interface */
+ int flag; /* Which db interface */
DBM *dbm; /* DBM pointer */
{
- static gchar *dbmcmds[] = {
+ static char *dbmcmds[] = {
"dbmclose",
"dbminit",
"delete",
@@ -326,7 +326,7 @@ bdb_DbmCommand(interp, objc, objv, flag, dbm)
DBMNEXT,
DBMSTORE
};
- static gchar *stflag[] = {
+ static char *stflag[] = {
"insert", "replace",
NULL
};
@@ -334,10 +334,10 @@ bdb_DbmCommand(interp, objc, objv, flag, dbm)
STINSERT, STREPLACE
};
datum key, data;
- gpointer dtmp, *ktmp;
+ void *dtmp, *ktmp;
u_int32_t size;
- gint cmdindex, freedata, freekey, stindex, result, ret;
- gchar *name, *t;
+ int cmdindex, freedata, freekey, stindex, result, ret;
+ char *name, *t;
result = TCL_OK;
freekey = freedata = 0;
@@ -402,7 +402,7 @@ bdb_DbmCommand(interp, objc, objv, flag, dbm)
goto out;
}
key.dsize = size;
- key.dptr = (gchar *)ktmp;
+ key.dptr = (char *)ktmp;
_debug_check();
if (flag == DBTCL_DBM)
data = fetch(key);
@@ -443,7 +443,7 @@ bdb_DbmCommand(interp, objc, objv, flag, dbm)
goto out;
}
key.dsize = size;
- key.dptr = (gchar *)ktmp;
+ key.dptr = (char *)ktmp;
if ((ret = _CopyObjBytes(
interp, objv[3], &dtmp, &size, &freedata)) != 0) {
result = _ReturnSetup(interp, ret,
@@ -451,7 +451,7 @@ bdb_DbmCommand(interp, objc, objv, flag, dbm)
goto out;
}
data.dsize = size;
- data.dptr = (gchar *)dtmp;
+ data.dptr = (char *)dtmp;
_debug_check();
if (flag == DBTCL_DBM)
ret = store(key, data);
@@ -490,7 +490,7 @@ bdb_DbmCommand(interp, objc, objv, flag, dbm)
goto out;
}
key.dsize = size;
- key.dptr = (gchar *)ktmp;
+ key.dptr = (char *)ktmp;
_debug_check();
if (flag == DBTCL_DBM)
ret = delete(key);
@@ -548,7 +548,7 @@ bdb_DbmCommand(interp, objc, objv, flag, dbm)
goto out;
}
key.dsize = size;
- key.dptr = (gchar *)ktmp;
+ key.dptr = (char *)ktmp;
data = nextkey(key);
} else if (flag == DBTCL_NDBM) {
if (objc != 2) {
@@ -584,16 +584,16 @@ out:
* ndbm_Cmd --
* Implements the "ndbm" widget.
*
- * PUBLIC: gint ndbm_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
+ * PUBLIC: int ndbm_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
*/
-gint
+int
ndbm_Cmd(clientData, interp, objc, objv)
ClientData clientData; /* DB handle */
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *ndbcmds[] = {
+ static char *ndbcmds[] = {
"clearerr",
"close",
"delete",
@@ -623,11 +623,11 @@ ndbm_Cmd(clientData, interp, objc, objv)
DBM *dbp;
DBTCL_INFO *dbip;
Tcl_Obj *res;
- gint cmdindex, result, ret;
+ int cmdindex, result, ret;
Tcl_ResetResult(interp);
dbp = (DBM *)clientData;
- dbip = _PtrToInfo((gpointer)dbp);
+ dbip = _PtrToInfo((void *)dbp);
result = TCL_OK;
if (objc <= 1) {
Tcl_WrongNumArgs(interp, 1, objv, "command cmdargs");
diff --git a/libdb/tcl/tcl_db.c b/libdb/tcl/tcl_db.c
index b392913..12344cd 100644
--- a/libdb/tcl/tcl_db.c
+++ b/libdb/tcl/tcl_db.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -78,19 +78,19 @@ _DbInfoDelete(interp, dbip)
/*
*
- * PUBLIC: gint db_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
+ * PUBLIC: int db_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
*
* db_Cmd --
* Implements the "db" widget.
*/
-gint
+int
db_Cmd(clientData, interp, objc, objv)
ClientData clientData; /* DB handle */
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *dbcmds[] = {
+ static char *dbcmds[] = {
#if CONFIG_TEST
"keyrange",
"pget",
@@ -141,12 +141,12 @@ db_Cmd(clientData, interp, objc, objv)
DBTCL_INFO *ip;
DBTYPE type;
Tcl_Obj *res;
- gint cmdindex, isswapped, result, ret;
- gchar newname[MSG_SIZE];
+ int cmdindex, isswapped, result, ret;
+ char newname[MSG_SIZE];
Tcl_ResetResult(interp);
dbp = (DB *)clientData;
- dbip = _PtrToInfo((gpointer)dbp);
+ dbip = _PtrToInfo((void *)dbp);
memset(newname, 0, MSG_SIZE);
result = TCL_OK;
if (objc <= 1) {
@@ -338,19 +338,19 @@ db_Cmd(clientData, interp, objc, objv)
static int
tcl_DbStat(interp, objc, objv, dbp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB *dbp; /* Database pointer */
{
DB_BTREE_STAT *bsp;
DB_HASH_STAT *hsp;
DB_QUEUE_STAT *qsp;
- gpointer sp;
+ void *sp;
Tcl_Obj *res, *flaglist, *myobjv[2];
DBTYPE type;
u_int32_t flag;
- gint result, ret;
- gchar *arg;
+ int result, ret;
+ char *arg;
result = TCL_OK;
flag = 0;
@@ -482,12 +482,12 @@ error:
static int
tcl_DbClose(interp, objc, objv, dbp, dbip)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB *dbp; /* Database pointer */
DBTCL_INFO *dbip; /* Info pointer */
{
- static gchar *dbclose[] = {
+ static char *dbclose[] = {
"-nosync", "--", NULL
};
enum dbclose {
@@ -495,8 +495,8 @@ tcl_DbClose(interp, objc, objv, dbp, dbip)
TCL_DBCLOSE_ENDARG
};
u_int32_t flag;
- gint endarg, i, optindex, result, ret;
- gchar *arg;
+ int endarg, i, optindex, result, ret;
+ char *arg;
result = TCL_OK;
endarg = 0;
@@ -552,11 +552,11 @@ tcl_DbClose(interp, objc, objv, dbp, dbip)
static int
tcl_DbPut(interp, objc, objv, dbp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB *dbp; /* Database pointer */
{
- static gchar *dbputopts[] = {
+ static char *dbputopts[] = {
#if CONFIG_TEST
"-nodupdata",
#endif
@@ -577,7 +577,7 @@ tcl_DbPut(interp, objc, objv, dbp)
DBPUT_PART,
DBPUT_TXN
};
- static gchar *dbputapp[] = {
+ static char *dbputapp[] = {
"-append", NULL
};
enum dbputapp { DBPUT_APPEND0 };
@@ -585,12 +585,12 @@ tcl_DbPut(interp, objc, objv, dbp)
DBTYPE type;
DB_TXN *txn;
Tcl_Obj **elemv, *res;
- gpointer dtmp, *ktmp;
+ void *dtmp, *ktmp;
db_recno_t recno;
u_int32_t flag;
- gint auto_commit, elemc, end, freekey, freedata;
- gint i, optindex, result, ret;
- gchar *arg, msg[MSG_SIZE];
+ int auto_commit, elemc, end, freekey, freedata;
+ int i, optindex, result, ret;
+ char *arg, msg[MSG_SIZE];
txn = NULL;
result = TCL_OK;
@@ -775,12 +775,12 @@ out:
static int
tcl_DbGet(interp, objc, objv, dbp, ispget)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB *dbp; /* Database pointer */
- gint ispget; /* 1 for pget, 0 for get */
+ int ispget; /* 1 for pget, 0 for get */
{
- static gchar *dbgetopts[] = {
+ static char *dbgetopts[] = {
#if CONFIG_TEST
"-dirty",
"-multi",
@@ -816,11 +816,11 @@ tcl_DbGet(interp, objc, objv, dbp, ispget)
DBTYPE type;
DB_TXN *txn;
Tcl_Obj **elemv, *retlist;
- gpointer dtmp, *ktmp;
+ void *dtmp, *ktmp;
u_int32_t flag, cflag, isdup, mflag, rmw;
- gint bufsize, elemc, end, endarg, freekey, freedata, i;
- gint optindex, result, ret, useglob, useprecno, userecno;
- gchar *arg, *pattern, *prefix, msg[MSG_SIZE];
+ int bufsize, elemc, end, endarg, freekey, freedata, i;
+ int optindex, result, ret, useglob, useprecno, userecno;
+ char *arg, *pattern, *prefix, msg[MSG_SIZE];
db_recno_t precno, recno;
result = TCL_OK;
@@ -1365,11 +1365,11 @@ out:
static int
tcl_DbDelete(interp, objc, objv, dbp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB *dbp; /* Database pointer */
{
- static gchar *dbdelopts[] = {
+ static char *dbdelopts[] = {
"-auto_commit",
"-glob",
"-txn",
@@ -1384,11 +1384,11 @@ tcl_DbDelete(interp, objc, objv, dbp)
DBT key, data;
DBTYPE type;
DB_TXN *txn;
- gpointer ktmp;
+ void *ktmp;
db_recno_t recno;
- gint freekey, i, optindex, result, ret;
+ int freekey, i, optindex, result, ret;
u_int32_t flag;
- gchar *arg, *pattern, *prefix, msg[MSG_SIZE];
+ char *arg, *pattern, *prefix, msg[MSG_SIZE];
result = TCL_OK;
freekey = 0;
@@ -1617,12 +1617,12 @@ out:
static int
tcl_DbCursor(interp, objc, objv, dbp, dbcp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB *dbp; /* Database pointer */
DBC **dbcp; /* Return cursor pointer */
{
- static gchar *dbcuropts[] = {
+ static char *dbcuropts[] = {
#if CONFIG_TEST
"-dirty",
"-update",
@@ -1639,8 +1639,8 @@ tcl_DbCursor(interp, objc, objv, dbp, dbcp)
};
DB_TXN *txn;
u_int32_t flag;
- gint i, optindex, result, ret;
- gchar *arg, msg[MSG_SIZE];
+ int i, optindex, result, ret;
+ char *arg, msg[MSG_SIZE];
result = TCL_OK;
flag = 0;
@@ -1699,11 +1699,11 @@ out:
static int
tcl_DbAssociate(interp, objc, objv, dbp)
Tcl_Interp *interp;
- gint objc;
+ int objc;
Tcl_Obj *CONST objv[];
DB *dbp;
{
- static gchar *dbaopts[] = {
+ static char *dbaopts[] = {
"-auto_commit",
"-create",
"-txn",
@@ -1717,8 +1717,8 @@ tcl_DbAssociate(interp, objc, objv, dbp)
DB *sdbp;
DB_TXN *txn;
DBTCL_INFO *sdbip;
- gint i, optindex, result, ret;
- gchar *arg, msg[MSG_SIZE];
+ int i, optindex, result, ret;
+ char *arg, msg[MSG_SIZE];
u_int32_t flag;
txn = NULL;
@@ -1828,8 +1828,8 @@ tcl_second_call(dbp, pkey, data, skey)
DBTCL_INFO *ip;
Tcl_Interp *interp;
Tcl_Obj *pobj, *dobj, *objv[3];
- gint len, result, ret;
- gpointer retbuf, *databuf;
+ int len, result, ret;
+ void *retbuf, *databuf;
ip = (DBTCL_INFO *)dbp->api_internal;
interp = ip->i_interp;
@@ -1884,12 +1884,12 @@ tcl_second_call(dbp, pkey, data, skey)
static int
tcl_DbJoin(interp, objc, objv, dbp, dbcp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB *dbp; /* Database pointer */
DBC **dbcp; /* Cursor pointer */
{
- static gchar *dbjopts[] = {
+ static char *dbjopts[] = {
"-nosort",
NULL
};
@@ -1898,8 +1898,8 @@ tcl_DbJoin(interp, objc, objv, dbp, dbcp)
};
DBC **listp;
u_int32_t flag;
- gint adj, i, j, optindex, size, result, ret;
- gchar *arg, msg[MSG_SIZE];
+ int adj, i, j, optindex, size, result, ret;
+ char *arg, msg[MSG_SIZE];
result = TCL_OK;
flag = 0;
@@ -1968,11 +1968,11 @@ out:
static int
tcl_DbGetjoin(interp, objc, objv, dbp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB *dbp; /* Database pointer */
{
- static gchar *dbgetjopts[] = {
+ static char *dbgetjopts[] = {
#if CONFIG_TEST
"-nosort",
#endif
@@ -1991,10 +1991,10 @@ tcl_DbGetjoin(interp, objc, objv, dbp)
DBC *dbc;
DBT key, data;
Tcl_Obj **elemv, *retlist;
- gpointer ktmp;
+ void *ktmp;
u_int32_t flag;
- gint adj, elemc, freekey, i, j, optindex, result, ret, size;
- gchar *arg, msg[MSG_SIZE];
+ int adj, elemc, freekey, i, j, optindex, result, ret, size;
+ char *arg, msg[MSG_SIZE];
result = TCL_OK;
flag = 0;
@@ -2142,16 +2142,16 @@ out:
static int
tcl_DbCount(interp, objc, objv, dbp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB *dbp; /* Database pointer */
{
Tcl_Obj *res;
DBC *dbc;
DBT key, data;
- gpointer ktmp;
+ void *ktmp;
db_recno_t count, recno;
- gint freekey, result, ret;
+ int freekey, result, ret;
result = TCL_OK;
count = 0;
@@ -2230,11 +2230,11 @@ out:
static int
tcl_DbKeyRange(interp, objc, objv, dbp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB *dbp; /* Database pointer */
{
- static gchar *dbkeyropts[] = {
+ static char *dbkeyropts[] = {
"-txn",
NULL
};
@@ -2246,11 +2246,11 @@ tcl_DbKeyRange(interp, objc, objv, dbp)
DBT key;
DBTYPE type;
Tcl_Obj *myobjv[3], *retlist;
- gpointer ktmp;
+ void *ktmp;
db_recno_t recno;
u_int32_t flag;
- gint freekey, i, myobjc, optindex, result, ret;
- gchar *arg, msg[MSG_SIZE];
+ int freekey, i, myobjc, optindex, result, ret;
+ char *arg, msg[MSG_SIZE];
result = TCL_OK;
flag = 0;
@@ -2350,11 +2350,11 @@ out:
static int
tcl_DbTruncate(interp, objc, objv, dbp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB *dbp; /* Database pointer */
{
- static gchar *dbcuropts[] = {
+ static char *dbcuropts[] = {
"-auto_commit",
"-txn",
NULL
@@ -2366,8 +2366,8 @@ tcl_DbTruncate(interp, objc, objv, dbp)
DB_TXN *txn;
Tcl_Obj *res;
u_int32_t count, flag;
- gint i, optindex, result, ret;
- gchar *arg, msg[MSG_SIZE];
+ int i, optindex, result, ret;
+ char *arg, msg[MSG_SIZE];
txn = NULL;
flag = 0;
diff --git a/libdb/tcl/tcl_db_pkg.c b/libdb/tcl/tcl_db_pkg.c
index 07ba2ec..96bf184 100644
--- a/libdb/tcl/tcl_db_pkg.c
+++ b/libdb/tcl/tcl_db_pkg.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -49,16 +49,16 @@ static int bdb_Handles __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
static int tcl_bt_compare __P((DB *, const DBT *, const DBT *));
static int tcl_compare_callback __P((DB *, const DBT *, const DBT *,
- Tcl_Obj *, gchar *));
+ Tcl_Obj *, char *));
static int tcl_dup_compare __P((DB *, const DBT *, const DBT *));
-static u_int32_t tcl_h_hash __P((DB *, gconstpointer , u_int32_t));
+static u_int32_t tcl_h_hash __P((DB *, const void *, u_int32_t));
static int tcl_rep_send __P((DB_ENV *,
const DBT *, const DBT *, int, u_int32_t));
#ifdef TEST_ALLOC
-static gpointer tcl_db_malloc __P((size_t));
-static gpointer tcl_db_realloc __P((gpointer , size_t));
-static void tcl_db_free __P((gpointer));
+static void * tcl_db_malloc __P((size_t));
+static void * tcl_db_realloc __P((void *, size_t));
+static void tcl_db_free __P((void *));
#endif
/*
@@ -69,12 +69,12 @@ static void tcl_db_free __P((gpointer));
* name of the shared library, currently libdb_tcl-X.Y.so, which Tcl uses
* to determine the name of this function.
*/
-gint
+int
Db_tcl_Init(interp)
Tcl_Interp *interp; /* Interpreter in which the package is
* to be made available. */
{
- gint code;
+ int code;
code = Tcl_PkgProvide(interp, "Db_tcl", "1.0");
if (code != TCL_OK)
@@ -85,12 +85,12 @@ Db_tcl_Init(interp)
/*
* Create shared global debugging variables
*/
- Tcl_LinkVar(interp, "__debug_on", (gchar *)&__debug_on, TCL_LINK_INT);
- Tcl_LinkVar(interp, "__debug_print", (gchar *)&__debug_print,
+ Tcl_LinkVar(interp, "__debug_on", (char *)&__debug_on, TCL_LINK_INT);
+ Tcl_LinkVar(interp, "__debug_print", (char *)&__debug_print,
TCL_LINK_INT);
- Tcl_LinkVar(interp, "__debug_stop", (gchar *)&__debug_stop,
+ Tcl_LinkVar(interp, "__debug_stop", (char *)&__debug_stop,
TCL_LINK_INT);
- Tcl_LinkVar(interp, "__debug_test", (gchar *)&__debug_test,
+ Tcl_LinkVar(interp, "__debug_test", (char *)&__debug_test,
TCL_LINK_INT);
LIST_INIT(&__db_infohead);
return (TCL_OK);
@@ -113,10 +113,10 @@ static int
berkdb_Cmd(notused, interp, objc, objv)
ClientData notused; /* Not used. */
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *berkdbcmds[] = {
+ static char *berkdbcmds[] = {
#if CONFIG_TEST
"dbverify",
"handles",
@@ -164,19 +164,19 @@ berkdb_Cmd(notused, interp, objc, objv)
BDB_RANDX, BDB_RAND_INTX, BDB_SRANDX,
BDB_DBGCKX
};
- static gint env_id = 0;
- static gint db_id = 0;
+ static int env_id = 0;
+ static int db_id = 0;
DB *dbp;
#if CONFIG_TEST
DBM *ndbmp;
- static gint ndbm_id = 0;
+ static int ndbm_id = 0;
#endif
DBTCL_INFO *ip;
DB_ENV *envp;
Tcl_Obj *res;
- gint cmdindex, result;
- gchar newname[MSG_SIZE];
+ int cmdindex, result;
+ char newname[MSG_SIZE];
COMPQUIET(notused, NULL);
@@ -337,12 +337,12 @@ berkdb_Cmd(notused, interp, objc, objv)
static int
bdb_EnvOpen(interp, objc, objv, ip, env)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DBTCL_INFO *ip; /* Our internal info */
DB_ENV **env; /* Environment pointer */
{
- static gchar *envopen[] = {
+ static char *envopen[] = {
#if CONFIG_TEST
"-auto_commit",
"-cdb",
@@ -461,10 +461,10 @@ bdb_EnvOpen(interp, objc, objv, ip, env)
u_int32_t detect, gbytes, bytes, ncaches, logbufset, logmaxset;
u_int32_t open_flags, rep_flags, set_flags, size, uintarg;
u_int8_t *conflicts;
- gint i, intarg, j, mode, myobjc, nmodes, optindex;
- gint result, ret, temp;
+ int i, intarg, j, mode, myobjc, nmodes, optindex;
+ int result, ret, temp;
long client_to, server_to, shm;
- gchar *arg, *home, *passwd, *server;
+ char *arg, *home, *passwd, *server;
result = TCL_OK;
mode = 0;
@@ -1252,18 +1252,18 @@ error: if (result == TCL_ERROR) {
static int
bdb_DbOpen(interp, objc, objv, ip, dbp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DBTCL_INFO *ip; /* Our internal info */
DB **dbp; /* DB handle */
{
- static gchar *bdbenvopen[] = {
+ static char *bdbenvopen[] = {
"-env", NULL
};
enum bdbenvopen {
TCL_DB_ENV0
};
- static gchar *bdbopen[] = {
+ static char *bdbopen[] = {
#if CONFIG_TEST
"-btcompare",
"-dirty",
@@ -1365,10 +1365,10 @@ bdb_DbOpen(interp, objc, objv, ip, dbp)
DB_ENV *envp;
Tcl_Obj **myobjv;
u_int32_t gbytes, bytes, ncaches, open_flags, uintarg;
- gint endarg, i, intarg, mode, myobjc;
- gint optindex, result, ret, set_err, set_flags, set_pfx, subdblen;
+ int endarg, i, intarg, mode, myobjc;
+ int optindex, result, ret, set_err, set_flags, set_pfx, subdblen;
u_char *subdbtmp;
- gchar *arg, *db, *passwd, *subdb, msg[MSG_SIZE];
+ char *arg, *db, *passwd, *subdb, msg[MSG_SIZE];
type = DB_UNKNOWN;
endarg = mode = set_err = set_flags = set_pfx = 0;
@@ -2019,10 +2019,10 @@ error:
static int
bdb_DbRemove(interp, objc, objv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *bdbrem[] = {
+ static char *bdbrem[] = {
"-auto_commit",
"-encrypt",
"-encryptaes",
@@ -2044,10 +2044,10 @@ bdb_DbRemove(interp, objc, objv)
DB *dbp;
DB_ENV *envp;
DB_TXN *txn;
- gint endarg, i, optindex, result, ret, subdblen;
+ int endarg, i, optindex, result, ret, subdblen;
u_int32_t enc_flag, iflags, set_flags;
u_char *subdbtmp;
- gchar *arg, *db, msg[MSG_SIZE], *passwd, *subdb;
+ char *arg, *db, msg[MSG_SIZE], *passwd, *subdb;
db = subdb = NULL;
dbp = NULL;
@@ -2225,10 +2225,10 @@ error:
static int
bdb_DbRename(interp, objc, objv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *bdbmv[] = {
+ static char *bdbmv[] = {
"-auto_commit",
"-encrypt",
"-encryptaes",
@@ -2251,9 +2251,9 @@ bdb_DbRename(interp, objc, objv)
DB_ENV *envp;
DB_TXN *txn;
u_int32_t enc_flag, iflags, set_flags;
- gint endarg, i, newlen, optindex, result, ret, subdblen;
+ int endarg, i, newlen, optindex, result, ret, subdblen;
u_char *subdbtmp;
- gchar *arg, *db, msg[MSG_SIZE], *newname, *passwd, *subdb;
+ char *arg, *db, msg[MSG_SIZE], *newname, *passwd, *subdb;
db = newname = subdb = NULL;
dbp = NULL;
@@ -2444,10 +2444,10 @@ error:
static int
bdb_DbVerify(interp, objc, objv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *bdbverify[] = {
+ static char *bdbverify[] = {
"-encrypt",
"-encryptaes",
"-encryptany",
@@ -2470,8 +2470,8 @@ bdb_DbVerify(interp, objc, objv)
DB *dbp;
FILE *errf;
u_int32_t enc_flag, flags, set_flags;
- gint endarg, i, optindex, result, ret;
- gchar *arg, *db, *errpfx, *passwd;
+ int endarg, i, optindex, result, ret;
+ char *arg, *db, *errpfx, *passwd;
envp = NULL;
dbp = NULL;
@@ -2644,17 +2644,17 @@ error:
static int
bdb_Version(interp, objc, objv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *bdbver[] = {
+ static char *bdbver[] = {
"-string", NULL
};
enum bdbver {
TCL_VERSTRING
};
- gint i, optindex, maj, min, patch, result, string, verobjc;
- gchar *arg, *v;
+ int i, optindex, maj, min, patch, result, string, verobjc;
+ char *arg, *v;
Tcl_Obj *res, *verobjv[3];
result = TCL_OK;
@@ -2720,7 +2720,7 @@ error:
static int
bdb_Handles(interp, objc, objv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
DBTCL_INFO *p;
@@ -2754,10 +2754,10 @@ bdb_Handles(interp, objc, objv)
static int
bdb_DbUpgrade(interp, objc, objv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *bdbupg[] = {
+ static char *bdbupg[] = {
"-dupsort", "-env", "--", NULL
};
enum bdbupg {
@@ -2768,8 +2768,8 @@ bdb_DbUpgrade(interp, objc, objv)
DB_ENV *envp;
DB *dbp;
u_int32_t flags;
- gint endarg, i, optindex, result, ret;
- gchar *arg, *db;
+ int endarg, i, optindex, result, ret;
+ char *arg, *db;
envp = NULL;
dbp = NULL;
@@ -2886,12 +2886,12 @@ tcl_compare_callback(dbp, dbta, dbtb, procobj, errname)
DB *dbp;
const DBT *dbta, *dbtb;
Tcl_Obj *procobj;
- gchar *errname;
+ char *errname;
{
DBTCL_INFO *ip;
Tcl_Interp *interp;
Tcl_Obj *a, *b, *resobj, *objv[3];
- gint result, cmp;
+ int result, cmp;
ip = (DBTCL_INFO *)dbp->api_internal;
interp = ip->i_interp;
@@ -2951,13 +2951,13 @@ panic: __db_err(dbp->dbenv, "Tcl %s callback failed", errname);
static u_int32_t
tcl_h_hash(dbp, buf, len)
DB *dbp;
- gconstpointer buf;
+ const void *buf;
u_int32_t len;
{
DBTCL_INFO *ip;
Tcl_Interp *interp;
Tcl_Obj *objv[2];
- gint result, hval;
+ int result, hval;
ip = (DBTCL_INFO *)dbp->api_internal;
interp = ip->i_interp;
@@ -2966,7 +2966,7 @@ tcl_h_hash(dbp, buf, len)
/*
* Create a ByteArray for the buffer.
*/
- objv[1] = Tcl_NewByteArrayObj((gpointer)buf, len);
+ objv[1] = Tcl_NewByteArrayObj((void *)buf, len);
Tcl_IncrRefCount(objv[1]);
result = Tcl_EvalObjv(interp, 2, objv, 0);
if (result != TCL_OK) {
@@ -2996,13 +2996,13 @@ static int
tcl_rep_send(dbenv, control, rec, eid, flags)
DB_ENV *dbenv;
const DBT *control, *rec;
- gint eid;
+ int eid;
u_int32_t flags;
{
DBTCL_INFO *ip;
Tcl_Interp *interp;
Tcl_Obj *control_o, *eid_o, *origobj, *rec_o, *resobj, *objv[5];
- gint result, ret;
+ int result, ret;
COMPQUIET(flags, 0);
@@ -3065,12 +3065,12 @@ err: __db_err(dbenv, "Tcl rep_send failure");
* to exercise umalloc/urealloc/ufree. Allocate the memory as a Tcl object
* so we're sure to exacerbate and catch any shared-library issues.
*/
-static gpointer
+static void *
tcl_db_malloc(size)
size_t size;
{
Tcl_Obj *obj;
- gpointer buf;
+ void *buf;
obj = Tcl_NewObj();
if (obj == NULL)
@@ -3085,9 +3085,9 @@ tcl_db_malloc(size)
return (buf);
}
-static gpointer
+static void *
tcl_db_realloc(ptr, size)
- gpointer ptr;
+ void *ptr;
size_t size;
{
Tcl_Obj *obj;
@@ -3107,7 +3107,7 @@ tcl_db_realloc(ptr, size)
static void
tcl_db_free(ptr)
- gpointer ptr;
+ void *ptr;
{
Tcl_Obj *obj;
diff --git a/libdb/tcl/tcl_dbcursor.c b/libdb/tcl/tcl_dbcursor.c
index 2d595eb..c698892 100644
--- a/libdb/tcl/tcl_dbcursor.c
+++ b/libdb/tcl/tcl_dbcursor.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,24 +25,24 @@ static const gchar revid[] = "$Id$";
/*
* Prototypes for procedures defined later in this file:
*/
-static gint tcl_DbcDup __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DBC *));
-static gint tcl_DbcGet __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DBC *, int));
-static gint tcl_DbcPut __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DBC *));
+static int tcl_DbcDup __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DBC *));
+static int tcl_DbcGet __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DBC *, int));
+static int tcl_DbcPut __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DBC *));
/*
- * PUBLIC: gint dbc_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
+ * PUBLIC: int dbc_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
*
* dbc_cmd --
* Implements the cursor command.
*/
-gint
+int
dbc_Cmd(clientData, interp, objc, objv)
ClientData clientData; /* Cursor handle */
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *dbccmds[] = {
+ static char *dbccmds[] = {
#if CONFIG_TEST
"pget",
#endif
@@ -65,11 +65,11 @@ dbc_Cmd(clientData, interp, objc, objv)
};
DBC *dbc;
DBTCL_INFO *dbip;
- gint cmdindex, result, ret;
+ int cmdindex, result, ret;
Tcl_ResetResult(interp);
dbc = (DBC *)clientData;
- dbip = _PtrToInfo((gpointer)dbc);
+ dbip = _PtrToInfo((void *)dbc);
result = TCL_OK;
if (objc <= 1) {
@@ -147,11 +147,11 @@ dbc_Cmd(clientData, interp, objc, objv)
static int
tcl_DbcPut(interp, objc, objv, dbc)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DBC *dbc; /* Cursor pointer */
{
- static gchar *dbcutopts[] = {
+ static char *dbcutopts[] = {
#if CONFIG_TEST
"-nodupdata",
#endif
@@ -179,10 +179,10 @@ tcl_DbcPut(interp, objc, objv, dbc)
DBTCL_INFO *dbcip, *dbip;
DBTYPE type;
Tcl_Obj **elemv, *res;
- gpointer dtmp, *ktmp;
+ void *dtmp, *ktmp;
db_recno_t recno;
u_int32_t flag;
- gint elemc, freekey, freedata, i, optindex, result, ret;
+ int elemc, freekey, freedata, i, optindex, result, ret;
result = TCL_OK;
flag = 0;
@@ -375,12 +375,12 @@ out:
static int
tcl_DbcGet(interp, objc, objv, dbc, ispget)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DBC *dbc; /* Cursor pointer */
- gint ispget; /* 1 for pget, 0 for get */
+ int ispget; /* 1 for pget, 0 for get */
{
- static gchar *dbcgetopts[] = {
+ static char *dbcgetopts[] = {
#if CONFIG_TEST
"-dirty",
"-get_both_range",
@@ -434,10 +434,10 @@ tcl_DbcGet(interp, objc, objv, dbc, ispget)
DBTCL_INFO *dbcip, *dbip;
DBTYPE ptype, type;
Tcl_Obj **elemv, *myobj, *retlist;
- gpointer dtmp, *ktmp;
+ void *dtmp, *ktmp;
db_recno_t precno, recno;
u_int32_t flag, op;
- gint bufsize, elemc, freekey, freedata, i, optindex, result, ret;
+ int bufsize, elemc, freekey, freedata, i, optindex, result, ret;
result = TCL_OK;
flag = 0;
@@ -812,11 +812,11 @@ out:
static int
tcl_DbcDup(interp, objc, objv, dbc)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DBC *dbc; /* Cursor pointer */
{
- static gchar *dbcdupopts[] = {
+ static char *dbcdupopts[] = {
"-position",
NULL
};
@@ -827,8 +827,8 @@ tcl_DbcDup(interp, objc, objv, dbc)
DBTCL_INFO *dbcip, *newdbcip, *dbip;
Tcl_Obj *res;
u_int32_t flag;
- gint i, optindex, result, ret;
- gchar newname[MSG_SIZE];
+ int i, optindex, result, ret;
+ char newname[MSG_SIZE];
result = TCL_OK;
flag = 0;
diff --git a/libdb/tcl/tcl_env.c b/libdb/tcl/tcl_env.c
index da4d3b3..f720079 100644
--- a/libdb/tcl/tcl_env.c
+++ b/libdb/tcl/tcl_env.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -26,23 +26,23 @@ static const gchar revid[] = "$Id$";
* Prototypes for procedures defined later in this file:
*/
static void _EnvInfoDelete __P((Tcl_Interp *, DBTCL_INFO *));
-static gint env_DbRemove __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-static gint env_DbRename __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+static int env_DbRemove __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+static int env_DbRename __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
/*
- * PUBLIC: gint env_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
+ * PUBLIC: int env_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
*
* env_Cmd --
* Implements the "env" command.
*/
-gint
+int
env_Cmd(clientData, interp, objc, objv)
ClientData clientData; /* Env handle */
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *envcmds[] = {
+ static char *envcmds[] = {
#if CONFIG_TEST
"attributes",
"lock_detect",
@@ -137,8 +137,8 @@ env_Cmd(clientData, interp, objc, objv)
DB_ENV *dbenv;
DB_LOGC *logc;
Tcl_Obj *res;
- gchar newname[MSG_SIZE];
- gint cmdindex, result, ret;
+ char newname[MSG_SIZE];
+ int cmdindex, result, ret;
u_int32_t newval;
#if CONFIG_TEST
u_int32_t otherval;
@@ -146,7 +146,7 @@ env_Cmd(clientData, interp, objc, objv)
Tcl_ResetResult(interp);
dbenv = (DB_ENV *)clientData;
- envip = _PtrToInfo((gpointer)dbenv);
+ envip = _PtrToInfo((void *)dbenv);
result = TCL_OK;
memset(newname, 0, MSG_SIZE);
@@ -419,20 +419,20 @@ env_Cmd(clientData, interp, objc, objv)
}
/*
- * PUBLIC: gint tcl_EnvRemove __P((Tcl_Interp *, int, Tcl_Obj * CONST*,
+ * PUBLIC: int tcl_EnvRemove __P((Tcl_Interp *, int, Tcl_Obj * CONST*,
* PUBLIC: DB_ENV *, DBTCL_INFO *));
*
* tcl_EnvRemove --
*/
-gint
+int
tcl_EnvRemove(interp, objc, objv, dbenv, envip)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *dbenv; /* Env pointer */
DBTCL_INFO *envip; /* Info pointer */
{
- static gchar *envremopts[] = {
+ static char *envremopts[] = {
#if CONFIG_TEST
"-overwrite",
"-server",
@@ -465,8 +465,8 @@ tcl_EnvRemove(interp, objc, objv, dbenv, envip)
};
DB_ENV *e;
u_int32_t cflag, enc_flag, flag, forceflag, sflag;
- gint i, optindex, result, ret;
- gchar *datadir, *home, *logdir, *passwd, *server, *tmpdir;
+ int i, optindex, result, ret;
+ char *datadir, *home, *logdir, *passwd, *server, *tmpdir;
result = TCL_OK;
cflag = flag = forceflag = sflag = 0;
@@ -716,19 +716,19 @@ _EnvInfoDelete(interp, envip)
#if CONFIG_TEST
/*
- * PUBLIC: gint tcl_EnvVerbose __P((Tcl_Interp *, DB_ENV *, Tcl_Obj *,
+ * PUBLIC: int tcl_EnvVerbose __P((Tcl_Interp *, DB_ENV *, Tcl_Obj *,
* PUBLIC: Tcl_Obj *));
*
* tcl_EnvVerbose --
*/
-gint
+int
tcl_EnvVerbose(interp, dbenv, which, onoff)
Tcl_Interp *interp; /* Interpreter */
DB_ENV *dbenv; /* Env pointer */
Tcl_Obj *which; /* Which subsystem */
Tcl_Obj *onoff; /* On or off */
{
- static gchar *verbwhich[] = {
+ static char *verbwhich[] = {
"chkpt",
"deadlock",
"recovery",
@@ -743,7 +743,7 @@ tcl_EnvVerbose(interp, dbenv, which, onoff)
ENVVERB_REP,
ENVVERB_WAIT
};
- static gchar *verbonoff[] = {
+ static char *verbonoff[] = {
"off",
"on",
NULL
@@ -752,7 +752,7 @@ tcl_EnvVerbose(interp, dbenv, which, onoff)
ENVVERB_OFF,
ENVVERB_ON
};
- gint on, optindex, ret;
+ int on, optindex, ret;
u_int32_t wh;
if (Tcl_GetIndexFromObj(interp, which, verbwhich, "option",
@@ -799,19 +799,19 @@ tcl_EnvVerbose(interp, dbenv, which, onoff)
#if CONFIG_TEST
/*
- * PUBLIC: gint tcl_EnvAttr __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+ * PUBLIC: int tcl_EnvAttr __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
*
* tcl_EnvAttr --
* Return a list of the env's attributes
*/
-gint
+int
tcl_EnvAttr(interp, objc, objv, dbenv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *dbenv; /* Env pointer */
{
- gint result;
+ int result;
Tcl_Obj *myobj, *retlist;
result = TCL_OK;
@@ -882,18 +882,18 @@ err:
}
/*
- * PUBLIC: gint tcl_EnvTest __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+ * PUBLIC: int tcl_EnvTest __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
*
* tcl_EnvTest --
*/
-gint
+int
tcl_EnvTest(interp, objc, objv, dbenv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *dbenv; /* Env pointer */
{
- static gchar *envtestcmd[] = {
+ static char *envtestcmd[] = {
"abort",
"copy",
NULL
@@ -902,7 +902,7 @@ tcl_EnvTest(interp, objc, objv, dbenv)
ENVTEST_ABORT,
ENVTEST_COPY
};
- static gchar *envtestat[] = {
+ static char *envtestat[] = {
"electinit",
"electsend",
"electvote1",
@@ -937,7 +937,7 @@ tcl_EnvTest(interp, objc, objv, dbenv)
ENVTEST_POSTSYNC,
ENVTEST_SUBDB_LOCKS
};
- gint *loc, optindex, result, testval;
+ int *loc, optindex, result, testval;
result = TCL_OK;
loc = NULL;
@@ -1046,11 +1046,11 @@ tcl_EnvTest(interp, objc, objv, dbenv)
static int
env_DbRemove(interp, objc, objv, dbenv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *dbenv;
{
- static gchar *envdbrem[] = {
+ static char *envdbrem[] = {
"-auto_commit",
"-txn",
"--",
@@ -1063,9 +1063,9 @@ env_DbRemove(interp, objc, objv, dbenv)
};
DB_TXN *txn;
u_int32_t flag;
- gint endarg, i, optindex, result, ret, subdblen;
+ int endarg, i, optindex, result, ret, subdblen;
u_char *subdbtmp;
- gchar *arg, *db, *subdb, msg[MSG_SIZE];
+ char *arg, *db, *subdb, msg[MSG_SIZE];
txn = NULL;
result = TCL_OK;
@@ -1174,11 +1174,11 @@ error:
static int
env_DbRename(interp, objc, objv, dbenv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *dbenv;
{
- static gchar *envdbmv[] = {
+ static char *envdbmv[] = {
"-auto_commit",
"-txn",
"--",
@@ -1191,9 +1191,9 @@ env_DbRename(interp, objc, objv, dbenv)
};
DB_TXN *txn;
u_int32_t flag;
- gint endarg, i, newlen, optindex, result, ret, subdblen;
+ int endarg, i, newlen, optindex, result, ret, subdblen;
u_char *subdbtmp;
- gchar *arg, *db, *newname, *subdb, msg[MSG_SIZE];
+ char *arg, *db, *newname, *subdb, msg[MSG_SIZE];
txn = NULL;
result = TCL_OK;
diff --git a/libdb/tcl/tcl_internal.c b/libdb/tcl/tcl_internal.c
index dcc6fbe..ffe9b8a 100644
--- a/libdb/tcl/tcl_internal.c
+++ b/libdb/tcl/tcl_internal.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -46,11 +46,11 @@ static const gchar revid[] = "$Id$";
/*
* Prototypes for procedures defined later in this file:
*/
-static void tcl_flag_callback __P((u_int32_t, const FN *, gpointer ));
+static void tcl_flag_callback __P((u_int32_t, const FN *, void *));
/*
* Private structure type used to pass both an interp and an object into
- * a callback's single gpointer .
+ * a callback's single void *.
*/
struct __tcl_callback_bundle {
Tcl_Interp *interp;
@@ -61,7 +61,7 @@ struct __tcl_callback_bundle {
/*
* PUBLIC: DBTCL_INFO *_NewInfo __P((Tcl_Interp *,
- * PUBLIC: gpointer , gchar *, enum INFOTYPE));
+ * PUBLIC: void *, char *, enum INFOTYPE));
*
* _NewInfo --
*
@@ -71,12 +71,12 @@ struct __tcl_callback_bundle {
DBTCL_INFO *
_NewInfo(interp, anyp, name, type)
Tcl_Interp *interp;
- gpointer anyp;
- gchar *name;
+ void *anyp;
+ char *name;
enum INFOTYPE type;
{
DBTCL_INFO *p;
- gint i, ret;
+ int i, ret;
if ((ret = __os_malloc(NULL, sizeof(DBTCL_INFO), &p)) != 0) {
Tcl_SetResult(interp, db_strerror(ret), TCL_STATIC);
@@ -111,11 +111,11 @@ _NewInfo(interp, anyp, name, type)
}
/*
- * PUBLIC: gpointer _NameToPtr __P((CONST gchar *));
+ * PUBLIC: void *_NameToPtr __P((CONST char *));
*/
void *
_NameToPtr(name)
- CONST gchar *name;
+ CONST char *name;
{
DBTCL_INFO *p;
@@ -127,11 +127,11 @@ _NameToPtr(name)
}
/*
- * PUBLIC: DBTCL_INFO *_PtrToInfo __P((CONST gpointer ));
+ * PUBLIC: DBTCL_INFO *_PtrToInfo __P((CONST void *));
*/
DBTCL_INFO *
_PtrToInfo(ptr)
- CONST gpointer ptr;
+ CONST void *ptr;
{
DBTCL_INFO *p;
@@ -143,11 +143,11 @@ _PtrToInfo(ptr)
}
/*
- * PUBLIC: DBTCL_INFO *_NameToInfo __P((CONST gchar *));
+ * PUBLIC: DBTCL_INFO *_NameToInfo __P((CONST char *));
*/
DBTCL_INFO *
_NameToInfo(name)
- CONST gchar *name;
+ CONST char *name;
{
DBTCL_INFO *p;
@@ -159,12 +159,12 @@ _NameToInfo(name)
}
/*
- * PUBLIC: void _SetInfoData __P((DBTCL_INFO *, gpointer ));
+ * PUBLIC: void _SetInfoData __P((DBTCL_INFO *, void *));
*/
void
_SetInfoData(p, data)
DBTCL_INFO *p;
- gpointer data;
+ void *data;
{
if (p == NULL)
return;
@@ -209,18 +209,18 @@ _DeleteInfo(p)
}
/*
- * PUBLIC: gint _SetListElem __P((Tcl_Interp *,
- * PUBLIC: Tcl_Obj *, gpointer , int, gpointer , int));
+ * PUBLIC: int _SetListElem __P((Tcl_Interp *,
+ * PUBLIC: Tcl_Obj *, void *, int, void *, int));
*/
-gint
+int
_SetListElem(interp, list, elem1, e1cnt, elem2, e2cnt)
Tcl_Interp *interp;
Tcl_Obj *list;
- gpointer elem1, *elem2;
- gint e1cnt, e2cnt;
+ void *elem1, *elem2;
+ int e1cnt, e2cnt;
{
Tcl_Obj *myobjv[2], *thislist;
- gint myobjc;
+ int myobjc;
myobjc = 2;
myobjv[0] = Tcl_NewByteArrayObj((u_char *)elem1, e1cnt);
@@ -233,20 +233,20 @@ _SetListElem(interp, list, elem1, e1cnt, elem2, e2cnt)
}
/*
- * PUBLIC: gint _SetListElemInt __P((Tcl_Interp *, Tcl_Obj *, gpointer , int));
+ * PUBLIC: int _SetListElemInt __P((Tcl_Interp *, Tcl_Obj *, void *, int));
*/
-gint
+int
_SetListElemInt(interp, list, elem1, elem2)
Tcl_Interp *interp;
Tcl_Obj *list;
- gpointer elem1;
- gint elem2;
+ void *elem1;
+ int elem2;
{
Tcl_Obj *myobjv[2], *thislist;
- gint myobjc;
+ int myobjc;
myobjc = 2;
- myobjv[0] = Tcl_NewByteArrayObj((u_char *)elem1, strlen((gchar *)elem1));
+ myobjv[0] = Tcl_NewByteArrayObj((u_char *)elem1, strlen((char *)elem1));
myobjv[1] = Tcl_NewIntObj(elem2);
thislist = Tcl_NewListObj(myobjc, myobjv);
if (thislist == NULL)
@@ -255,19 +255,19 @@ _SetListElemInt(interp, list, elem1, elem2)
}
/*
- * PUBLIC: gint _SetListRecnoElem __P((Tcl_Interp *, Tcl_Obj *,
+ * PUBLIC: int _SetListRecnoElem __P((Tcl_Interp *, Tcl_Obj *,
* PUBLIC: db_recno_t, u_char *, int));
*/
-gint
+int
_SetListRecnoElem(interp, list, elem1, elem2, e2size)
Tcl_Interp *interp;
Tcl_Obj *list;
db_recno_t elem1;
u_char *elem2;
- gint e2size;
+ int e2size;
{
Tcl_Obj *myobjv[2], *thislist;
- gint myobjc;
+ int myobjc;
myobjc = 2;
myobjv[0] = Tcl_NewLongObj((long)elem1);
@@ -292,15 +292,15 @@ _SetListRecnoElem(interp, list, elem1, elem2, e2size)
* to eliminate redundancy and bring them into the standard DB
* function namespace.
*
- * PUBLIC: gint _Set3DBTList __P((Tcl_Interp *, Tcl_Obj *, DBT *, int,
+ * PUBLIC: int _Set3DBTList __P((Tcl_Interp *, Tcl_Obj *, DBT *, int,
* PUBLIC: DBT *, int, DBT *));
*/
-gint
+int
_Set3DBTList(interp, list, elem1, is1recno, elem2, is2recno, elem3)
Tcl_Interp *interp;
Tcl_Obj *list;
DBT *elem1, *elem2, *elem3;
- gint is1recno, is2recno;
+ int is1recno, is2recno;
{
Tcl_Obj *myobjv[3], *thislist;
@@ -329,20 +329,20 @@ _Set3DBTList(interp, list, elem1, is1recno, elem2, is2recno, elem3)
/*
* _SetMultiList -- build a list for return from multiple get.
*
- * PUBLIC: gint _SetMultiList __P((Tcl_Interp *,
+ * PUBLIC: int _SetMultiList __P((Tcl_Interp *,
* PUBLIC: Tcl_Obj *, DBT *, DBT*, int, int));
*/
-gint
+int
_SetMultiList(interp, list, key, data, type, flag)
Tcl_Interp *interp;
Tcl_Obj *list;
DBT *key, *data;
- gint type, flag;
+ int type, flag;
{
db_recno_t recno;
u_int32_t dlen, klen;
- gint result;
- gpointer pointer, *dp, *kp;
+ int result;
+ void *pointer, *dp, *kp;
recno = 0;
dlen = 0;
@@ -381,15 +381,15 @@ _SetMultiList(interp, list, key, data, type, flag)
return (result);
}
/*
- * PUBLIC: gint _GetGlobPrefix __P((gchar *, gchar **));
+ * PUBLIC: int _GetGlobPrefix __P((char *, char **));
*/
-gint
+int
_GetGlobPrefix(pattern, prefix)
- gchar *pattern;
- gchar **prefix;
+ char *pattern;
+ char **prefix;
{
- gint i, j;
- gchar *p;
+ int i, j;
+ char *p;
/*
* Duplicate it, we get enough space and most of the work is done.
@@ -412,15 +412,15 @@ _GetGlobPrefix(pattern, prefix)
}
/*
- * PUBLIC: gint _ReturnSetup __P((Tcl_Interp *, int, int, gchar *));
+ * PUBLIC: int _ReturnSetup __P((Tcl_Interp *, int, int, char *));
*/
-gint
+int
_ReturnSetup(interp, ret, ok, errmsg)
Tcl_Interp *interp;
- gint ret, ok;
- gchar *errmsg;
+ int ret, ok;
+ char *errmsg;
{
- gchar *msg;
+ char *msg;
if (ret > 0)
return (_ErrorSetup(interp, ret, errmsg));
@@ -449,13 +449,13 @@ _ReturnSetup(interp, ret, ok, errmsg)
}
/*
- * PUBLIC: gint _ErrorSetup __P((Tcl_Interp *, int, gchar *));
+ * PUBLIC: int _ErrorSetup __P((Tcl_Interp *, int, char *));
*/
-gint
+int
_ErrorSetup(interp, ret, errmsg)
Tcl_Interp *interp;
- gint ret;
- gchar *errmsg;
+ int ret;
+ char *errmsg;
{
Tcl_SetErrno(ret);
Tcl_AppendResult(interp, errmsg, ":", Tcl_PosixError(interp), NULL);
@@ -463,17 +463,17 @@ _ErrorSetup(interp, ret, errmsg)
}
/*
- * PUBLIC: void _ErrorFunc __P((CONST gchar *, gchar *));
+ * PUBLIC: void _ErrorFunc __P((CONST char *, char *));
*/
void
_ErrorFunc(pfx, msg)
- CONST gchar *pfx;
- gchar *msg;
+ CONST char *pfx;
+ char *msg;
{
DBTCL_INFO *p;
Tcl_Interp *interp;
- gint size;
- gchar *err;
+ int size;
+ char *err;
p = _NameToInfo(pfx);
if (p == NULL)
@@ -500,17 +500,17 @@ _ErrorFunc(pfx, msg)
#define INVALID_LSNMSG "Invalid LSN with %d parts. Should have 2.\n"
/*
- * PUBLIC: gint _GetLsn __P((Tcl_Interp *, Tcl_Obj *, DB_LSN *));
+ * PUBLIC: int _GetLsn __P((Tcl_Interp *, Tcl_Obj *, DB_LSN *));
*/
-gint
+int
_GetLsn(interp, obj, lsn)
Tcl_Interp *interp;
Tcl_Obj *obj;
DB_LSN *lsn;
{
Tcl_Obj **myobjv;
- gchar msg[MSG_SIZE];
- gint myobjc, result;
+ char msg[MSG_SIZE];
+ int myobjc, result;
u_int32_t tmp;
result = Tcl_ListObjGetElements(interp, obj, &myobjc, &myobjv);
@@ -535,7 +535,7 @@ _GetLsn(interp, obj, lsn)
* _GetUInt32 --
* Get a u_int32_t from a Tcl object. Tcl_GetIntFromObj does the
* right thing most of the time, but on machines where a long is 8 bytes
- * and an gint is 4 bytes, it errors on integers between the maximum
+ * and an int is 4 bytes, it errors on integers between the maximum
* int32_t and the maximum u_int32_t. This is correct, but we generally
* want a u_int32_t in the end anyway, so we use Tcl_GetLongFromObj and do
* the bounds checking ourselves.
@@ -544,15 +544,15 @@ _GetLsn(interp, obj, lsn)
* bounds check. It's essentially Tcl_GetUnsignedIntFromObj, which
* unfortunately doesn't exist.
*
- * PUBLIC: gint _GetUInt32 __P((Tcl_Interp *, Tcl_Obj *, u_int32_t *));
+ * PUBLIC: int _GetUInt32 __P((Tcl_Interp *, Tcl_Obj *, u_int32_t *));
*/
-gint
+int
_GetUInt32(interp, obj, resp)
Tcl_Interp *interp;
Tcl_Obj *obj;
u_int32_t *resp;
{
- gint result;
+ int result;
long ltmp;
result = Tcl_GetLongFromObj(interp, obj, <mp);
@@ -582,12 +582,12 @@ static void
tcl_flag_callback(flags, fn, vtcbp)
u_int32_t flags;
const FN *fn;
- gpointer vtcbp;
+ void *vtcbp;
{
const FN *fnp;
Tcl_Interp *interp;
Tcl_Obj *newobj, *listobj;
- gint result;
+ int result;
struct __tcl_callback_bundle *tcbp;
tcbp = (struct __tcl_callback_bundle *)vtcbp;
@@ -617,15 +617,15 @@ tcl_flag_callback(flags, fn, vtcbp)
* that can extract the right names for the right flags.
*
* PUBLIC: Tcl_Obj *_GetFlagsList __P((Tcl_Interp *, u_int32_t,
- * PUBLIC: void (*)(u_int32_t, gpointer ,
- * PUBLIC: void (*)(u_int32_t, const FN *, gpointer ))));
+ * PUBLIC: void (*)(u_int32_t, void *,
+ * PUBLIC: void (*)(u_int32_t, const FN *, void *))));
*/
Tcl_Obj *
_GetFlagsList(interp, flags, func)
Tcl_Interp *interp;
u_int32_t flags;
void (*func)
- __P((u_int32_t, gpointer , void (*)(u_int32_t, const FN *, gpointer )));
+ __P((u_int32_t, void *, void (*)(u_int32_t, const FN *, void *)));
{
Tcl_Obj *newlist;
struct __tcl_callback_bundle tcb;
@@ -641,7 +641,7 @@ _GetFlagsList(interp, flags, func)
return (newlist);
}
-gint __debug_stop, __debug_on, __debug_print, __debug_test;
+int __debug_stop, __debug_on, __debug_print, __debug_test;
/*
* PUBLIC: void _debug_check __P((void));
@@ -674,19 +674,19 @@ _debug_check()
* memory.
*/
/*
- * PUBLIC: gint _CopyObjBytes __P((Tcl_Interp *, Tcl_Obj *obj, gpointer *,
- * PUBLIC: u_int32_t *, gint *));
+ * PUBLIC: int _CopyObjBytes __P((Tcl_Interp *, Tcl_Obj *obj, void **,
+ * PUBLIC: u_int32_t *, int *));
*/
-gint
+int
_CopyObjBytes(interp, obj, newp, sizep, freep)
Tcl_Interp *interp;
Tcl_Obj *obj;
- gpointer *newp;
+ void **newp;
u_int32_t *sizep;
- gint *freep;
+ int *freep;
{
- gpointer tmp, *new;
- gint i, len, ret;
+ void *tmp, *new;
+ int i, len, ret;
/*
* If the object is not an int, then just return the byte
diff --git a/libdb/tcl/tcl_lock.c b/libdb/tcl/tcl_lock.c
index a765376..c70abd5 100644
--- a/libdb/tcl/tcl_lock.c
+++ b/libdb/tcl/tcl_lock.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,14 +25,14 @@ static const gchar revid[] = "$Id$";
/*
* Prototypes for procedures defined later in this file:
*/
-static gint lock_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
+static int lock_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
static int _LockMode __P((Tcl_Interp *, Tcl_Obj *, db_lockmode_t *));
static int _GetThisLock __P((Tcl_Interp *, DB_ENV *, u_int32_t,
- u_int32_t, DBT *, db_lockmode_t, gchar *));
+ u_int32_t, DBT *, db_lockmode_t, char *));
static void _LockPutInfo __P((Tcl_Interp *, db_lockop_t, DB_LOCK *,
u_int32_t, DBT *));
#if CONFIG_TEST
-static gchar *lkmode[] = {
+static char *lkmode[] = {
"ng",
"read",
"write",
@@ -53,17 +53,17 @@ enum lkmode {
/*
* tcl_LockDetect --
*
- * PUBLIC: gint tcl_LockDetect __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_LockDetect __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_LockDetect(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
- static gchar *ldopts[] = {
+ static char *ldopts[] = {
"expire",
"default",
"maxlocks",
@@ -85,7 +85,7 @@ tcl_LockDetect(interp, objc, objv, envp)
LD_YOUNGEST
};
u_int32_t flag, policy;
- gint i, optindex, result, ret;
+ int i, optindex, result, ret;
result = TCL_OK;
flag = policy = 0;
@@ -140,17 +140,17 @@ tcl_LockDetect(interp, objc, objv, envp)
/*
* tcl_LockGet --
*
- * PUBLIC: gint tcl_LockGet __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_LockGet __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_LockGet(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
- static gchar *lgopts[] = {
+ static char *lgopts[] = {
"-nowait",
NULL
};
@@ -159,11 +159,11 @@ tcl_LockGet(interp, objc, objv, envp)
};
DBT obj;
Tcl_Obj *res;
- gpointer otmp;
+ void *otmp;
db_lockmode_t mode;
u_int32_t flag, lockid;
- gint freeobj, optindex, result, ret;
- gchar newname[MSG_SIZE];
+ int freeobj, optindex, result, ret;
+ char newname[MSG_SIZE];
result = TCL_OK;
freeobj = 0;
@@ -224,19 +224,19 @@ out:
/*
* tcl_LockStat --
*
- * PUBLIC: gint tcl_LockStat __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_LockStat __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_LockStat(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
DB_LOCK_STAT *sp;
Tcl_Obj *res;
- gint result, ret;
+ int result, ret;
result = TCL_OK;
/*
@@ -292,18 +292,18 @@ error:
/*
* tcl_LockTimeout --
*
- * PUBLIC: gint tcl_LockTimeout __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_LockTimeout __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_LockTimeout(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
long timeout;
- gint result, ret;
+ int result, ret;
/*
* One arg, the timeout.
@@ -329,10 +329,10 @@ static int
lock_Cmd(clientData, interp, objc, objv)
ClientData clientData; /* Lock handle */
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *lkcmds[] = {
+ static char *lkcmds[] = {
"put",
NULL
};
@@ -342,11 +342,11 @@ lock_Cmd(clientData, interp, objc, objv)
DB_ENV *env;
DB_LOCK *lock;
DBTCL_INFO *lkip;
- gint cmdindex, result, ret;
+ int cmdindex, result, ret;
Tcl_ResetResult(interp);
lock = (DB_LOCK *)clientData;
- lkip = _PtrToInfo((gpointer)lock);
+ lkip = _PtrToInfo((void *)lock);
result = TCL_OK;
if (lock == NULL) {
@@ -391,23 +391,23 @@ lock_Cmd(clientData, interp, objc, objv)
/*
* tcl_LockVec --
*
- * PUBLIC: gint tcl_LockVec __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+ * PUBLIC: int tcl_LockVec __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_LockVec(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* environment pointer */
{
- static gchar *lvopts[] = {
+ static char *lvopts[] = {
"-nowait",
NULL
};
enum lvopts {
LVNOWAIT
};
- static gchar *lkops[] = {
+ static char *lkops[] = {
"get",
"put",
"put_all",
@@ -426,10 +426,10 @@ tcl_LockVec(interp, objc, objv, envp)
DB_LOCKREQ list;
DBT obj;
Tcl_Obj **myobjv, *res, *thisop;
- gpointer otmp;
+ void *otmp;
u_int32_t flag, lockid;
- gint freeobj, i, myobjc, optindex, result, ret;
- gchar *lockname, msg[MSG_SIZE], newname[MSG_SIZE];
+ int freeobj, i, myobjc, optindex, result, ret;
+ char *lockname, msg[MSG_SIZE], newname[MSG_SIZE];
result = TCL_OK;
memset(newname, 0, MSG_SIZE);
@@ -615,7 +615,7 @@ _LockMode(interp, obj, mode)
Tcl_Obj *obj;
db_lockmode_t *mode;
{
- gint optindex;
+ int optindex;
if (Tcl_GetIndexFromObj(interp, obj, lkmode, "option",
TCL_EXACT, &optindex) != TCL_OK)
@@ -652,7 +652,7 @@ _LockPutInfo(interp, op, lock, lockid, objp)
DBT *objp;
{
DBTCL_INFO *p, *nextp;
- gint found;
+ int found;
for (p = LIST_FIRST(&__db_infohead); p != NULL; p = nextp) {
found = 0;
@@ -678,14 +678,14 @@ _GetThisLock(interp, envp, lockid, flag, objp, mode, newname)
u_int32_t flag; /* Lock flag */
DBT *objp; /* Object to lock */
db_lockmode_t mode; /* Lock mode */
- gchar *newname; /* New command name */
+ char *newname; /* New command name */
{
DB_LOCK *lock;
DBTCL_INFO *envip, *ip;
- gint result, ret;
+ int result, ret;
result = TCL_OK;
- envip = _PtrToInfo((gpointer)envp);
+ envip = _PtrToInfo((void *)envp);
if (envip == NULL) {
Tcl_SetResult(interp, "Could not find env info\n", TCL_STATIC);
return (TCL_ERROR);
diff --git a/libdb/tcl/tcl_log.c b/libdb/tcl/tcl_log.c
index 09d1718..cdc56cf 100644
--- a/libdb/tcl/tcl_log.c
+++ b/libdb/tcl/tcl_log.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,22 +25,22 @@ static const gchar revid[] = "$Id$";
#include "dbinc/txn.h"
#ifdef CONFIG_TEST
-static gint tcl_LogcGet __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_LOGC *));
+static int tcl_LogcGet __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_LOGC *));
/*
* tcl_LogArchive --
*
- * PUBLIC: gint tcl_LogArchive __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_LogArchive __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_LogArchive(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
- static gchar *archopts[] = {
+ static char *archopts[] = {
"-arch_abs", "-arch_data", "-arch_log",
NULL
};
@@ -49,8 +49,8 @@ tcl_LogArchive(interp, objc, objv, envp)
};
Tcl_Obj *fileobj, *res;
u_int32_t flag;
- gint i, optindex, result, ret;
- gchar **file, **list;
+ int i, optindex, result, ret;
+ char **file, **list;
result = TCL_OK;
flag = 0;
@@ -98,18 +98,18 @@ tcl_LogArchive(interp, objc, objv, envp)
/*
* tcl_LogCompare --
*
- * PUBLIC: gint tcl_LogCompare __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_LogCompare __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*));
*/
-gint
+int
tcl_LogCompare(interp, objc, objv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
DB_LSN lsn0, lsn1;
Tcl_Obj *res;
- gint result, ret;
+ int result, ret;
result = TCL_OK;
/*
@@ -137,21 +137,21 @@ tcl_LogCompare(interp, objc, objv)
/*
* tcl_LogFile --
*
- * PUBLIC: gint tcl_LogFile __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_LogFile __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_LogFile(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
DB_LSN lsn;
Tcl_Obj *res;
size_t len;
- gint result, ret;
- gchar *name;
+ int result, ret;
+ char *name;
result = TCL_OK;
/*
@@ -196,18 +196,18 @@ tcl_LogFile(interp, objc, objv, envp)
/*
* tcl_LogFlush --
*
- * PUBLIC: gint tcl_LogFlush __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_LogFlush __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_LogFlush(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
DB_LSN lsn, *lsnp;
- gint result, ret;
+ int result, ret;
result = TCL_OK;
/*
@@ -235,13 +235,13 @@ tcl_LogFlush(interp, objc, objv, envp)
/*
* tcl_LogGet --
*
- * PUBLIC: gint tcl_LogGet __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_LogGet __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_LogGet(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
@@ -257,17 +257,17 @@ tcl_LogGet(interp, objc, objv, envp)
/*
* tcl_LogPut --
*
- * PUBLIC: gint tcl_LogPut __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_LogPut __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_LogPut(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
- static gchar *logputopts[] = {
+ static char *logputopts[] = {
"-flush",
NULL
};
@@ -277,9 +277,9 @@ tcl_LogPut(interp, objc, objv, envp)
DB_LSN lsn;
DBT data;
Tcl_Obj *intobj, *res;
- gpointer dtmp;
+ void *dtmp;
u_int32_t flag;
- gint freedata, optindex, result, ret;
+ int freedata, optindex, result, ret;
result = TCL_OK;
flag = 0;
@@ -339,19 +339,19 @@ tcl_LogPut(interp, objc, objv, envp)
/*
* tcl_LogStat --
*
- * PUBLIC: gint tcl_LogStat __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_LogStat __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_LogStat(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
DB_LOG_STAT *sp;
Tcl_Obj *res;
- gint result, ret;
+ int result, ret;
result = TCL_OK;
/*
@@ -408,16 +408,16 @@ error:
* logc_Cmd --
* Implements the log cursor command.
*
- * PUBLIC: gint logc_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
+ * PUBLIC: int logc_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
*/
-gint
+int
logc_Cmd(clientData, interp, objc, objv)
ClientData clientData; /* Cursor handle */
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *logccmds[] = {
+ static char *logccmds[] = {
"close",
"get",
NULL
@@ -428,11 +428,11 @@ logc_Cmd(clientData, interp, objc, objv)
};
DB_LOGC *logc;
DBTCL_INFO *logcip;
- gint cmdindex, result, ret;
+ int cmdindex, result, ret;
Tcl_ResetResult(interp);
logc = (DB_LOGC *)clientData;
- logcip = _PtrToInfo((gpointer)logc);
+ logcip = _PtrToInfo((void *)logc);
result = TCL_OK;
if (objc <= 1) {
@@ -483,11 +483,11 @@ logc_Cmd(clientData, interp, objc, objv)
static int
tcl_LogcGet(interp, objc, objv, logc)
Tcl_Interp *interp;
- gint objc;
+ int objc;
Tcl_Obj * CONST *objv;
DB_LOGC *logc;
{
- static gchar *logcgetopts[] = {
+ static char *logcgetopts[] = {
"-current",
"-first",
"-last",
@@ -508,7 +508,7 @@ tcl_LogcGet(interp, objc, objv, logc)
DBT data;
Tcl_Obj *dataobj, *lsnlist, *myobjv[2], *res;
u_int32_t flag;
- gint i, myobjc, optindex, result, ret;
+ int i, myobjc, optindex, result, ret;
result = TCL_OK;
res = NULL;
diff --git a/libdb/tcl/tcl_mp.c b/libdb/tcl/tcl_mp.c
index 19ae8aa..c734670 100644
--- a/libdb/tcl/tcl_mp.c
+++ b/libdb/tcl/tcl_mp.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -25,16 +25,16 @@ static const gchar revid[] = "$Id$";
/*
* Prototypes for procedures defined later in this file:
*/
-static gint mp_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
-static gint pg_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
-static gint tcl_MpGet __P((Tcl_Interp *, int, Tcl_Obj * CONST*,
+static int mp_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
+static int pg_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
+static int tcl_MpGet __P((Tcl_Interp *, int, Tcl_Obj * CONST*,
DB_MPOOLFILE *, DBTCL_INFO *));
-static gint tcl_Pg __P((Tcl_Interp *, int, Tcl_Obj * CONST*,
- gpointer , DB_MPOOLFILE *, DBTCL_INFO *, int));
-static gint tcl_PgInit __P((Tcl_Interp *, int, Tcl_Obj * CONST*,
- gpointer , DBTCL_INFO *));
-static gint tcl_PgIsset __P((Tcl_Interp *, int, Tcl_Obj * CONST*,
- gpointer , DBTCL_INFO *));
+static int tcl_Pg __P((Tcl_Interp *, int, Tcl_Obj * CONST*,
+ void *, DB_MPOOLFILE *, DBTCL_INFO *, int));
+static int tcl_PgInit __P((Tcl_Interp *, int, Tcl_Obj * CONST*,
+ void *, DBTCL_INFO *));
+static int tcl_PgIsset __P((Tcl_Interp *, int, Tcl_Obj * CONST*,
+ void *, DBTCL_INFO *));
/*
* _MpInfoDelete --
@@ -67,18 +67,18 @@ _MpInfoDelete(interp, mpip)
/*
* tcl_MpSync --
*
- * PUBLIC: gint tcl_MpSync __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+ * PUBLIC: int tcl_MpSync __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_MpSync(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
DB_LSN lsn, *lsnp;
- gint result, ret;
+ int result, ret;
result = TCL_OK;
lsnp = NULL;
@@ -105,21 +105,21 @@ tcl_MpSync(interp, objc, objv, envp)
/*
* tcl_MpTrickle --
*
- * PUBLIC: gint tcl_MpTrickle __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_MpTrickle __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_MpTrickle(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
- gint pages;
- gint percent;
- gint result;
- gint ret;
+ int pages;
+ int percent;
+ int result;
+ int ret;
Tcl_Obj *res;
result = TCL_OK;
@@ -150,18 +150,18 @@ tcl_MpTrickle(interp, objc, objv, envp)
/*
* tcl_Mp --
*
- * PUBLIC: gint tcl_Mp __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_Mp __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
*/
-gint
+int
tcl_Mp(interp, objc, objv, envp, envip)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
DBTCL_INFO *envip; /* Info pointer */
{
- static gchar *mpopts[] = {
+ static char *mpopts[] = {
"-create",
"-mode",
"-nommap",
@@ -180,8 +180,8 @@ tcl_Mp(interp, objc, objv, envp, envip)
DB_MPOOLFILE *mpf;
Tcl_Obj *res;
u_int32_t flag;
- gint i, pgsize, mode, optindex, result, ret;
- gchar *file, newname[MSG_SIZE];
+ int i, pgsize, mode, optindex, result, ret;
+ char *file, newname[MSG_SIZE];
result = TCL_OK;
i = 2;
@@ -308,19 +308,19 @@ error:
/*
* tcl_MpStat --
*
- * PUBLIC: gint tcl_MpStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
+ * PUBLIC: int tcl_MpStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_MpStat(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
DB_MPOOL_STAT *sp;
DB_MPOOL_FSTAT **fsp, **savefsp;
- gint result;
- gint ret;
+ int result;
+ int ret;
Tcl_Obj *res;
Tcl_Obj *res1;
@@ -427,10 +427,10 @@ static int
mp_Cmd(clientData, interp, objc, objv)
ClientData clientData; /* Mp handle */
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *mpcmds[] = {
+ static char *mpcmds[] = {
"close",
"fsync",
"get",
@@ -442,10 +442,10 @@ mp_Cmd(clientData, interp, objc, objv)
MPGET
};
DB_MPOOLFILE *mp;
- gint cmdindex, length, result, ret;
+ int cmdindex, length, result, ret;
DBTCL_INFO *mpip;
Tcl_Obj *res;
- gchar *obj_name;
+ char *obj_name;
Tcl_ResetResult(interp);
mp = (DB_MPOOLFILE *)clientData;
@@ -513,12 +513,12 @@ mp_Cmd(clientData, interp, objc, objv)
static int
tcl_MpGet(interp, objc, objv, mp, mpip)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_MPOOLFILE *mp; /* mp pointer */
DBTCL_INFO *mpip; /* mp info pointer */
{
- static gchar *mpget[] = {
+ static char *mpget[] = {
"-create",
"-last",
"-new",
@@ -534,9 +534,9 @@ tcl_MpGet(interp, objc, objv, mp, mpip)
Tcl_Obj *res;
db_pgno_t pgno;
u_int32_t flag;
- gint i, ipgno, optindex, result, ret;
- gchar newname[MSG_SIZE];
- gpointer page;
+ int i, ipgno, optindex, result, ret;
+ char newname[MSG_SIZE];
+ void *page;
result = TCL_OK;
memset(newname, 0, MSG_SIZE);
@@ -626,10 +626,10 @@ static int
pg_Cmd(clientData, interp, objc, objv)
ClientData clientData; /* Page handle */
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *pgcmds[] = {
+ static char *pgcmds[] = {
"init",
"is_setto",
"pgnum",
@@ -647,14 +647,14 @@ pg_Cmd(clientData, interp, objc, objv)
PGSET
};
DB_MPOOLFILE *mp;
- gint cmdindex, length, result;
- gchar *obj_name;
- gpointer page;
+ int cmdindex, length, result;
+ char *obj_name;
+ void *page;
DBTCL_INFO *pgip;
Tcl_Obj *res;
Tcl_ResetResult(interp);
- page = (gpointer)clientData;
+ page = (void *)clientData;
obj_name = Tcl_GetStringFromObj(objv[0], &length);
pgip = _NameToInfo(obj_name);
mp = NAME_TO_MP(pgip->i_parent->i_name);
@@ -713,14 +713,14 @@ pg_Cmd(clientData, interp, objc, objv)
static int
tcl_Pg(interp, objc, objv, page, mp, pgip, putop)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
- gpointer page; /* Page pointer */
+ void *page; /* Page pointer */
DB_MPOOLFILE *mp; /* Mpool pointer */
DBTCL_INFO *pgip; /* Info pointer */
- gint putop; /* Operation */
+ int putop; /* Operation */
{
- static gchar *pgopt[] = {
+ static char *pgopt[] = {
"-clean",
"-dirty",
"-discard",
@@ -732,7 +732,7 @@ tcl_Pg(interp, objc, objv, page, mp, pgip, putop)
PGDISCARD
};
u_int32_t flag;
- gint i, optindex, result, ret;
+ int i, optindex, result, ret;
result = TCL_OK;
i = 2;
@@ -773,15 +773,15 @@ tcl_Pg(interp, objc, objv, page, mp, pgip, putop)
static int
tcl_PgInit(interp, objc, objv, page, pgip)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
- gpointer page; /* Page pointer */
+ void *page; /* Page pointer */
DBTCL_INFO *pgip; /* Info pointer */
{
Tcl_Obj *res;
size_t pgsz;
long *p, *endp, newval;
- gint length, result;
+ int length, result;
u_char *s;
result = TCL_OK;
@@ -812,15 +812,15 @@ tcl_PgInit(interp, objc, objv, page, pgip)
static int
tcl_PgIsset(interp, objc, objv, page, pgip)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
- gpointer page; /* Page pointer */
+ void *page; /* Page pointer */
DBTCL_INFO *pgip; /* Info pointer */
{
Tcl_Obj *res;
size_t pgsz;
long *p, *endp, newval;
- gint length, result;
+ int length, result;
u_char *s;
result = TCL_OK;
diff --git a/libdb/tcl/tcl_rep.c b/libdb/tcl/tcl_rep.c
index 048cd7c..f5d3e5e 100644
--- a/libdb/tcl/tcl_rep.c
+++ b/libdb/tcl/tcl_rep.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -27,17 +27,17 @@ static const gchar revid[] = "$Id$";
* tcl_RepElect --
* Call DB_ENV->rep_elect().
*
- * PUBLIC: gint tcl_RepElect
+ * PUBLIC: int tcl_RepElect
* PUBLIC: __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
*/
-gint
+int
tcl_RepElect(interp, objc, objv, dbenv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *dbenv; /* Environment pointer */
{
- gint eid, nsites, pri, result, ret;
+ int eid, nsites, pri, result, ret;
u_int32_t timeout;
if (objc != 5) {
@@ -68,17 +68,17 @@ tcl_RepElect(interp, objc, objv, dbenv)
* tcl_RepFlush --
* Call DB_ENV->rep_flush().
*
- * PUBLIC: gint tcl_RepFlush
+ * PUBLIC: int tcl_RepFlush
* PUBLIC: __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
*/
-gint
+int
tcl_RepFlush(interp, objc, objv, dbenv)
Tcl_Interp *interp;
- gint objc;
+ int objc;
Tcl_Obj *CONST objv[];
DB_ENV *dbenv;
{
- gint ret;
+ int ret;
if (objc != 2) {
Tcl_WrongNumArgs(interp, 2, objv, "");
@@ -95,17 +95,17 @@ tcl_RepFlush(interp, objc, objv, dbenv)
* tcl_RepLimit --
* Call DB_ENV->set_rep_limit().
*
- * PUBLIC: gint tcl_RepLimit
+ * PUBLIC: int tcl_RepLimit
* PUBLIC: __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
*/
-gint
+int
tcl_RepLimit(interp, objc, objv, dbenv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *dbenv; /* Environment pointer */
{
- gint result, ret;
+ int result, ret;
u_int32_t bytes, gbytes;
if (objc != 4) {
@@ -133,17 +133,17 @@ tcl_RepLimit(interp, objc, objv, dbenv)
* tcl_RepRequest --
* Call DB_ENV->set_rep_request().
*
- * PUBLIC: gint tcl_RepRequest
+ * PUBLIC: int tcl_RepRequest
* PUBLIC: __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
*/
-gint
+int
tcl_RepRequest(interp, objc, objv, dbenv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *dbenv; /* Environment pointer */
{
- gint result, ret;
+ int result, ret;
u_int32_t min, max;
if (objc != 4) {
@@ -171,21 +171,21 @@ tcl_RepRequest(interp, objc, objv, dbenv)
* tcl_RepStart --
* Call DB_ENV->rep_start().
*
- * PUBLIC: gint tcl_RepStart
+ * PUBLIC: int tcl_RepStart
* PUBLIC: __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
*
* Note that this normally can/should be achieved as an argument to
* berkdb env, but we need to test forcible upgrading of clients, which
* involves calling this on an open environment handle.
*/
-gint
+int
tcl_RepStart(interp, objc, objv, dbenv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *dbenv;
{
- static gchar *tclrpstrt[] = {
+ static char *tclrpstrt[] = {
"-client",
"-master",
NULL
@@ -194,8 +194,8 @@ tcl_RepStart(interp, objc, objv, dbenv)
TCL_RPSTRT_CLIENT,
TCL_RPSTRT_MASTER
};
- gchar *arg;
- gint i, optindex, ret;
+ char *arg;
+ int i, optindex, ret;
u_int32_t flag;
flag = 0;
@@ -238,21 +238,21 @@ tcl_RepStart(interp, objc, objv, dbenv)
* tcl_RepProcessMessage --
* Call DB_ENV->rep_process_message().
*
- * PUBLIC: gint tcl_RepProcessMessage
+ * PUBLIC: int tcl_RepProcessMessage
* PUBLIC: __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
*/
-gint
+int
tcl_RepProcessMessage(interp, objc, objv, dbenv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *dbenv; /* Environment pointer */
{
DBT control, rec;
Tcl_Obj *res;
- gpointer ctmp, *rtmp;
- gint eid;
- gint freectl, freerec, result, ret;
+ void *ctmp, *rtmp;
+ int eid;
+ int freectl, freerec, result, ret;
if (objc != 5) {
Tcl_WrongNumArgs(interp, 5, objv, "id control rec");
@@ -313,21 +313,21 @@ out:
* tcl_RepStat --
* Call DB_ENV->rep_stat().
*
- * PUBLIC: gint tcl_RepStat
+ * PUBLIC: int tcl_RepStat
* PUBLIC: __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
*/
-gint
+int
tcl_RepStat(interp, objc, objv, dbenv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *dbenv;
{
DB_REP_STAT *sp;
Tcl_Obj *myobjv[2], *res, *thislist, *lsnlist;
u_int32_t flag;
- gint myobjc, result, ret;
- gchar *arg;
+ int myobjc, result, ret;
+ char *arg;
result = TCL_OK;
flag = 0;
diff --git a/libdb/tcl/tcl_txn.c b/libdb/tcl/tcl_txn.c
index b61ca98..1526cb1 100644
--- a/libdb/tcl/tcl_txn.c
+++ b/libdb/tcl/tcl_txn.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -22,9 +22,9 @@ static const gchar revid[] = "$Id$";
#include "db_int.h"
#include "dbinc/tcl_db.h"
-static gint tcl_TxnCommit __P((Tcl_Interp *,
+static int tcl_TxnCommit __P((Tcl_Interp *,
int, Tcl_Obj * CONST *, DB_TXN *, DBTCL_INFO *));
-static gint txn_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST *));
+static int txn_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST *));
/*
* _TxnInfoDelete --
@@ -59,24 +59,24 @@ _TxnInfoDelete(interp, txnip)
/*
* tcl_TxnCheckpoint --
*
- * PUBLIC: gint tcl_TxnCheckpoint __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_TxnCheckpoint __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_TxnCheckpoint(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
- static gchar *txnckpopts[] = {
+ static char *txnckpopts[] = {
"-kbyte", "-min",
NULL
};
enum txnckpopts {
TXNCKP_KB, TXNCKP_MIN
};
- gint i, kb, min, optindex, result, ret;
+ int i, kb, min, optindex, result, ret;
result = TCL_OK;
kb = min = 0;
@@ -122,18 +122,18 @@ tcl_TxnCheckpoint(interp, objc, objv, envp)
/*
* tcl_Txn --
*
- * PUBLIC: gint tcl_Txn __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_Txn __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
*/
-gint
+int
tcl_Txn(interp, objc, objv, envp, envip)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
DBTCL_INFO *envip; /* Info pointer */
{
- static gchar *txnopts[] = {
+ static char *txnopts[] = {
#if CONFIG_TEST
"-dirty",
"-lock_timeout",
@@ -162,8 +162,8 @@ tcl_Txn(interp, objc, objv, envp, envip)
Tcl_Obj *res;
db_timeout_t lk_time, tx_time;
u_int32_t flag, lk_timeflag, tx_timeflag;
- gint i, optindex, result, ret;
- gchar *arg, msg[MSG_SIZE], newname[MSG_SIZE];
+ int i, optindex, result, ret;
+ char *arg, msg[MSG_SIZE], newname[MSG_SIZE];
result = TCL_OK;
memset(newname, 0, MSG_SIZE);
@@ -286,13 +286,13 @@ getit:
/*
* tcl_TxnStat --
*
- * PUBLIC: gint tcl_TxnStat __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_TxnStat __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_TxnStat(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
@@ -301,7 +301,7 @@ tcl_TxnStat(interp, objc, objv, envp)
DB_TXN_STAT *sp;
Tcl_Obj *myobjv[2], *res, *thislist, *lsnlist;
u_int32_t i;
- gint myobjc, result, ret;
+ int myobjc, result, ret;
result = TCL_OK;
/*
@@ -364,18 +364,18 @@ error:
/*
* tcl_TxnTimeout --
*
- * PUBLIC: gint tcl_TxnTimeout __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_TxnTimeout __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *));
*/
-gint
+int
tcl_TxnTimeout(interp, objc, objv, envp)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
{
long timeout;
- gint result, ret;
+ int result, ret;
/*
* One arg, the timeout.
@@ -402,10 +402,10 @@ static int
txn_Cmd(clientData, interp, objc, objv)
ClientData clientData; /* Txn handle */
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *txncmds[] = {
+ static char *txncmds[] = {
#if CONFIG_TEST
"discard",
"id",
@@ -427,12 +427,12 @@ txn_Cmd(clientData, interp, objc, objv)
DBTCL_INFO *txnip;
DB_TXN *txnp;
Tcl_Obj *res;
- gint cmdindex, result, ret;
+ int cmdindex, result, ret;
u_int8_t *gid;
Tcl_ResetResult(interp);
txnp = (DB_TXN *)clientData;
- txnip = _PtrToInfo((gpointer)txnp);
+ txnip = _PtrToInfo((void *)txnp);
result = TCL_OK;
if (txnp == NULL) {
Tcl_SetResult(interp, "NULL txn pointer", TCL_STATIC);
@@ -528,12 +528,12 @@ txn_Cmd(clientData, interp, objc, objv)
static int
tcl_TxnCommit(interp, objc, objv, txnp, txnip)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_TXN *txnp; /* Transaction pointer */
DBTCL_INFO *txnip; /* Info pointer */
{
- static gchar *commitopt[] = {
+ static char *commitopt[] = {
"-nosync",
"-sync",
NULL
@@ -543,7 +543,7 @@ tcl_TxnCommit(interp, objc, objv, txnp, txnip)
COMNOSYNC
};
u_int32_t flag;
- gint optindex, result, ret;
+ int optindex, result, ret;
COMPQUIET(txnip, NULL);
@@ -580,13 +580,13 @@ tcl_TxnCommit(interp, objc, objv, txnp, txnip)
/*
* tcl_TxnRecover --
*
- * PUBLIC: gint tcl_TxnRecover __P((Tcl_Interp *, int,
+ * PUBLIC: int tcl_TxnRecover __P((Tcl_Interp *, int,
* PUBLIC: Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
*/
-gint
+int
tcl_TxnRecover(interp, objc, objv, envp, envip)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
DBTCL_INFO *envip; /* Info pointer */
@@ -617,8 +617,8 @@ for (i = 0; i < count; i++) { \
DB_PREPLIST prep[DBTCL_PREP], *p;
Tcl_Obj *res;
long count, i;
- gint result, ret;
- gchar newname[MSG_SIZE];
+ int result, ret;
+ char newname[MSG_SIZE];
result = TCL_OK;
/*
diff --git a/libdb/tcl/tcl_util.c b/libdb/tcl/tcl_util.c
index 7888b6e..943beab 100644
--- a/libdb/tcl/tcl_util.c
+++ b/libdb/tcl/tcl_util.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -26,21 +26,21 @@ static const gchar revid[] = "$Id$";
/*
* Prototypes for procedures defined later in this file:
*/
-static gint mutex_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
+static int mutex_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
/*
* bdb_RandCommand --
* Implements rand* functions.
*
- * PUBLIC: gint bdb_RandCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
+ * PUBLIC: int bdb_RandCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
*/
-gint
+int
bdb_RandCommand(interp, objc, objv)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *rcmds[] = {
+ static char *rcmds[] = {
"rand", "random_int", "srand",
NULL
};
@@ -48,9 +48,9 @@ bdb_RandCommand(interp, objc, objv)
RRAND, RRAND_INT, RSRAND
};
long t;
- gint cmdindex, hi, lo, result, ret;
+ int cmdindex, hi, lo, result, ret;
Tcl_Obj *res;
- gchar msg[MSG_SIZE];
+ char msg[MSG_SIZE];
result = TCL_OK;
/*
@@ -136,13 +136,13 @@ bdb_RandCommand(interp, objc, objv)
* tcl_Mutex --
* Opens an env mutex.
*
- * PUBLIC: gint tcl_Mutex __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *,
+ * PUBLIC: int tcl_Mutex __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *,
* PUBLIC: DBTCL_INFO *));
*/
-gint
+int
tcl_Mutex(interp, objc, objv, envp, envip)
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
DB_ENV *envp; /* Environment pointer */
DBTCL_INFO *envip; /* Info pointer */
@@ -150,8 +150,8 @@ tcl_Mutex(interp, objc, objv, envp, envip)
DBTCL_INFO *ip;
Tcl_Obj *res;
_MUTEX_DATA *md;
- gint i, mode, nitems, result, ret;
- gchar newname[MSG_SIZE];
+ int i, mode, nitems, result, ret;
+ char newname[MSG_SIZE];
md = NULL;
result = TCL_OK;
@@ -250,10 +250,10 @@ static int
mutex_Cmd(clientData, interp, objc, objv)
ClientData clientData; /* Mutex handle */
Tcl_Interp *interp; /* Interpreter */
- gint objc; /* How many arguments? */
+ int objc; /* How many arguments? */
Tcl_Obj *CONST objv[]; /* The argument objects */
{
- static gchar *mxcmds[] = {
+ static char *mxcmds[] = {
"close",
"get",
"getval",
@@ -272,11 +272,11 @@ mutex_Cmd(clientData, interp, objc, objv)
DBTCL_INFO *envip, *mpip;
_MUTEX_DATA *mp;
Tcl_Obj *res;
- gint cmdindex, id, result, newval;
+ int cmdindex, id, result, newval;
Tcl_ResetResult(interp);
mp = (_MUTEX_DATA *)clientData;
- mpip = _PtrToInfo((gpointer)mp);
+ mpip = _PtrToInfo((void *)mp);
envip = mpip->i_parent;
dbenv = envip->i_envp;
result = TCL_OK;
diff --git a/libdb/test/scr017/t.c b/libdb/test/scr017/t.c
index 7181d5c..f03b338 100644
--- a/libdb/test/scr017/t.c
+++ b/libdb/test/scr017/t.c
@@ -8,11 +8,11 @@
#include "db_185.h"
-void err(gchar *);
+void err(char *);
int mycmp(const DBT *, const DBT *);
void ops(DB *, int);
-gint
+int
main()
{
DB *dbp;
@@ -61,7 +61,7 @@ main()
return (0);
}
-gint
+int
mycmp(a, b)
const DBT *a, *b;
{
@@ -78,13 +78,13 @@ mycmp(a, b)
void
ops(dbp, type)
DB *dbp;
- gint type;
+ int type;
{
FILE *outfp;
DBT key, data;
recno_t recno;
- gint i, ret;
- gchar buf[64];
+ int i, ret;
+ char buf[64];
memset(&key, 0, sizeof(key));
memset(&data, 0, sizeof(data));
@@ -149,11 +149,11 @@ ops(dbp, type)
err("fopen: output");
while ((ret = dbp->seq(dbp, &key, &data, R_NEXT)) == 0) {
if (type == DB_RECNO)
- fprintf(outfp, "%d\n", *(gint *)key.data);
+ fprintf(outfp, "%d\n", *(int *)key.data);
else
fprintf(outfp,
- "%.*s\n", (int)key.size, (gchar *)key.data);
- fprintf(outfp, "%.*s\n", (int)data.size, (gchar *)data.data);
+ "%.*s\n", (int)key.size, (char *)key.data);
+ fprintf(outfp, "%.*s\n", (int)data.size, (char *)data.data);
}
if (ret != 1)
err("DB->seq");
@@ -181,7 +181,7 @@ ops(dbp, type)
void
err(s)
- gchar *s;
+ char *s;
{
fprintf(stderr, "\t%s: %s\n", s, strerror(errno));
exit (1);
diff --git a/libdb/test/scr018/t.c b/libdb/test/scr018/t.c
index 209e7ab..4056a60 100644
--- a/libdb/test/scr018/t.c
+++ b/libdb/test/scr018/t.c
@@ -5,11 +5,11 @@
#include <stdio.h>
#include <strings.h>
-gint
+int
chk(f)
- gchar *f;
+ char *f;
{
- gint ch, l, r;
+ int ch, l, r;
if (freopen(f, "r", stdin) == NULL) {
fprintf(stderr, "%s: %s\n", f, strerror(errno));
@@ -34,10 +34,10 @@ next: if (ch == '\n')
return (r);
}
-gint
-main(gint argc, gchar *argv[])
+int
+main(int argc, char *argv[])
{
- gint r;
+ int r;
for (r = 0; *++argv != NULL;)
if (chk(*argv))
diff --git a/libdb/txn/txn.c b/libdb/txn/txn.c
index 452e6e9..2e54d83 100644
--- a/libdb/txn/txn.c
+++ b/libdb/txn/txn.c
@@ -39,7 +39,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -96,11 +96,11 @@ typedef enum {
TXN_OP_PREPARE
} txnop_t;
-static gint __txn_begin_int __P((DB_TXN *, int));
-static gint __txn_end __P((DB_TXN *, int));
-static gint __txn_isvalid __P((const DB_TXN *, TXN_DETAIL **, txnop_t));
-static gint __txn_set_timeout __P(( DB_TXN *, db_timeout_t, u_int32_t));
-static gint __txn_undo __P((DB_TXN *));
+static int __txn_begin_int __P((DB_TXN *, int));
+static int __txn_end __P((DB_TXN *, int));
+static int __txn_isvalid __P((const DB_TXN *, TXN_DETAIL **, txnop_t));
+static int __txn_set_timeout __P(( DB_TXN *, db_timeout_t, u_int32_t));
+static int __txn_undo __P((DB_TXN *));
#ifndef db_create
/*
@@ -123,18 +123,18 @@ static gint __txn_undo __P((DB_TXN *));
* not generate them for these three functions, and don't include the three
* functions in libraries built with that configuration option.
*
- * EXTERN: gint txn_abort __P((DB_TXN *));
- * EXTERN: gint txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
- * EXTERN: gint txn_commit __P((DB_TXN *, u_int32_t));
+ * EXTERN: int txn_abort __P((DB_TXN *));
+ * EXTERN: int txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
+ * EXTERN: int txn_commit __P((DB_TXN *, u_int32_t));
*/
-gint
+int
txn_abort(txnp)
DB_TXN *txnp;
{
return (txnp->abort(txnp));
}
-gint
+int
txn_begin(dbenv, parent, txnpp, flags)
DB_ENV *dbenv;
DB_TXN *parent, **txnpp;
@@ -143,7 +143,7 @@ txn_begin(dbenv, parent, txnpp, flags)
return (dbenv->txn_begin(dbenv, parent, txnpp, flags));
}
-gint
+int
txn_commit(txnp, flags)
DB_TXN *txnp;
u_int32_t flags;
@@ -163,9 +163,9 @@ txn_commit(txnp, flags)
* provides access to the transaction ID and the offset in the transaction
* region of the TXN_DETAIL structure.
*
- * PUBLIC: gint __txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
+ * PUBLIC: int __txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
*/
-gint
+int
__txn_begin(dbenv, parent, txnpp, flags)
DB_ENV *dbenv;
DB_TXN *parent, **txnpp;
@@ -173,7 +173,7 @@ __txn_begin(dbenv, parent, txnpp, flags)
{
DB_LOCKREGION *region;
DB_TXN *txn;
- gint ret;
+ int ret;
*txnpp = NULL;
PANIC_CHECK(dbenv);
@@ -247,9 +247,9 @@ err:
* __txn_xa_begin --
* XA version of txn_begin.
*
- * PUBLIC: gint __txn_xa_begin __P((DB_ENV *, DB_TXN *));
+ * PUBLIC: int __txn_xa_begin __P((DB_ENV *, DB_TXN *));
*/
-gint
+int
__txn_xa_begin(dbenv, txn)
DB_ENV *dbenv;
DB_TXN *txn;
@@ -271,15 +271,15 @@ __txn_xa_begin(dbenv, txn)
* that is used only for transactions that must be started to compensate
* for actions during an abort. Currently only used for allocations.
*
- * PUBLIC: gint __txn_compensate_begin __P((DB_ENV *, DB_TXN **txnp));
+ * PUBLIC: int __txn_compensate_begin __P((DB_ENV *, DB_TXN **txnp));
*/
-gint
+int
__txn_compensate_begin(dbenv, txnpp)
DB_ENV *dbenv;
DB_TXN **txnpp;
{
DB_TXN *txn;
- gint ret;
+ int ret;
PANIC_CHECK(dbenv);
@@ -303,7 +303,7 @@ __txn_compensate_begin(dbenv, txnpp)
static int
__txn_begin_int(txn, internal)
DB_TXN *txn;
- gint internal;
+ int internal;
{
DB_ENV *dbenv;
DB_LSN begin_lsn, null_lsn;
@@ -312,7 +312,7 @@ __txn_begin_int(txn, internal)
TXN_DETAIL *td;
size_t off;
u_int32_t id, *ids;
- gint nids, ret;
+ int nids, ret;
mgr = txn->mgrp;
dbenv = mgr->dbenv;
@@ -440,9 +440,9 @@ err: R_UNLOCK(dbenv, &mgr->reginfo);
* __txn_commit --
* Commit a transaction.
*
- * PUBLIC: gint __txn_commit __P((DB_TXN *, u_int32_t));
+ * PUBLIC: int __txn_commit __P((DB_TXN *, u_int32_t));
*/
-gint
+int
__txn_commit(txnp, flags)
DB_TXN *txnp;
u_int32_t flags;
@@ -452,7 +452,7 @@ __txn_commit(txnp, flags)
DB_TXN *kid;
TXN_DETAIL *td;
u_int32_t lflags;
- gint ret, t_ret;
+ int ret, t_ret;
dbenv = txnp->mgrp->dbenv;
@@ -578,9 +578,9 @@ err: /*
* __txn_abort --
* Abort a transaction.
*
- * PUBLIC: gint __txn_abort __P((DB_TXN *));
+ * PUBLIC: int __txn_abort __P((DB_TXN *));
*/
-gint
+int
__txn_abort(txnp)
DB_TXN *txnp;
{
@@ -589,7 +589,7 @@ __txn_abort(txnp)
DB_TXN *kid;
TXN_DETAIL *td;
u_int32_t lflags;
- gint ret;
+ int ret;
dbenv = txnp->mgrp->dbenv;
@@ -658,9 +658,9 @@ __txn_abort(txnp)
* __txn_discard --
* Free the per-process resources associated with this txn handle.
*
- * PUBLIC: gint __txn_discard __P((DB_TXN *, u_int32_t flags));
+ * PUBLIC: int __txn_discard __P((DB_TXN *, u_int32_t flags));
*/
-gint
+int
__txn_discard(txnp, flags)
DB_TXN *txnp;
u_int32_t flags;
@@ -668,7 +668,7 @@ __txn_discard(txnp, flags)
DB_ENV *dbenv;
DB_TXN *freep;
TXN_DETAIL *td;
- gint ret;
+ int ret;
COMPQUIET(flags, 0);
@@ -702,9 +702,9 @@ __txn_discard(txnp, flags)
* __txn_prepare --
* Flush the log so a future commit is guaranteed to succeed.
*
- * PUBLIC: gint __txn_prepare __P((DB_TXN *, u_int8_t *));
+ * PUBLIC: int __txn_prepare __P((DB_TXN *, u_int8_t *));
*/
-gint
+int
__txn_prepare(txnp, gid)
DB_TXN *txnp;
u_int8_t *gid;
@@ -714,7 +714,7 @@ __txn_prepare(txnp, gid)
DB_TXN *kid;
TXN_DETAIL *td;
u_int32_t lflags;
- gint ret;
+ int ret;
dbenv = txnp->mgrp->dbenv;
@@ -906,14 +906,14 @@ err: /*
static int
__txn_end(txnp, is_commit)
DB_TXN *txnp;
- gint is_commit;
+ int is_commit;
{
DB_ENV *dbenv;
DB_LOCKREQ request;
DB_TXNMGR *mgr;
DB_TXNREGION *region;
TXN_DETAIL *tp;
- gint do_closefiles, ret;
+ int do_closefiles, ret;
mgr = txnp->mgrp;
dbenv = mgr->dbenv;
@@ -1003,8 +1003,8 @@ __txn_undo(txnp)
DB_LSN key_lsn;
DB_TXN *ptxn;
DB_TXNMGR *mgr;
- gint ret, t_ret;
- gpointer txnlist;
+ int ret, t_ret;
+ void *txnlist;
mgr = txnp->mgrp;
dbenv = mgr->dbenv;
@@ -1093,10 +1093,10 @@ err: if (logc != NULL && (t_ret = logc->close(logc, 0)) != 0 && ret == 0)
* written after since that point may be involved in a transaction and may
* therefore need to be undone in the case of an abort.
*
- * PUBLIC: gint __txn_checkpoint
+ * PUBLIC: int __txn_checkpoint
* PUBLIC: __P((DB_ENV *, u_int32_t, u_int32_t, u_int32_t));
*/
-gint
+int
__txn_checkpoint(dbenv, kbytes, minutes, flags)
DB_ENV *dbenv;
u_int32_t kbytes, minutes, flags;
@@ -1107,7 +1107,7 @@ __txn_checkpoint(dbenv, kbytes, minutes, flags)
TXN_DETAIL *txnp;
time_t last_ckp_time, now;
u_int32_t bytes, mbytes;
- gint ret;
+ int ret;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv,
@@ -1218,9 +1218,9 @@ do_ckp: /* Look through the active transactions for the lowest begin LSN. */
* __txn_getckp --
* Get the LSN of the last transaction checkpoint.
*
- * PUBLIC: gint __txn_getckp __P((DB_ENV *, DB_LSN *));
+ * PUBLIC: int __txn_getckp __P((DB_ENV *, DB_LSN *));
*/
-gint
+int
__txn_getckp(dbenv, lsnp)
DB_ENV *dbenv;
DB_LSN *lsnp;
@@ -1247,9 +1247,9 @@ __txn_getckp(dbenv, lsnp)
* __txn_activekids --
* Return if this transaction has any active children.
*
- * PUBLIC: gint __txn_activekids __P((DB_ENV *, u_int32_t, DB_TXN *));
+ * PUBLIC: int __txn_activekids __P((DB_ENV *, u_int32_t, DB_TXN *));
*/
-gint
+int
__txn_activekids(dbenv, rectype, txnp)
DB_ENV *dbenv;
u_int32_t rectype;
@@ -1274,9 +1274,9 @@ __txn_activekids(dbenv, rectype, txnp)
* Force an abort record into the log if the commit record
* failed to get to disk.
*
- * PUBLIC: gint __txn_force_abort __P((DB_ENV *, u_int8_t *));
+ * PUBLIC: int __txn_force_abort __P((DB_ENV *, u_int8_t *));
*/
-gint
+int
__txn_force_abort(dbenv, buffer)
DB_ENV *dbenv;
u_int8_t *buffer;
@@ -1286,7 +1286,7 @@ __txn_force_abort(dbenv, buffer)
u_int32_t offset, opcode, rec_len, rec_type, sum_len;
u_int8_t *bp, *key, chksum[DB_MAC_KEY];
size_t hdrsize;
- gint ret;
+ int ret;
db_cipher = dbenv->crypto_handle;
@@ -1337,15 +1337,15 @@ __txn_force_abort(dbenv, buffer)
* were in the midst of taking care of restored transactions. If
* so, then we need to close the files that we opened.
*
- * PUBLIC: gint __txn_preclose __P((DB_ENV *));
+ * PUBLIC: int __txn_preclose __P((DB_ENV *));
*/
-gint
+int
__txn_preclose(dbenv)
DB_ENV *dbenv;
{
DB_TXNMGR *mgr;
DB_TXNREGION *region;
- gint do_closefiles, ret;
+ int do_closefiles, ret;
mgr = (DB_TXNMGR *)dbenv->tx_handle;
region = mgr->reginfo.primary;
@@ -1377,9 +1377,9 @@ __txn_preclose(dbenv)
* __txn_reset --
* Reset the last txnid to its minimum value, and log the reset.
*
- * PUBLIC: gint __txn_reset __P((DB_ENV *));
+ * PUBLIC: int __txn_reset __P((DB_ENV *));
*/
-gint
+int
__txn_reset(dbenv)
DB_ENV *dbenv;
{
diff --git a/libdb/txn/txn_auto.c b/libdb/txn/txn_auto.c
index 21bc7bc..55fb4bb 100644
--- a/libdb/txn/txn_auto.c
+++ b/libdb/txn/txn_auto.c
@@ -18,10 +18,10 @@
#include "dbinc/txn.h"
/*
- * PUBLIC: gint __txn_regop_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __txn_regop_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, u_int32_t, int32_t));
*/
-gint
+int
__txn_regop_log(dbenv, txnid, ret_lsnp, flags,
opcode, timestamp)
DB_ENV *dbenv;
@@ -35,7 +35,7 @@ __txn_regop_log(dbenv, txnid, ret_lsnp, flags,
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
rectype = DB___txn_regop;
@@ -104,19 +104,19 @@ __txn_regop_log(dbenv, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __txn_regop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __txn_regop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__txn_regop_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -137,19 +137,19 @@ __txn_regop_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __txn_regop_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __txn_regop_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__txn_regop_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__txn_regop_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -172,18 +172,18 @@ __txn_regop_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __txn_regop_read __P((DB_ENV *, gpointer , __txn_regop_args **));
+ * PUBLIC: int __txn_regop_read __P((DB_ENV *, void *, __txn_regop_args **));
*/
-gint
+int
__txn_regop_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__txn_regop_args **argpp;
{
__txn_regop_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__txn_regop_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -214,10 +214,10 @@ __txn_regop_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __txn_ckp_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __txn_ckp_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, DB_LSN *, DB_LSN *, int32_t));
*/
-gint
+int
__txn_ckp_log(dbenv, txnid, ret_lsnp, flags,
ckp_lsn, last_ckp, timestamp)
DB_ENV *dbenv;
@@ -232,7 +232,7 @@ __txn_ckp_log(dbenv, txnid, ret_lsnp, flags,
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
rectype = DB___txn_ckp;
@@ -310,19 +310,19 @@ __txn_ckp_log(dbenv, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __txn_ckp_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __txn_ckp_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__txn_ckp_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -343,19 +343,19 @@ __txn_ckp_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __txn_ckp_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __txn_ckp_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__txn_ckp_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__txn_ckp_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -381,18 +381,18 @@ __txn_ckp_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __txn_ckp_read __P((DB_ENV *, gpointer , __txn_ckp_args **));
+ * PUBLIC: int __txn_ckp_read __P((DB_ENV *, void *, __txn_ckp_args **));
*/
-gint
+int
__txn_ckp_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__txn_ckp_args **argpp;
{
__txn_ckp_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__txn_ckp_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -425,10 +425,10 @@ __txn_ckp_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __txn_child_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __txn_child_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, u_int32_t, DB_LSN *));
*/
-gint
+int
__txn_child_log(dbenv, txnid, ret_lsnp, flags,
child, c_lsn)
DB_ENV *dbenv;
@@ -442,7 +442,7 @@ __txn_child_log(dbenv, txnid, ret_lsnp, flags,
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
rectype = DB___txn_child;
@@ -513,19 +513,19 @@ __txn_child_log(dbenv, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __txn_child_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __txn_child_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__txn_child_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -546,19 +546,19 @@ __txn_child_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __txn_child_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __txn_child_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__txn_child_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__txn_child_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -582,18 +582,18 @@ __txn_child_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __txn_child_read __P((DB_ENV *, gpointer , __txn_child_args **));
+ * PUBLIC: int __txn_child_read __P((DB_ENV *, void *, __txn_child_args **));
*/
-gint
+int
__txn_child_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__txn_child_args **argpp;
{
__txn_child_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__txn_child_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -623,11 +623,11 @@ __txn_child_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __txn_xa_regop_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __txn_xa_regop_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, u_int32_t, const DBT *, int32_t, u_int32_t, u_int32_t,
* PUBLIC: DB_LSN *));
*/
-gint
+int
__txn_xa_regop_log(dbenv, txnid, ret_lsnp, flags,
opcode, xid, formatID, gtrid, bqual, begin_lsn)
DB_ENV *dbenv;
@@ -646,7 +646,7 @@ __txn_xa_regop_log(dbenv, txnid, ret_lsnp, flags,
u_int32_t zero;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
rectype = DB___txn_xa_regop;
@@ -744,19 +744,19 @@ __txn_xa_regop_log(dbenv, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __txn_xa_regop_getpgnos __P((DB_ENV *, DBT *,
- * PUBLIC: DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __txn_xa_regop_getpgnos __P((DB_ENV *, DBT *,
+ * PUBLIC: DB_LSN *, db_recops, void *));
*/
-gint
+int
__txn_xa_regop_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -777,21 +777,21 @@ __txn_xa_regop_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __txn_xa_regop_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __txn_xa_regop_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__txn_xa_regop_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__txn_xa_regop_args *argp;
u_int32_t i;
- gint ch;
- gint ret;
+ int ch;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -824,19 +824,19 @@ __txn_xa_regop_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __txn_xa_regop_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int __txn_xa_regop_read __P((DB_ENV *, void *,
* PUBLIC: __txn_xa_regop_args **));
*/
-gint
+int
__txn_xa_regop_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__txn_xa_regop_args **argpp;
{
__txn_xa_regop_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__txn_xa_regop_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -884,10 +884,10 @@ __txn_xa_regop_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __txn_recycle_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
+ * PUBLIC: int __txn_recycle_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
* PUBLIC: u_int32_t, u_int32_t, u_int32_t));
*/
-gint
+int
__txn_recycle_log(dbenv, txnid, ret_lsnp, flags,
min, max)
DB_ENV *dbenv;
@@ -901,7 +901,7 @@ __txn_recycle_log(dbenv, txnid, ret_lsnp, flags,
DB_LSN *lsnp, null_lsn;
u_int32_t uinttmp;
u_int32_t npad, rectype, txn_num;
- gint ret;
+ int ret;
u_int8_t *bp;
rectype = DB___txn_recycle;
@@ -970,19 +970,19 @@ __txn_recycle_log(dbenv, txnid, ret_lsnp, flags,
}
/*
- * PUBLIC: gint __txn_recycle_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __txn_recycle_getpgnos __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__txn_recycle_getpgnos(dbenv, rec, lsnp, notused1, summary)
DB_ENV *dbenv;
DBT *rec;
DB_LSN *lsnp;
db_recops notused1;
- gpointer summary;
+ void *summary;
{
TXN_RECS *t;
- gint ret;
+ int ret;
COMPQUIET(rec, NULL);
COMPQUIET(notused1, DB_TXN_ABORT);
@@ -1003,19 +1003,19 @@ __txn_recycle_getpgnos(dbenv, rec, lsnp, notused1, summary)
}
/*
- * PUBLIC: gint __txn_recycle_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC: db_recops, gpointer ));
+ * PUBLIC: int __txn_recycle_print __P((DB_ENV *, DBT *, DB_LSN *,
+ * PUBLIC: db_recops, void *));
*/
-gint
+int
__txn_recycle_print(dbenv, dbtp, lsnp, notused2, notused3)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops notused2;
- gpointer notused3;
+ void *notused3;
{
__txn_recycle_args *argp;
- gint ret;
+ int ret;
notused2 = DB_TXN_ABORT;
notused3 = NULL;
@@ -1038,19 +1038,19 @@ __txn_recycle_print(dbenv, dbtp, lsnp, notused2, notused3)
}
/*
- * PUBLIC: gint __txn_recycle_read __P((DB_ENV *, gpointer ,
+ * PUBLIC: int __txn_recycle_read __P((DB_ENV *, void *,
* PUBLIC: __txn_recycle_args **));
*/
-gint
+int
__txn_recycle_read(dbenv, recbuf, argpp)
DB_ENV *dbenv;
- gpointer recbuf;
+ void *recbuf;
__txn_recycle_args **argpp;
{
__txn_recycle_args *argp;
u_int32_t uinttmp;
u_int8_t *bp;
- gint ret;
+ int ret;
if ((ret = __os_malloc(dbenv,
sizeof(__txn_recycle_args) + sizeof(DB_TXN), &argp)) != 0)
@@ -1081,16 +1081,16 @@ __txn_recycle_read(dbenv, recbuf, argpp)
}
/*
- * PUBLIC: gint __txn_init_print __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __txn_init_print __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__txn_init_print(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__txn_regop_print, DB___txn_regop)) != 0)
@@ -1111,16 +1111,16 @@ __txn_init_print(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __txn_init_getpgnos __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __txn_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__txn_init_getpgnos(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__txn_regop_getpgnos, DB___txn_regop)) != 0)
@@ -1141,16 +1141,16 @@ __txn_init_getpgnos(dbenv, dtabp, dtabsizep)
}
/*
- * PUBLIC: gint __txn_init_recover __P((DB_ENV *, gint (***)(DB_ENV *,
- * PUBLIC: DBT *, DB_LSN *, db_recops, gpointer ), size_t *));
+ * PUBLIC: int __txn_init_recover __P((DB_ENV *, int (***)(DB_ENV *,
+ * PUBLIC: DBT *, DB_LSN *, db_recops, void *), size_t *));
*/
-gint
+int
__txn_init_recover(dbenv, dtabp, dtabsizep)
DB_ENV *dbenv;
- gint (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
size_t *dtabsizep;
{
- gint ret;
+ int ret;
if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
__txn_regop_recover, DB___txn_regop)) != 0)
diff --git a/libdb/txn/txn_method.c b/libdb/txn/txn_method.c
index e63ecae..aed1387 100644
--- a/libdb/txn/txn_method.c
+++ b/libdb/txn/txn_method.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -29,8 +29,8 @@ static const gchar revid[] = "$Id$";
#include "dbinc_auto/rpc_client_ext.h"
#endif
-static gint __txn_set_tx_max __P((DB_ENV *, u_int32_t));
-static gint __txn_set_tx_timestamp __P((DB_ENV *, time_t *));
+static int __txn_set_tx_max __P((DB_ENV *, u_int32_t));
+static int __txn_set_tx_timestamp __P((DB_ENV *, time_t *));
/*
* __txn_dbenv_create --
diff --git a/libdb/txn/txn_rec.c b/libdb/txn/txn_rec.c
index 8cede05..14db7f5 100644
--- a/libdb/txn/txn_rec.c
+++ b/libdb/txn/txn_rec.c
@@ -36,7 +36,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -54,24 +54,24 @@ static const gchar revid[] = "$Id$";
#define IS_XA_TXN(R) (R->xid.size != 0)
/*
- * PUBLIC: gint __txn_regop_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __txn_regop_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*
* These records are only ever written for commits. Normally, we redo any
* committed transaction, however if we are doing recovery to a timestamp, then
* we may treat transactions that commited after the timestamp as aborted.
*/
-gint
+int
__txn_regop_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
DB_TXNHEAD *headp;
__txn_regop_args *argp;
- gint ret;
+ int ret;
#ifdef DEBUG_RECOVER
(void)__txn_regop_print(dbenv, dbtp, lsnp, op, info);
@@ -141,21 +141,21 @@ err: __db_err(dbenv,
}
/*
- * PUBLIC: gint __txn_xa_regop_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __txn_xa_regop_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*
* These records are only ever written for prepares.
*/
-gint
+int
__txn_xa_regop_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__txn_xa_regop_args *argp;
- gint ret;
+ int ret;
#ifdef DEBUG_RECOVER
(void)__txn_xa_regop_print(dbenv, dbtp, lsnp, op, info);
@@ -218,19 +218,19 @@ err: __os_free(dbenv, argp);
}
/*
- * PUBLIC: gint __txn_ckp_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __txn_ckp_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__txn_ckp_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__txn_ckp_args *argp;
- gint ret;
+ int ret;
#ifdef DEBUG_RECOVER
__txn_ckp_print(dbenv, dbtp, lsnp, op, info);
@@ -252,19 +252,19 @@ __txn_ckp_recover(dbenv, dbtp, lsnp, op, info)
* __txn_child_recover
* Recover a commit record for a child transaction.
*
- * PUBLIC: gint __txn_child_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __txn_child_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__txn_child_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__txn_child_args *argp;
- gint c_stat, p_stat, ret;
+ int c_stat, p_stat, ret;
#ifdef DEBUG_RECOVER
(void)__txn_child_print(dbenv, dbtp, lsnp, op, info);
@@ -348,10 +348,10 @@ __txn_child_recover(dbenv, dbtp, lsnp, op, info)
* lsnp is the LSN of the returned LSN
* argp is the perpare record (in an appropriate structure)
*
- * PUBLIC: gint __txn_restore_txn __P((DB_ENV *,
+ * PUBLIC: int __txn_restore_txn __P((DB_ENV *,
* PUBLIC: DB_LSN *, __txn_xa_regop_args *));
*/
-gint
+int
__txn_restore_txn(dbenv, lsnp, argp)
DB_ENV *dbenv;
DB_LSN *lsnp;
@@ -360,7 +360,7 @@ __txn_restore_txn(dbenv, lsnp, argp)
DB_TXNMGR *mgr;
TXN_DETAIL *td;
DB_TXNREGION *region;
- gint ret;
+ int ret;
if (argp->xid.size == 0)
return (0);
@@ -404,19 +404,19 @@ __txn_restore_txn(dbenv, lsnp, argp)
* __txn_recycle_recover --
* Recovery function for recycle.
*
- * PUBLIC: gint __txn_recycle_recover
- * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, gpointer ));
+ * PUBLIC: int __txn_recycle_recover
+ * PUBLIC: __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
*/
-gint
+int
__txn_recycle_recover(dbenv, dbtp, lsnp, op, info)
DB_ENV *dbenv;
DBT *dbtp;
DB_LSN *lsnp;
db_recops op;
- gpointer info;
+ void *info;
{
__txn_recycle_args *argp;
- gint ret;
+ int ret;
#ifdef DEBUG_RECOVER
(void)__txn_child_print(dbenv, dbtp, lsnp, op, info);
diff --git a/libdb/txn/txn_recover.c b/libdb/txn/txn_recover.c
index 25ea4a2..0a077e4 100644
--- a/libdb/txn/txn_recover.c
+++ b/libdb/txn/txn_recover.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -61,10 +61,10 @@ __txn_continue(env, txnp, td, off)
* __txn_map_gid
* Return the txn that corresponds to this global ID.
*
- * PUBLIC: gint __txn_map_gid __P((DB_ENV *,
+ * PUBLIC: int __txn_map_gid __P((DB_ENV *,
* PUBLIC: u_int8_t *, TXN_DETAIL **, size_t *));
*/
-gint
+int
__txn_map_gid(dbenv, gid, tdp, offp)
DB_ENV *dbenv;
u_int8_t *gid;
@@ -103,10 +103,10 @@ __txn_map_gid(dbenv, gid, tdp, offp)
* commited transactions. See __txn_get_prepared for details. This
* function and __db_xa_recover both wrap that one.
*
- * PUBLIC: gint __txn_recover
+ * PUBLIC: int __txn_recover
* PUBLIC: __P((DB_ENV *, DB_PREPLIST *, long, long *, u_int32_t));
*/
-gint
+int
__txn_recover(dbenv, preplist, count, retp, flags)
DB_ENV *dbenv;
DB_PREPLIST *preplist;
@@ -136,10 +136,10 @@ __txn_recover(dbenv, preplist, count, retp, flags)
* entries returned in the xids/txns array. Flags indicates the operation,
* one of DB_FIRST or DB_NEXT.
*
- * PUBLIC: gint __txn_get_prepared __P((DB_ENV *,
+ * PUBLIC: int __txn_get_prepared __P((DB_ENV *,
* PUBLIC: XID *, DB_PREPLIST *, long, long *, u_int32_t));
*/
-gint
+int
__txn_get_prepared(dbenv, xids, txns, count, retp, flags)
DB_ENV *dbenv;
XID *xids;
@@ -158,8 +158,8 @@ __txn_get_prepared(dbenv, xids, txns, count, retp, flags)
XID *xidp;
__txn_ckp_args *ckp_args;
long i;
- gint nrestores, open_files, ret, t_ret;
- gpointer txninfo;
+ int nrestores, open_files, ret, t_ret;
+ void *txninfo;
*retp = 0;
diff --git a/libdb/txn/txn_region.c b/libdb/txn/txn_region.c
index e0cbafa..8a8e445 100644
--- a/libdb/txn/txn_region.c
+++ b/libdb/txn/txn_region.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -32,22 +32,22 @@ static const gchar revid[] = "$Id$";
#include "dbinc/log.h"
#include "dbinc/txn.h"
-static gint __txn_findlastckp __P((DB_ENV *, DB_LSN *));
-static gint __txn_init __P((DB_ENV *, DB_TXNMGR *));
+static int __txn_findlastckp __P((DB_ENV *, DB_LSN *));
+static int __txn_init __P((DB_ENV *, DB_TXNMGR *));
static size_t __txn_region_size __P((DB_ENV *));
/*
* __txn_open --
* Open a transaction region.
*
- * PUBLIC: gint __txn_open __P((DB_ENV *));
+ * PUBLIC: int __txn_open __P((DB_ENV *));
*/
-gint
+int
__txn_open(dbenv)
DB_ENV *dbenv;
{
DB_TXNMGR *tmgrp;
- gint ret;
+ int ret;
/* Create/initialize the transaction manager structure. */
if ((ret = __os_calloc(dbenv, 1, sizeof(DB_TXNMGR), &tmgrp)) != 0)
@@ -110,7 +110,7 @@ __txn_init(dbenv, tmgrp)
{
DB_LSN last_ckp;
DB_TXNREGION *region;
- gint ret;
+ int ret;
#ifdef HAVE_MUTEX_SYSTEM_RESOURCES
u_int8_t *addr;
#endif
@@ -191,7 +191,7 @@ __txn_findlastckp(dbenv, lsnp)
DB_LOGC *logc;
DB_LSN lsn;
DBT dbt;
- gint ret, t_ret;
+ int ret, t_ret;
u_int32_t rectype;
if ((ret = dbenv->log_cursor(dbenv, &logc, 0)) != 0)
@@ -234,16 +234,16 @@ err: if ((t_ret = logc->close(logc, 0)) != 0 && ret == 0)
* Clean up after the transaction system on a close or failed open.
* Called only from __dbenv_refresh. (Formerly called __txn_close.)
*
- * PUBLIC: gint __txn_dbenv_refresh __P((DB_ENV *));
+ * PUBLIC: int __txn_dbenv_refresh __P((DB_ENV *));
*/
-gint
+int
__txn_dbenv_refresh(dbenv)
DB_ENV *dbenv;
{
DB_TXN *txnp;
DB_TXNMGR *tmgrp;
u_int32_t txnid;
- gint ret, t_ret;
+ int ret, t_ret;
ret = 0;
tmgrp = dbenv->tx_handle;
@@ -340,16 +340,16 @@ __txn_region_destroy(dbenv, infop)
* Set the current transaction ID and current maximum unused ID (for
* testing purposes only).
*
- * PUBLIC: gint __txn_id_set __P((DB_ENV *, u_int32_t, u_int32_t));
+ * PUBLIC: int __txn_id_set __P((DB_ENV *, u_int32_t, u_int32_t));
*/
-gint
+int
__txn_id_set(dbenv, cur_txnid, max_txnid)
DB_ENV *dbenv;
u_int32_t cur_txnid, max_txnid;
{
DB_TXNMGR *mgr;
DB_TXNREGION *region;
- gint ret;
+ int ret;
ENV_REQUIRES_CONFIG(dbenv, dbenv->tx_handle, "txn_id_set", DB_INIT_TXN);
diff --git a/libdb/txn/txn_stat.c b/libdb/txn/txn_stat.c
index 9720358..6228785 100644
--- a/libdb/txn/txn_stat.c
+++ b/libdb/txn/txn_stat.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -23,9 +23,9 @@ static const gchar revid[] = "$Id$";
/*
* __txn_stat --
*
- * PUBLIC: gint __txn_stat __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
+ * PUBLIC: int __txn_stat __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
*/
-gint
+int
__txn_stat(dbenv, statp, flags)
DB_ENV *dbenv;
DB_TXN_STAT **statp;
@@ -37,7 +37,7 @@ __txn_stat(dbenv, statp, flags)
TXN_DETAIL *txnp;
size_t nbytes;
u_int32_t ndx;
- gint ret;
+ int ret;
PANIC_CHECK(dbenv);
ENV_REQUIRES_CONFIG(dbenv, dbenv->tx_handle, "txn_stat", DB_INIT_TXN);
diff --git a/libdb/txn/txn_util.c b/libdb/txn/txn_util.c
index b3d7309..238aac5 100644
--- a/libdb/txn/txn_util.c
+++ b/libdb/txn/txn_util.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -28,7 +28,7 @@ struct __txn_event {
union {
struct {
/* Delayed remove. */
- gchar *name;
+ char *name;
u_int8_t *fileid;
} r;
struct {
@@ -45,17 +45,17 @@ struct __txn_event {
*
* Creates a remove event that can be added to the commit list.
*
- * PUBLIC: gint __txn_remevent __P((DB_ENV *,
- * PUBLIC: DB_TXN *, const gchar *, u_int8_t*));
+ * PUBLIC: int __txn_remevent __P((DB_ENV *,
+ * PUBLIC: DB_TXN *, const char *, u_int8_t*));
*/
-gint
+int
__txn_remevent(dbenv, txn, name, fileid)
DB_ENV *dbenv;
DB_TXN *txn;
- const gchar *name;
+ const char *name;
u_int8_t *fileid;
{
- gint ret;
+ int ret;
TXN_EVENT *e;
e = NULL;
@@ -89,10 +89,10 @@ err: if (e != NULL)
* Add a lockevent to the commit-queue. The lock event indicates a locker
* trade.
*
- * PUBLIC: gint __txn_lockevent __P((DB_ENV *,
+ * PUBLIC: int __txn_lockevent __P((DB_ENV *,
* PUBLIC: DB_TXN *, DB *, DB_LOCK *, u_int32_t));
*/
-gint
+int
__txn_lockevent(dbenv, txn, dbp, lock, locker)
DB_ENV *dbenv;
DB_TXN *txn;
@@ -100,7 +100,7 @@ __txn_lockevent(dbenv, txn, dbp, lock, locker)
DB_LOCK *lock;
u_int32_t locker;
{
- gint ret;
+ int ret;
TXN_EVENT *e;
if (!LOCKING_ON(dbenv))
@@ -152,7 +152,7 @@ __txn_remlock(dbenv, txn, lock, locker)
* Process the list of events associated with a transaction. On commit,
* apply the events; on abort, just toss the entries.
*
- * PUBLIC: gint __txn_doevents __P((DB_ENV *, DB_TXN *, int, int));
+ * PUBLIC: int __txn_doevents __P((DB_ENV *, DB_TXN *, int, int));
*/
#define DO_TRADE do { \
memset(&req, 0, sizeof(req)); \
@@ -168,15 +168,15 @@ __txn_remlock(dbenv, txn, lock, locker)
e->op = TXN_TRADED; \
} while (0)
-gint
+int
__txn_doevents(dbenv, txn, is_commit, preprocess)
DB_ENV *dbenv;
DB_TXN *txn;
- gint is_commit, preprocess;
+ int is_commit, preprocess;
{
DB_LOCKREQ req;
TXN_EVENT *e;
- gint ret, t_ret;
+ int ret, t_ret;
ret = 0;
diff --git a/libdb/xa/xa.c b/libdb/xa/xa.c
index 14350f4..8cabbfa 100644
--- a/libdb/xa/xa.c
+++ b/libdb/xa/xa.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -21,16 +21,16 @@ static const gchar revid[] = "$Id$";
#include "db_int.h"
#include "dbinc/txn.h"
-static gint __db_xa_close __P((gchar *, int, long));
-static gint __db_xa_commit __P((XID *, int, long));
-static gint __db_xa_complete __P((gint *, gint *, int, long));
-static gint __db_xa_end __P((XID *, int, long));
-static gint __db_xa_forget __P((XID *, int, long));
-static gint __db_xa_open __P((gchar *, int, long));
-static gint __db_xa_prepare __P((XID *, int, long));
-static gint __db_xa_recover __P((XID *, long, int, long));
-static gint __db_xa_rollback __P((XID *, int, long));
-static gint __db_xa_start __P((XID *, int, long));
+static int __db_xa_close __P((char *, int, long));
+static int __db_xa_commit __P((XID *, int, long));
+static int __db_xa_complete __P((int *, int *, int, long));
+static int __db_xa_end __P((XID *, int, long));
+static int __db_xa_forget __P((XID *, int, long));
+static int __db_xa_open __P((char *, int, long));
+static int __db_xa_prepare __P((XID *, int, long));
+static int __db_xa_recover __P((XID *, long, int, long));
+static int __db_xa_rollback __P((XID *, int, long));
+static int __db_xa_start __P((XID *, int, long));
static void __xa_txn_end __P((DB_TXN *));
/*
@@ -75,8 +75,8 @@ const struct xa_switch_t db_xa_switch = {
*/
static int
__db_xa_open(xa_info, rmid, flags)
- gchar *xa_info;
- gint rmid;
+ char *xa_info;
+ int rmid;
long flags;
{
DB_ENV *env;
@@ -126,12 +126,12 @@ err: (void)env->close(env, 0);
*/
static int
__db_xa_close(xa_info, rmid, flags)
- gchar *xa_info;
- gint rmid;
+ char *xa_info;
+ int rmid;
long flags;
{
DB_ENV *env;
- gint ret, t_ret;
+ int ret, t_ret;
COMPQUIET(xa_info, NULL);
@@ -169,13 +169,13 @@ __db_xa_close(xa_info, rmid, flags)
static int
__db_xa_start(xid, rmid, flags)
XID *xid;
- gint rmid;
+ int rmid;
long flags;
{
DB_ENV *env;
TXN_DETAIL *td;
size_t off;
- gint is_known;
+ int is_known;
#define OK_FLAGS (TMJOIN | TMRESUME | TMNOWAIT | TMASYNC | TMNOFLAGS)
if (LF_ISSET(~OK_FLAGS))
@@ -236,7 +236,7 @@ __db_xa_start(xid, rmid, flags)
static int
__db_xa_end(xid, rmid, flags)
XID *xid;
- gint rmid;
+ int rmid;
long flags;
{
DB_ENV *env;
@@ -290,7 +290,7 @@ __db_xa_end(xid, rmid, flags)
static int
__db_xa_prepare(xid, rmid, flags)
XID *xid;
- gint rmid;
+ int rmid;
long flags;
{
DB_ENV *env;
@@ -341,7 +341,7 @@ __db_xa_prepare(xid, rmid, flags)
static int
__db_xa_commit(xid, rmid, flags)
XID *xid;
- gint rmid;
+ int rmid;
long flags;
{
DB_ENV *env;
@@ -402,7 +402,7 @@ static int
__db_xa_recover(xids, count, rmid, flags)
XID *xids;
long count, flags;
- gint rmid;
+ int rmid;
{
DB_ENV *env;
u_int32_t newflags;
@@ -433,7 +433,7 @@ __db_xa_recover(xids, count, rmid, flags)
static int
__db_xa_rollback(xid, rmid, flags)
XID *xid;
- gint rmid;
+ int rmid;
long flags;
{
DB_ENV *env;
@@ -482,7 +482,7 @@ __db_xa_rollback(xid, rmid, flags)
static int
__db_xa_forget(xid, rmid, flags)
XID *xid;
- gint rmid;
+ int rmid;
long flags;
{
DB_ENV *env;
@@ -515,7 +515,7 @@ __db_xa_forget(xid, rmid, flags)
*/
static int
__db_xa_complete(handle, retval, rmid, flags)
- gint *handle, *retval, rmid;
+ int *handle, *retval, rmid;
long flags;
{
COMPQUIET(handle, NULL);
diff --git a/libdb/xa/xa_db.c b/libdb/xa/xa_db.c
index 54e915f..7035cab 100644
--- a/libdb/xa/xa_db.c
+++ b/libdb/xa/xa_db.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -19,36 +19,36 @@ static const gchar revid[] = "$Id$";
#include "dbinc/xa.h"
#include "dbinc/txn.h"
-static gint __xa_close __P((DB *, u_int32_t));
-static gint __xa_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
-static gint __xa_del __P((DB *, DB_TXN *, DBT *, u_int32_t));
-static gint __xa_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-static gint __xa_open __P((DB *, DB_TXN *,
- const gchar *, const gchar *, DBTYPE, u_int32_t, int));
-static gint __xa_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+static int __xa_close __P((DB *, u_int32_t));
+static int __xa_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
+static int __xa_del __P((DB *, DB_TXN *, DBT *, u_int32_t));
+static int __xa_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+static int __xa_open __P((DB *, DB_TXN *,
+ const char *, const char *, DBTYPE, u_int32_t, int));
+static int __xa_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
typedef struct __xa_methods {
- gint (*close) __P((DB *, u_int32_t));
- gint (*cursor) __P((DB *, DB_TXN *, DBC **, u_int32_t));
- gint (*del) __P((DB *, DB_TXN *, DBT *, u_int32_t));
- gint (*get) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
- gint (*open) __P((DB *, DB_TXN *,
- const gchar *, const gchar *, DBTYPE, u_int32_t, int));
- gint (*put) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+ int (*close) __P((DB *, u_int32_t));
+ int (*cursor) __P((DB *, DB_TXN *, DBC **, u_int32_t));
+ int (*del) __P((DB *, DB_TXN *, DBT *, u_int32_t));
+ int (*get) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
+ int (*open) __P((DB *, DB_TXN *,
+ const char *, const char *, DBTYPE, u_int32_t, int));
+ int (*put) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
} XA_METHODS;
/*
* __db_xa_create --
* DB XA constructor.
*
- * PUBLIC: gint __db_xa_create __P((DB *));
+ * PUBLIC: int __db_xa_create __P((DB *));
*/
-gint
+int
__db_xa_create(dbp)
DB *dbp;
{
XA_METHODS *xam;
- gint ret;
+ int ret;
/*
* Interpose XA routines in front of any method that takes a TXN
@@ -75,13 +75,13 @@ static int
__xa_open(dbp, txn, name, subdb, type, flags, mode)
DB *dbp;
DB_TXN *txn;
- const gchar *name, *subdb;
+ const char *name, *subdb;
DBTYPE type;
u_int32_t flags;
- gint mode;
+ int mode;
{
XA_METHODS *xam;
- gint ret;
+ int ret;
xam = (XA_METHODS *)dbp->xa_internal;
@@ -137,7 +137,7 @@ __xa_close(dbp, flags)
DB *dbp;
u_int32_t flags;
{
- gint (*real_close) __P((DB *, u_int32_t));
+ int (*real_close) __P((DB *, u_int32_t));
real_close = ((XA_METHODS *)dbp->xa_internal)->close;
diff --git a/libdb/xa/xa_map.c b/libdb/xa/xa_map.c
index 51d98da..d0141ed 100644
--- a/libdb/xa/xa_map.c
+++ b/libdb/xa/xa_map.c
@@ -8,7 +8,7 @@
#include "db_config.h"
#ifndef lint
-static const gchar revid[] = "$Id$";
+static const char revid[] = "$Id$";
#endif /* not lint */
#ifndef NO_SYSTEM_INCLUDES
@@ -29,11 +29,11 @@ static const gchar revid[] = "$Id$";
* __db_rmid_to_env
* Return the environment associated with a given XA rmid.
*
- * PUBLIC: gint __db_rmid_to_env __P((gint rmid, DB_ENV **envp));
+ * PUBLIC: int __db_rmid_to_env __P((int rmid, DB_ENV **envp));
*/
-gint
+int
__db_rmid_to_env(rmid, envp)
- gint rmid;
+ int rmid;
DB_ENV **envp;
{
DB_ENV *env;
@@ -64,9 +64,9 @@ __db_rmid_to_env(rmid, envp)
* __db_xid_to_txn
* Return the txn that corresponds to this XID.
*
- * PUBLIC: gint __db_xid_to_txn __P((DB_ENV *, XID *, size_t *));
+ * PUBLIC: int __db_xid_to_txn __P((DB_ENV *, XID *, size_t *));
*/
-gint
+int
__db_xid_to_txn(dbenv, xid, offp)
DB_ENV *dbenv;
XID *xid;
@@ -81,11 +81,11 @@ __db_xid_to_txn(dbenv, xid, offp)
* __db_map_rmid
* Create a mapping between the specified rmid and environment.
*
- * PUBLIC: gint __db_map_rmid __P((int, DB_ENV *));
+ * PUBLIC: int __db_map_rmid __P((int, DB_ENV *));
*/
-gint
+int
__db_map_rmid(rmid, env)
- gint rmid;
+ int rmid;
DB_ENV *env;
{
env->xa_rmid = rmid;
@@ -97,11 +97,11 @@ __db_map_rmid(rmid, env)
* __db_unmap_rmid
* Destroy the mapping for the given rmid.
*
- * PUBLIC: gint __db_unmap_rmid __P((int));
+ * PUBLIC: int __db_unmap_rmid __P((int));
*/
-gint
+int
__db_unmap_rmid(rmid)
- gint rmid;
+ int rmid;
{
DB_ENV *e;
@@ -121,9 +121,9 @@ __db_unmap_rmid(rmid)
* Create a mapping between this XID and the transaction at
* "off" in the shared region.
*
- * PUBLIC: gint __db_map_xid __P((DB_ENV *, XID *, size_t));
+ * PUBLIC: int __db_map_xid __P((DB_ENV *, XID *, size_t));
*/
-gint
+int
__db_map_xid(env, xid, off)
DB_ENV *env;
XID *xid;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
