The branch, master has been updated
via 2775c52baabc042089c7d1663d1fedb9b189bfab (commit)
via 7e8b3d8c06840d09d4658f0b3651c7e2af120acf (commit)
from b5ac1068d13ffc83369d8dc7637a4c482d2815dc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2775c52baabc042089c7d1663d1fedb9b189bfab
Author: Günther Deschner <[email protected]>
Date: Sun Jun 7 16:04:07 2009 +0200
s3-charcnv: remove remaining malloc references in convert_string_talloc().
Guenther
commit 7e8b3d8c06840d09d4658f0b3651c7e2af120acf
Author: Günther Deschner <[email protected]>
Date: Sun Jun 7 15:59:20 2009 +0200
nss_wrapper: add my copyright.
Guenther
-----------------------------------------------------------------------
Summary of changes:
lib/nss_wrapper/nss_wrapper.c | 1 +
source3/lib/charcnv.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/nss_wrapper/nss_wrapper.c b/lib/nss_wrapper/nss_wrapper.c
index ad0d8ba..dc2d4f5 100644
--- a/lib/nss_wrapper/nss_wrapper.c
+++ b/lib/nss_wrapper/nss_wrapper.c
@@ -1,5 +1,6 @@
/*
* Copyright (C) Stefan Metzmacher 2007 <[email protected]>
+ * Copyright (C) Guenther Deschner 2009 <[email protected]>
*
* All rights reserved.
*
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 1f2fa63..bb9b205 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -558,7 +558,7 @@ bool convert_string_talloc(TALLOC_CTX *ctx, charset_t from,
charset_t to,
return false;
}
if (srclen == 0) {
- ob = ((ctx != NULL) ? talloc_strdup(ctx, "") : SMB_STRDUP(""));
+ ob = talloc_strdup(ctx, "");
if (ob == NULL) {
errno = ENOMEM;
return false;
@@ -587,7 +587,7 @@ bool convert_string_talloc(TALLOC_CTX *ctx, charset_t from,
charset_t to,
if (!conv_silent)
DEBUG(0, ("convert_string_talloc: destlen wrapped
!\n"));
if (!ctx)
- SAFE_FREE(outbuf);
+ TALLOC_FREE(outbuf);
errno = EOPNOTSUPP;
return false;
} else {
--
Samba Shared Repository
