svn commit: samba r19910 - in branches/SAMBA_4_0/source/lib/ldb/common: .

idra at samba.org idra at samba.org
Sun Nov 26 21:50:25 GMT 2006


Author: idra
Date: 2006-11-26 21:50:24 +0000 (Sun, 26 Nov 2006)
New Revision: 19910

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19910

Log:

Make better use of our set of talloc utility functions


Modified:
   branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c	2006-11-26 21:49:25 UTC (rev 19909)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c	2006-11-26 21:50:24 UTC (rev 19910)
@@ -1268,9 +1268,9 @@
 	/* Only domain components?  Finish here */
 	if (i < 0) {
 		if (ex_format) {
-			cracked = talloc_asprintf(tmpctx, "%s\n", cracked);
+			cracked = talloc_append_string(tmpctx, cracked, "\n");
 		} else {
-			cracked = talloc_asprintf(tmpctx, "%s/", cracked);
+			cracked = talloc_append_string(tmpctx, cracked, "/");
 		}
 		talloc_steal(mem_ctx, cracked);
 		goto done;
@@ -1278,7 +1278,7 @@
 
 	/* Now walk backwards appending remaining components */
 	for (; i > 0; i--) {
-		cracked = talloc_asprintf(tmpctx, "%s/%s", cracked, 
+		cracked = talloc_asprintf_append(cracked, "/%s", 
 					  ldb_dn_escape_value(tmpctx, dn->components[i].value));
 		if (!cracked) {
 			goto done;
@@ -1287,10 +1287,10 @@
 
 	/* Last one, possibly a newline for the 'ex' format */
 	if (ex_format) {
-		cracked = talloc_asprintf(tmpctx, "%s\n%s", cracked, 
+		cracked = talloc_asprintf_append(cracked, "\n%s",
 					  ldb_dn_escape_value(tmpctx, dn->components[i].value));
 	} else {
-		cracked = talloc_asprintf(tmpctx, "%s/%s", cracked, 
+		cracked = talloc_asprintf_append(cracked, "/%s", 
 					  ldb_dn_escape_value(tmpctx, dn->components[i].value));
 	}
 



More information about the samba-cvs mailing list