mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get rid of almost all compiler warnings in newbrt for icc, and also compiles with gcc. Addresses #1185.

Browse source 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6383 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Bradley C. Kuszmaul 2013-04-16 23:57:20 -04:00 • committed by Yoni Fogel
parent 0363b1697a
commit 9f7f84e655
5 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
newbrt/brt.c
View file

@ -3068,12 +3068,14 @@ static inline void dbt_cleanup(DBT *dbt) {
}
}
static inline int brt_cursor_not_set(BRT_CURSOR cursor) {
return cursor->key.data == 0 || cursor->val.data == 0;
static BOOL brt_cursor_not_set(BRT_CURSOR cursor) {
return (BOOL)((cursor->key.data == 0)
||
(cursor->val.data == 0));
}
BOOL toku_brt_cursor_uninitialized(BRT_CURSOR c) {
return (BOOL)(brt_cursor_not_set(c));
return brt_cursor_not_set(c);
}
static inline void load_dbts_from_omt(BRT_CURSOR c, DBT *key, DBT *val) {

2
newbrt/cachetable.h
View file

@ -182,6 +182,6 @@ void toku_cachetable_verify (CACHETABLE t);
void print_hash_histogram (void) __attribute__((__visibility__("default")));
// Useful for debugging.
static unsigned long toku_get_maxrss(void) __attribute__((__visibility__("default")));
unsigned long toku_get_maxrss(void) __attribute__((__visibility__("default")));
#endif

2
newbrt/log.c
View file

@ -822,11 +822,13 @@ TOKULOGGER toku_txn_logger (TOKUTXN txn) {
return txn ? txn->logger : 0;
}
#if 0
static int
toku_abort_logentry_commit (struct logtype_commit *le __attribute__((__unused__)), TOKUTXN txn) {
toku_logger_panic(txn->logger, EINVAL);
return EINVAL;
}
#endif
int toku_logger_abort(TOKUTXN txn) {
//printf("%s:%d aborting\n", __FILE__, __LINE__);

3
newbrt/recover.c
View file

@ -439,6 +439,7 @@ toku_recover_setpivot (LSN lsn, FILENUM filenum, BLOCKNUM blocknum, u_int32_t ch
toku_free(pivotkey.data);
}
#if 0
static void
toku_recover_changechildfingerprint (LSN lsn, FILENUM filenum, BLOCKNUM blocknum, u_int32_t childnum, u_int32_t UU(oldfingerprint), u_int32_t newfingerprint) {
struct cf_pair *pair = NULL;
@ -457,8 +458,8 @@ toku_recover_changechildfingerprint (LSN lsn, FILENUM filenum, BLOCKNUM blocknum
node->log_lsn = lsn;
r = toku_cachetable_unpin(pair->cf, blocknum, node->fullhash, 1, toku_serialize_brtnode_size(node));
assert(r==0);
}
#endif
static void
toku_recover_fopen (LSN UU(lsn), TXNID UU(txnid), BYTESTRING fname, FILENUM filenum) {

2
newbrt/tests/test.h
View file

@ -4,7 +4,7 @@
int verbose=0;
static void
static inline void
default_parse_args (int argc, const char *argv[]) {
const char *progname=argv[0];
argc--; argv++;