summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
078a975)
For str_talloc and grab_file, avoid using ccan/str (it's just for tests).
return 1;
if (strcmp(argv[1], "depends") == 0) {
return 1;
if (strcmp(argv[1], "depends") == 0) {
- printf("ccan/talloc\n");
printf("ccan/noerr\n");
printf("ccan/read_write_all\n"); /* For tests */
printf("ccan/noerr\n");
printf("ccan/read_write_all\n"); /* For tests */
+ printf("ccan/talloc\n");
return 1;
if (strcmp(argv[1], "depends") == 0) {
return 1;
if (strcmp(argv[1], "depends") == 0) {
+#if !HAVE_COMPOUND_LITERALS || !HAVE_FOR_LOOP_DECLARATION
+ printf("ccan/list\n");
+#endif
+#if !HAVE_COMPOUND_LITERALS || !HAVE_FOR_LOOP_DECLARATION
#include <ccan/foreach/foreach.h>
#include <ccan/list/list.h>
#include <stdint.h>
#include <stdlib.h>
#include <stdarg.h>
#include <ccan/foreach/foreach.h>
#include <ccan/list/list.h>
#include <stdint.h>
#include <stdlib.h>
#include <stdarg.h>
-#if !HAVE_COMPOUND_LITERALS || !HAVE_FOR_LOOP_DECLARATION
/* This list is normally very short. */
static LIST_HEAD(iters);
/* This list is normally very short. */
static LIST_HEAD(iters);
#include <ccan/grab_file/grab_file.c>
#include <ccan/tap/tap.h>
#include <ccan/str_talloc/str_talloc.h>
#include <ccan/grab_file/grab_file.c>
#include <ccan/tap/tap.h>
#include <ccan/str_talloc/str_talloc.h>
-#include <ccan/str/str.h>
int
main(int argc, char *argv[])
int
main(int argc, char *argv[])
str = grab_file(NULL, "test/run-grab.c", NULL);
split = strsplit(NULL, str, "\n", NULL);
length = strlen(split[0]);
str = grab_file(NULL, "test/run-grab.c", NULL);
split = strsplit(NULL, str, "\n", NULL);
length = strlen(split[0]);
- ok1(streq(split[0], "/* This is test for grab_file() function"));
+ ok1(!strcmp(split[0], "/* This is test for grab_file() function"));
for (i = 1; split[i]; i++)
length += strlen(split[i]);
for (i = 1; split[i]; i++)
length += strlen(split[i]);
- ok1(streq(split[i-1], "/* End of grab_file() test */"));
+ ok1(!strcmp(split[i-1], "/* End of grab_file() test */"));
if (stat("test/run-grab.c", &st) != 0)
/* FIXME: ditto */
if (stat("ccan/grab_file/test/run-grab.c", &st) != 0)
if (stat("test/run-grab.c", &st) != 0)
/* FIXME: ditto */
if (stat("ccan/grab_file/test/run-grab.c", &st) != 0)
/**
* hashtable - hash table routines
/**
* hashtable - hash table routines
return 1;
if (strcmp(argv[1], "depends") == 0) {
return 1;
if (strcmp(argv[1], "depends") == 0) {
+ printf("ccan/typesafe_cb\n");
#include <stdio.h>
#include <ccan/str_talloc/str_talloc.c>
#include <ccan/tap/tap.h>
#include <stdio.h>
#include <ccan/str_talloc/str_talloc.c>
#include <ccan/tap/tap.h>
-#include <ccan/str/str.h>
/* FIXME: ccanize */
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
/* FIXME: ccanize */
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
plan_tests(19);
split = strsplit(NULL, "hello world", " ", &n);
ok1(n == 3);
plan_tests(19);
split = strsplit(NULL, "hello world", " ", &n);
ok1(n == 3);
- ok1(streq(split[0], "hello"));
- ok1(streq(split[1], ""));
- ok1(streq(split[2], "world"));
+ ok1(!strcmp(split[0], "hello"));
+ ok1(!strcmp(split[1], ""));
+ ok1(!strcmp(split[2], "world"));
ok1(split[3] == NULL);
talloc_free(split);
split = strsplit(NULL, "hello world", " ", NULL);
ok1(split[3] == NULL);
talloc_free(split);
split = strsplit(NULL, "hello world", " ", NULL);
- ok1(streq(split[0], "hello"));
- ok1(streq(split[1], ""));
- ok1(streq(split[2], "world"));
+ ok1(!strcmp(split[0], "hello"));
+ ok1(!strcmp(split[1], ""));
+ ok1(!strcmp(split[2], "world"));
ok1(split[3] == NULL);
talloc_free(split);
split = strsplit(NULL, "hello world", "o ", NULL);
ok1(split[3] == NULL);
talloc_free(split);
split = strsplit(NULL, "hello world", "o ", NULL);
- ok1(streq(split[0], "hell"));
- ok1(streq(split[1], ""));
- ok1(streq(split[2], ""));
- ok1(streq(split[3], "w"));
- ok1(streq(split[4], "rld"));
+ ok1(!strcmp(split[0], "hell"));
+ ok1(!strcmp(split[1], ""));
+ ok1(!strcmp(split[2], ""));
+ ok1(!strcmp(split[3], "w"));
+ ok1(!strcmp(split[4], "rld"));
ok1(split[5] == NULL);
ctx = split;
ok1(split[5] == NULL);
ctx = split;
talloc_free(ctx);
str = strjoin(NULL, substrings, ", ");
talloc_free(ctx);
str = strjoin(NULL, substrings, ", ");
- ok1(streq(str, "far, bar, baz, b, ba, z, ar, "));
+ ok1(!strcmp(str, "far, bar, baz, b, ba, z, ar, "));
ctx = str;
str = strjoin(ctx, substrings, "");
ctx = str;
str = strjoin(ctx, substrings, "");
- ok1(streq(str, "farbarbazbbazar"));
+ ok1(!strcmp(str, "farbarbazbbazar"));
ok1(talloc_parent(str) == ctx);
talloc_free(ctx);
ok1(talloc_parent(str) == ctx);
talloc_free(ctx);