database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-30 05:23:50 +03:00
Code Activity

fix cxx/tests build problems. addresses #246

Browse Source 
git-svn-id: file:///svn/tokudb@1556 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Rich Prohaska
2008-01-08 17:51:24 +00:00
parent fa00e966be
commit 54bf735ad2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cxx/dbenv.cpp
View File

@@ -97,13 +97,13 @@ int DbEnv::maybe_throw_error(int err) throw (DbException) {
} }
extern "C" { extern "C" {
void toku_db_env_err_vararg(const DB_ENV * env, int error, const char *fmt, va_list ap); void toku_do_error_all_cases(const DB_ENV * env, int error, int, int, const char *fmt, va_list ap);
}; };
void DbEnv::err(int error, const char *fmt, ...) { void DbEnv::err(int error, const char *fmt, ...) {
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
toku_db_env_err_vararg(the_env, error, fmt, ap); toku_do_error_all_cases(the_env, error, 1, 1, fmt, ap);
va_end(ap); va_end(ap);
} }

6
src/ydb.c
View File

@@ -66,7 +66,7 @@ struct __toku_db_env_internal {
// If errfile is set, print to the errfile: prefix, fmt string, maybe include the stderr string. // If errfile is set, print to the errfile: prefix, fmt string, maybe include the stderr string.
// Both errcall and errfile may be called. // Both errcall and errfile may be called.
// If errfile is not set and errcall is not set, the use stderr as the errfile. // If errfile is not set and errcall is not set, the use stderr as the errfile.
static void do_error_all_cases(const DB_ENV * env, int error, int include_stderrstring, int use_stderr_if_nothing_else, const char *fmt, va_list ap) { void toku_do_error_all_cases(const DB_ENV * env, int error, int include_stderrstring, int use_stderr_if_nothing_else, const char *fmt, va_list ap) {
if (env->i->errcall) { if (env->i->errcall) {
// errcall gets prefix sent separately // errcall gets prefix sent separately
// the error message is the printf message, maybe followed by ": " and the dbstrerror (if include_stderrstring is set) // the error message is the printf message, maybe followed by ": " and the dbstrerror (if include_stderrstring is set)
@@ -100,7 +100,7 @@ static void do_error_all_cases(const DB_ENV * env, int error, int include_stderr
static int do_error (DB_ENV *dbenv, int error, const char *string, ...) { static int do_error (DB_ENV *dbenv, int error, const char *string, ...) {
va_list ap; va_list ap;
va_start(ap, string); va_start(ap, string);
do_error_all_cases(dbenv, error, 1, 0, string, ap); toku_do_error_all_cases(dbenv, error, 1, 0, string, ap);
va_end(ap); va_end(ap);
return error; return error;
} }
@@ -109,7 +109,7 @@ static int do_error (DB_ENV *dbenv, int error, const char *string, ...) {
static void toku_db_env_err(const DB_ENV * env, int error, const char *fmt, ...) { static void toku_db_env_err(const DB_ENV * env, int error, const char *fmt, ...) {
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
do_error_all_cases(env, error, 1, 1, fmt, ap); toku_do_error_all_cases(env, error, 1, 1, fmt, ap);
va_end(ap); va_end(ap);
} }