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

[tridge at samba.org]

Author: tridge
Date: 2005-07-12 05:56:06 +0000 (Tue, 12 Jul 2005)
New Revision: 8342

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

Log:
allow ldb_ldif_read_string() to continue in the string, so you can
read multiple records

Modified:
   branches/SAMBA_4_0/source/lib/gendb.c
   branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c
   branches/SAMBA_4_0/source/lib/ldb/include/ldb.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/gendb.c
===================================================================
--- branches/SAMBA_4_0/source/lib/gendb.c	2005-07-12 05:54:21 UTC (rev 8341)
+++ branches/SAMBA_4_0/source/lib/gendb.c	2005-07-12 05:56:06 UTC (rev 8342)
@@ -99,7 +99,7 @@
 {
 	struct ldb_ldif *ldif;
 	int ret;
-	ldif = ldb_ldif_read_string(ldb, ldif_string);
+	ldif = ldb_ldif_read_string(ldb, &ldif_string);
 	if (ldif == NULL) return -1;
 	ret = ldb_add(ldb, ldif->msg);
 	talloc_free(ldif);

Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c	2005-07-12 05:54:21 UTC (rev 8341)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c	2005-07-12 05:56:06 UTC (rev 8342)
@@ -728,11 +728,14 @@
 	return EOF;
 }
 
-struct ldb_ldif *ldb_ldif_read_string(struct ldb_context *ldb, const char *s)
+struct ldb_ldif *ldb_ldif_read_string(struct ldb_context *ldb, const char **s)
 {
 	struct ldif_read_string_state state;
-	state.s = s;
-	return ldb_ldif_read(ldb, fgetc_string, &state);
+	struct ldb_ldif *ldif;
+	state.s = *s;
+	ldif = ldb_ldif_read(ldb, fgetc_string, &state);
+	*s = state.s;
+	return ldif;
 }
 
 

Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/include/ldb.h	2005-07-12 05:54:21 UTC (rev 8341)
+++ branches/SAMBA_4_0/source/lib/ldb/include/ldb.h	2005-07-12 05:56:06 UTC (rev 8342)
@@ -316,7 +316,7 @@
 struct ldb_ldif *ldb_ldif_read(struct ldb_context *ldb, 
 			       int (*fgetc_fn)(void *), void *private_data);
 struct ldb_ldif *ldb_ldif_read_file(struct ldb_context *ldb, FILE *f);
-struct ldb_ldif *ldb_ldif_read_string(struct ldb_context *ldb, const char *s);
+struct ldb_ldif *ldb_ldif_read_string(struct ldb_context *ldb, const char **s);
 int ldb_ldif_write_file(struct ldb_context *ldb, FILE *f, const struct ldb_ldif *msg);
 char *ldb_base64_encode(void *mem_ctx, const char *buf, int len);
 int ldb_base64_decode(char *s);