Replace short-lived NULL talloc contexts with talloc_tos().

Jeremy.

3 files changed, 22 insertions, 22 deletions

diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index a1663c1f38..272f107138 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -753,7 +753,7 @@ size_t unix_strupper(const char *src, size_t srclen, char *dest, size_t destlen)
 	size_t size;
 	smb_ucs2_t *buffer;
 
-	if (!push_ucs2_talloc(NULL, &buffer, src, &size)) {
+	if (!push_ucs2_talloc(talloc_tos(), &buffer, src, &size)) {
 		return (size_t)-1;
 	}
 
@@ -837,7 +837,7 @@ size_t unix_strlower(const char *src, size_t srclen, char *dest, size_t destlen)
 	size_t size;
 	smb_ucs2_t *buffer = NULL;
 
-	if (!convert_string_talloc(NULL, CH_UNIX, CH_UTF16LE, src, srclen,
+	if (!convert_string_talloc(talloc_tos(), CH_UNIX, CH_UTF16LE, src, srclen,
 				   (void **)(void *)&buffer, &size,
 				   True))
 	{
@@ -951,7 +951,7 @@ size_t push_ascii_nstring(void *dest, const char *src)
 	smb_ucs2_t *buffer;
 
 	conv_silent = True;
-	if (!push_ucs2_talloc(NULL, &buffer, src, &buffer_len)) {
+	if (!push_ucs2_talloc(talloc_tos(), &buffer, src, &buffer_len)) {
 		smb_panic("failed to create UCS2 buffer");
 	}
 
@@ -1268,7 +1268,7 @@ static size_t push_utf8(void *dest, const char *src, size_t dest_len, int flags)
 	}
 
 	if (flags & STR_UPPER) {
-		tmpbuf = strupper_talloc(NULL, src);
+		tmpbuf = strupper_talloc(talloc_tos(), src);
 		if (!tmpbuf) {
 			return (size_t)-1;
 		}
diff --git a/source3/lib/dbwrap_tdb.c b/source3/lib/dbwrap_tdb.c
index c71e073b41..297a351764 100644
--- a/source3/lib/dbwrap_tdb.c
+++ b/source3/lib/dbwrap_tdb.c
@@ -94,7 +94,7 @@ static struct db_record *db_tdb_fetch_locked(struct db_context *db,
 
 	/* Do not accidently allocate/deallocate w/o need when debug level is lower than needed */
 	if(DEBUGLEVEL >= 10) {
-		char *keystr = hex_encode_talloc(NULL, (unsigned char*)key.dptr, key.dsize);
+		char *keystr = hex_encode_talloc(talloc_tos(), (unsigned char*)key.dptr, key.dsize);
 		DEBUG(10, (DEBUGLEVEL > 10
 			   ? "Locking key %s\n" : "Locking key %.20s\n",
 			   keystr));
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 0aff9439e9..c197fd7515 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -96,14 +96,14 @@ int StrCaseCmp(const char *s, const char *t)
 			return +1;
 	}
 
-	if (!push_ucs2_talloc(NULL, &buffer_s, ps, &size)) {
+	if (!push_ucs2_talloc(talloc_tos(), &buffer_s, ps, &size)) {
 		return strcmp(ps, pt);
 		/* Not quite the right answer, but finding the right one
 		   under this failure case is expensive, and it's pretty
 		   close */
 	}
 
-	if (!push_ucs2_talloc(NULL, &buffer_t, pt, &size)) {
+	if (!push_ucs2_talloc(talloc_tos(), &buffer_t, pt, &size)) {
 		TALLOC_FREE(buffer_s);
 		return strcmp(ps, pt);
 		/* Not quite the right answer, but finding the right one
@@ -157,14 +157,14 @@ int StrnCaseCmp(const char *s, const char *t, size_t len)
 		return 0;
 	}
 
-	if (!push_ucs2_talloc(NULL, &buffer_s, ps, &size)) {
+	if (!push_ucs2_talloc(talloc_tos(), &buffer_s, ps, &size)) {
 		return strncmp(ps, pt, len-n);
 		/* Not quite the right answer, but finding the right one
 		   under this failure case is expensive,
 		   and it's pretty close */
 	}
 
-	if (!push_ucs2_talloc(NULL, &buffer_t, pt, &size)) {
+	if (!push_ucs2_talloc(talloc_tos(), &buffer_t, pt, &size)) {
 		TALLOC_FREE(buffer_s);
 		return strncmp(ps, pt, len-n);
 		/* Not quite the right answer, but finding the right one
@@ -366,7 +366,7 @@ size_t str_charnum(const char *s)
 {
 	size_t ret, converted_size;
 	smb_ucs2_t *tmpbuf2 = NULL;
-	if (!push_ucs2_talloc(NULL, &tmpbuf2, s, &converted_size)) {
+	if (!push_ucs2_talloc(talloc_tos(), &tmpbuf2, s, &converted_size)) {
 		return 0;
 	}
 	ret = strlen_w(tmpbuf2);
@@ -384,7 +384,7 @@ size_t str_ascii_charnum(const char *s)
 {
 	size_t ret, converted_size;
 	char *tmpbuf2 = NULL;
-	if (!push_ascii_talloc(NULL, &tmpbuf2, s, &converted_size)) {
+	if (!push_ascii_talloc(talloc_tos(), &tmpbuf2, s, &converted_size)) {
 		return 0;
 	}
 	ret = strlen(tmpbuf2);
@@ -455,7 +455,7 @@ bool strhasupper(const char *s)
 	bool ret;
 	size_t converted_size;
 
-	if (!push_ucs2_talloc(NULL, &tmp, s, &converted_size)) {
+	if (!push_ucs2_talloc(talloc_tos(), &tmp, s, &converted_size)) {
 		return false;
 	}
 
@@ -480,7 +480,7 @@ bool strhaslower(const char *s)
 	bool ret;
 	size_t converted_size;
 
-	if (!push_ucs2_talloc(NULL, &tmp, s, &converted_size)) {
+	if (!push_ucs2_talloc(talloc_tos(), &tmp, s, &converted_size)) {
 		return false;
 	}
 
@@ -1177,7 +1177,7 @@ char *strchr_m(const char *src, char c)
 	s = src;
 #endif
 
-	if (!push_ucs2_talloc(NULL, &ws, s, &converted_size)) {
+	if (!push_ucs2_talloc(talloc_tos(), &ws, s, &converted_size)) {
 		/* Wrong answer, but what can we do... */
 		return strchr(src, c);
 	}
@@ -1187,7 +1187,7 @@ char *strchr_m(const char *src, char c)
 		return NULL;
 	}
 	*p = 0;
-	if (!pull_ucs2_talloc(NULL, &s2, ws, &converted_size)) {
+	if (!pull_ucs2_talloc(talloc_tos(), &s2, ws, &converted_size)) {
 		SAFE_FREE(ws);
 		/* Wrong answer, but what can we do... */
 		return strchr(src, c);
@@ -1248,7 +1248,7 @@ char *strrchr_m(const char *s, char c)
 		char *ret;
 		size_t converted_size;
 
-		if (!push_ucs2_talloc(NULL, &ws, s, &converted_size)) {
+		if (!push_ucs2_talloc(talloc_tos(), &ws, s, &converted_size)) {
 			/* Wrong answer, but what can we do. */
 			return strrchr(s, c);
 		}
@@ -1258,7 +1258,7 @@ char *strrchr_m(const char *s, char c)
 			return NULL;
 		}
 		*p = 0;
-		if (!pull_ucs2_talloc(NULL, &s2, ws, &converted_size)) {
+		if (!pull_ucs2_talloc(talloc_tos(), &s2, ws, &converted_size)) {
 			TALLOC_FREE(ws);
 			/* Wrong answer, but what can we do. */
 			return strrchr(s, c);
@@ -1283,7 +1283,7 @@ char *strnrchr_m(const char *s, char c, unsigned int n)
 	char *ret;
 	size_t converted_size;
 
-	if (!push_ucs2_talloc(NULL, &ws, s, &converted_size)) {
+	if (!push_ucs2_talloc(talloc_tos(), &ws, s, &converted_size)) {
 		/* Too hard to try and get right. */
 		return NULL;
 	}
@@ -1293,7 +1293,7 @@ char *strnrchr_m(const char *s, char c, unsigned int n)
 		return NULL;
 	}
 	*p = 0;
-	if (!pull_ucs2_talloc(NULL, &s2, ws, &converted_size)) {
+	if (!pull_ucs2_talloc(talloc_tos(), &s2, ws, &converted_size)) {
 		TALLOC_FREE(ws);
 		/* Too hard to try and get right. */
 		return NULL;
@@ -1352,12 +1352,12 @@ char *strstr_m(const char *src, const char *findstr)
 	s = src;
 #endif
 
-	if (!push_ucs2_talloc(NULL, &src_w, src, &converted_size)) {
+	if (!push_ucs2_talloc(talloc_tos(), &src_w, src, &converted_size)) {
 		DEBUG(0,("strstr_m: src malloc fail\n"));
 		return NULL;
 	}
 
-	if (!push_ucs2_talloc(NULL, &find_w, findstr, &converted_size)) {
+	if (!push_ucs2_talloc(talloc_tos(), &find_w, findstr, &converted_size)) {
 		TALLOC_FREE(src_w);
 		DEBUG(0,("strstr_m: find malloc fail\n"));
 		return NULL;
@@ -1372,7 +1372,7 @@ char *strstr_m(const char *src, const char *findstr)
 	}
 
 	*p = 0;
-	if (!pull_ucs2_talloc(NULL, &s2, src_w, &converted_size)) {
+	if (!pull_ucs2_talloc(talloc_tos(), &s2, src_w, &converted_size)) {
 		TALLOC_FREE(src_w);
 		TALLOC_FREE(find_w);
 		DEBUG(0,("strstr_m: dest malloc fail\n"));