X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftal%2Fstr%2F_info;h=9b9c70b6be7f1198e684e23dc0bf892f41fbb04f;hp=24229bca287a09511a70b7ecd876071b91ef623a;hb=55d814230f7fb628bb5303cd53498209c7928040;hpb=f103f73ff040a8700a2bbd47948277e7c484baa2

diff --git a/ccan/tal/str/_info b/ccan/tal/str/_info
index 24229bca..9b9c70b6 100644
--- a/ccan/tal/str/_info
+++ b/ccan/tal/str/_info
@@ -1,17 +1,19 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * tal/str - string helper routines which use tal
  *
  * This is a grab bag of functions for string operations, designed to enhance
  * the standard string.h; these are separated from the non-tal-needing
- * string utilities in "str.h".
+ * string utilities in "str.h".  Each string created by this library
+ * will have tal_count() equal to strlen() + 1 (assuming you didn't create
+ * a string containing a NUL, such as using tal_fmt("%c", 0)).
  *
  * Example:
  *	#include <ccan/tal/str/str.h>
- *	#include <ccan/grab_file/grab_file.h>
+ *	#include <ccan/tal/grab_file/grab_file.h>
  *	#include <err.h>
  *
  *	// Dumb demo program to double-linespace a file.
@@ -20,14 +22,16 @@
  *		char *textfile;
  *		char **lines;
  *
+ *		if (argc > 2)
+ *			errx(1, "Takes 0 or 1 arguments");
  *		// Grab lines in file.
- *		textfile = grab_file(NULL, argv[1], NULL);
+ *		textfile = grab_file(NULL, argv[1]);
  *		if (!textfile)
  *			err(1, "Failed reading %s", argv[1]);
- *		lines = strsplit(textfile, textfile, "\n", STR_EMPTY_OK);
+ *		lines = tal_strsplit(textfile, textfile, "\n", STR_EMPTY_OK);
  *
  *		// Join them back together with two linefeeds.
- *		printf("%s", strjoin(textfile, lines, "\n\n", STR_TRAIL));
+ *		printf("%s", tal_strjoin(textfile, lines, "\n\n", STR_TRAIL));
  *
  *		// Free everything, just because we can.
  *		tal_free(textfile);
@@ -44,7 +48,11 @@ int main(int argc, char *argv[])
 
 	if (strcmp(argv[1], "depends") == 0) {
 		printf("ccan/str\n");
+#ifdef TAL_USE_TALLOC
+		printf("ccan/tal/talloc\n");
+#else
 		printf("ccan/tal\n");
+#endif
 		printf("ccan/take\n");
 		return 0;
 	}