From 7e5fd7c56ea8830a588f6c3d2b95adb7c1c9befb Mon Sep 17 00:00:00 2001 From: Yoni Fogel Date: Tue, 16 Apr 2013 23:57:22 -0400 Subject: [PATCH] Manual glue for svn-git migration for r6575 due to multiple merges. Original message: Create new main branch from tokudb.1131b+1080a+1185+nostatementexprs. Create in in the new directory layout. Addresses #1131,#1080,#1185,#1193. --- newbrt/brtdump.c | 5 +++-- newbrt/tests/Makefile | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/newbrt/brtdump.c b/newbrt/brtdump.c index 66905531bab..2c882c3e0f5 100644 --- a/newbrt/brtdump.c +++ b/newbrt/brtdump.c @@ -168,7 +168,7 @@ static void dump_block_translation(struct brt_header *h, u_int64_t offset) { if (offset < h->translated_blocknum_limit) { struct block_translation_pair *bx = &h->block_translation[offset]; - printf("%lu: %ld %ld\n", offset, bx->diskoff, bx->size); + printf("%lu: %lu %lu\n", offset, bx->diskoff, bx->size); } } @@ -237,7 +237,8 @@ split_fields (char *line, char *fields[], int maxfields) { return i; } -int main (int argc, const char *argv[]) { +int +main (int argc, const char *argv[]) { const char *arg0 = argv[0]; static int interactive = 0; argc--; argv++; diff --git a/newbrt/tests/Makefile b/newbrt/tests/Makefile index 208af6290b9..a2b52d44390 100644 --- a/newbrt/tests/Makefile +++ b/newbrt/tests/Makefile @@ -247,5 +247,6 @@ clean: rm -rf $(BINS) *.o *.bb *.bbg *.da *.gcov *.gcno *.gcda rm -rf test_oexcl.c.tmp *.brt *.dir *.tdb *.dat *.out rm -rf *.exe *.pdb *.ilk *.obj + rm -f cachetable-fd-test.ctest2.data foo: ../cachetable.o ../fifo.o ../fingerprint.o ../key.o ../memory.o ../memarena.o ../mempool.o ../omt.o ../toku_assert.o ../ybt.o ../x1764.o ../trace_mem.o ../threadpool.o