The branch, master has been updated
via 1f7da1c tdb: change version to 1.3.1
via 5355f5e tdb:tools: fix a compiler warning
from df800ea Add test suite for iconv conversion fail of bad names over
SMB1/SMB3.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1f7da1ca7f76cc30c5a753da85184e3e19967769
Author: Michael Adam <[email protected]>
Date: Wed Jun 11 13:23:33 2014 +0200
tdb: change version to 1.3.1
* internal code cleanup
* improved free record detection with a highly contended freelist
on tdb's with dead record support (TDB_VOLATILE).
* implicit defragmentation of the free list.
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Tue Sep 16 12:13:31 CEST 2014 on sn-devel-104
commit 5355f5e4e0421365ba10b0f20a58c8dda99f1b9f
Author: Stefan Metzmacher <[email protected]>
Date: Thu Jul 3 13:34:09 2014 +0200
tdb:tools: fix a compiler warning
../../tdb/tools/tdbtool.c: In function ‘do_command’:
../../tdb/tools/tdbtool.c:717: error: declaration of ‘count’ shadows a
global declaration
../../tdb/tools/tdbtool.c:597: error: shadowed declaration is here
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
lib/tdb/ABI/{tdb-1.3.0.sigs => tdb-1.3.1.sigs} | 0
lib/tdb/tools/tdbtool.c | 8 ++++----
lib/tdb/wscript | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
copy lib/tdb/ABI/{tdb-1.3.0.sigs => tdb-1.3.1.sigs} (100%)
Changeset truncated at 500 lines:
diff --git a/lib/tdb/ABI/tdb-1.3.0.sigs b/lib/tdb/ABI/tdb-1.3.1.sigs
similarity index 100%
copy from lib/tdb/ABI/tdb-1.3.0.sigs
copy to lib/tdb/ABI/tdb-1.3.1.sigs
diff --git a/lib/tdb/tools/tdbtool.c b/lib/tdb/tools/tdbtool.c
index 780782b..beb3af1 100644
--- a/lib/tdb/tools/tdbtool.c
+++ b/lib/tdb/tools/tdbtool.c
@@ -714,13 +714,13 @@ static int do_command(void)
tdb_printfreelist(tdb);
return 0;
case CMD_FREELIST_SIZE: {
- int count;
+ int size;
- count = tdb_freelist_size(tdb);
- if (count < 0) {
+ size = tdb_freelist_size(tdb);
+ if (size < 0) {
printf("Error getting freelist size.\n");
} else {
- printf("freelist size: %d\n", count);
+ printf("freelist size: %d\n", size);
}
return 0;
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 688eef2..dbbcaf3 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -1,7 +1,7 @@
#!/usr/bin/env python
APPNAME = 'tdb'
-VERSION = '1.3.0'
+VERSION = '1.3.1'
blddir = 'bin'
--
Samba Shared Repository
