X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftal%2Fstr%2F_info;h=3037cfde2fba99fcf1e817c0117ed8b89909fee3;hp=24229bca287a09511a70b7ecd876071b91ef623a;hb=5877402640cff05f779b23a730e4cc62d729113f;hpb=f103f73ff040a8700a2bbd47948277e7c484baa2

diff --git a/ccan/tal/str/_info b/ccan/tal/str/_info
index 24229bca..3037cfde 100644
--- a/ccan/tal/str/_info
+++ b/ccan/tal/str/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * tal/str - string helper routines which use tal
@@ -11,7 +11,7 @@
  *
  * 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 +20,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 +46,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;
 	}