diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-02-04 09:56:24 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-04 09:56:24 +1100 |
commit | cbca41597e0829ee0b1535b2902696a448373045 (patch) | |
tree | e3162199c03f56f02382c8514c289aa238e605d0 /source4/lib | |
parent | 3231717e1485c70890c23fbfc3087d970a408815 (diff) | |
parent | c3008e086b1a87c5f4add2a7d1474c2f9a34bfd2 (diff) | |
download | samba-cbca41597e0829ee0b1535b2902696a448373045.tar.gz samba-cbca41597e0829ee0b1535b2902696a448373045.tar.bz2 samba-cbca41597e0829ee0b1535b2902696a448373045.zip |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 377a7c633d4813c134b91739c507dcefb55c9691)
Diffstat (limited to 'source4/lib')
-rw-r--r-- | source4/lib/tdb/common/transaction.c | 3 | ||||
-rw-r--r-- | source4/lib/util/debug.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/source4/lib/tdb/common/transaction.c b/source4/lib/tdb/common/transaction.c index c3e7a4e2c0..4e2127be64 100644 --- a/source4/lib/tdb/common/transaction.c +++ b/source4/lib/tdb/common/transaction.c @@ -321,6 +321,9 @@ static int transaction_write_existing(struct tdb_context *tdb, tdb_off_t off, if (blk == tdb->transaction->num_blocks-1 && off + len > tdb->transaction->last_block_size) { + if (off >= tdb->transaction->last_block_size) { + return 0; + } len = tdb->transaction->last_block_size - off; } diff --git a/source4/lib/util/debug.h b/source4/lib/util/debug.h index 1895ed53ad..605628174a 100644 --- a/source4/lib/util/debug.h +++ b/source4/lib/util/debug.h @@ -41,13 +41,17 @@ struct debug_ops { extern int DEBUGLEVEL; +#define debug_ctx() (_debug_ctx?_debug_ctx:(_debug_ctx=talloc_new(NULL))) + #define DEBUGLVL(level) ((level) <= DEBUGLEVEL) #define _DEBUG(level, body, header) do { \ if (DEBUGLVL(level)) { \ + void* _debug_ctx=NULL; \ if (header) { \ do_debug_header(level, __location__, __FUNCTION__); \ } \ do_debug body; \ + talloc_free(_debug_ctx); \ } \ } while (0) /** |