The branch, master has been updated
via 7119241c0d12768b31ebdb489aa0bbba6ca21e40 (commit)
via 30b2014a01b31d66dd76e0562c5d769dfacf167b (commit)
via 2738178d1301f9c1c4144c7472c9419911cd816e (commit)
from b54e48b830dbc3d66f9de5d2711a57a1630809e2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7119241c0d12768b31ebdb489aa0bbba6ca21e40
Author: Simo Sorce i...@samba.org
Date: Fri Jul 3 08:42:23 2009 -0400
Sort the signature files
commit 30b2014a01b31d66dd76e0562c5d769dfacf167b
Author: Simo Sorce i...@samba.org
Date: Thu Jun 18 20:06:00 2009 -0400
Expose functions need by backend writers
move publicly needed structures and functions in the public header.
Stop installing internal headers.
Update the signature and exports files with the new exposed
function.
commit 2738178d1301f9c1c4144c7472c9419911cd816e
Author: Simo Sorce i...@samba.org
Date: Thu Jul 2 09:29:20 2009 -0400
Restore ABI compatibility for talloc.
---
Summary of changes:
lib/talloc/abi_checks.sh |6 ++-
lib/talloc/configure.ac |2 +-
lib/talloc/talloc.c | 43 +--
lib/talloc/talloc.exports|6 ++-
lib/talloc/talloc.h | 14 ---
lib/talloc/talloc.signatures | 95 +
lib/tdb/abi_checks.sh|2 +-
lib/tdb/tdb.signatures | 86 +++---
lib/tevent/abi_checks.sh |4 +-
lib/tevent/tevent.exports|1 +
lib/tevent/tevent.h | 64
lib/tevent/tevent.mk |1 -
lib/tevent/tevent.signatures | 85 +++--
lib/tevent/tevent_internal.h | 50 --
source3/configure.in |2 +-
source4/min_versions.m4 |2 +-
16 files changed, 262 insertions(+), 201 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/abi_checks.sh b/lib/talloc/abi_checks.sh
index 432cc87..e3d3b04 100755
--- a/lib/talloc/abi_checks.sh
+++ b/lib/talloc/abi_checks.sh
@@ -4,15 +4,17 @@ make clean
mkdir abi
ABI_CHECKS=-aux-info abi/\...@.x
-make ABI_CHECK=$ABI_CHECKS
+make ABI_CHECK=$ABI_CHECKS CC=/usr/bin/gcc
-for i in abi/*.X; do cat $i | grep 'talloc\.h'; done | sort | uniq | awk -F
extern '{ print $2 }' abi/signatures
+for i in abi/*.X; do cat $i | grep 'talloc\.h'; done | sort | uniq | awk -F
extern '{ print $2 }' | sort abi/signatures
cat abi/exports EOF
{
global:
EOF
cat abi/signatures | awk -F '(' '{ print $1 }' | awk -F ' ' '{ print
$NF; }' | tr -d '*' | sort abi/exports
+# need to manually add talloc free for backward ABI compat
+echo ' talloc_free;' abi/exports
cat abi/exports EOF
local: *;
diff --git a/lib/talloc/configure.ac b/lib/talloc/configure.ac
index d6471a4..161f6f7 100644
--- a/lib/talloc/configure.ac
+++ b/lib/talloc/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.50)
-AC_INIT(talloc, 2.0.0)
+AC_INIT(talloc, 1.4.0)
AC_CONFIG_SRCDIR([talloc.c])
AC_SUBST(datarootdir)
AC_CONFIG_HEADER(config.h)
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index a23df38..8ccebe2 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -477,7 +477,7 @@ static inline void *_talloc_named_const(const void
*context, size_t size, const
same underlying data, and you want to be able to free the two instances
separately,
and in either order
*/
-void *_talloc_reference(const void *context, const void *ptr, const char
*location)
+void *_talloc_reference_loc(const void *context, const void *ptr, const char
*location)
{
struct talloc_chunk *tc;
struct talloc_reference_handle *handle;
@@ -499,6 +499,7 @@ void *_talloc_reference(const void *context, const void
*ptr, const char *locati
return handle-ptr;
}
+static void *_talloc_steal_internal(const void *new_ctx, const void *ptr);
/*
internal talloc_free call
@@ -613,7 +614,7 @@ static inline int _talloc_free_internal(void *ptr)
ptr on success, or NULL if it could not be transferred.
passing NULL as ptr will always return NULL with no side effects.
*/
-void *_talloc_steal_internal(const void *new_ctx, const void *ptr)
+static void *_talloc_steal_internal(const void *new_ctx, const void *ptr)
{
struct talloc_chunk *tc, *new_tc;
@@ -665,13 +666,12 @@ void *_talloc_steal_internal(const void *new_ctx, const
void *ptr)
return discard_const_p(void, ptr);
}
-
/*
move a lump of memory from one talloc context to another return the
ptr on success, or NULL if it could not be transferred.
passing NULL as ptr will always return NULL with no side effects.
*/
-void *_talloc_steal(const void *new_ctx, const void *ptr, const char *location)
+void *_talloc_steal_loc(const void
