utf8: don't allow NUL in decoded strings.

[ccan] / tools / ccanlint / tests / depends_build_without_features.c

diff --git a/tools/ccanlint/tests/depends_build_without_features.c b/tools/ccanlint/tests/depends_build_without_features.c
index b75ebefd5e18f0f831739a4589ae0680820fc028..cacb5002532c8f8f0e8b39c4d7bb39956f722c57 100644 (file)
--- a/tools/ccanlint/tests/depends_build_without_features.c
+++ b/tools/ccanlint/tests/depends_build_without_features.c
@@ -1,6 +1,5 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>

-#include <ccan/talloc/talloc.h>

 #include <ccan/str/str.h>
 #include <ccan/foreach/foreach.h>
 #include <sys/types.h>
 #include <ccan/str/str.h>
 #include <ccan/foreach/foreach.h>
 #include <sys/types.h>


@@ -17,7 +16,7 @@
 #include "reduce_features.h"
 #include "build.h"
 
 #include "reduce_features.h"
 #include "build.h"
 

-static const char *can_build(struct manifest *m)
+static const char *can_build(struct manifest *m UNNEEDED)

 {
        if (safe_mode)
                return "Safe mode enabled";
 {
        if (safe_mode)
                return "Safe mode enabled";


@@ -25,15 +24,14 @@ static const char *can_build(struct manifest *m)
 }
 
 static void check_depends_built_without_features(struct manifest *m,
 }
 
 static void check_depends_built_without_features(struct manifest *m,

-                                                unsigned int *timeleft,
+                                                unsigned int *timeleft UNNEEDED,

                                                 struct score *score)
 {
        struct list_head *list;
        struct manifest *i;
        char *flags;
 
                                                 struct score *score)
 {
        struct list_head *list;
        struct manifest *i;
        char *flags;
 

-       flags = talloc_asprintf(score, "%s %s", cflags,
-                               REDUCE_FEATURES_FLAGS);
+       flags = tal_fmt(score, "%s %s", cflags, REDUCE_FEATURES_FLAGS);

 
        foreach_ptr(list, &m->deps, &m->test_deps) {
                list_for_each(list, i, list) {
 
        foreach_ptr(list, &m->deps, &m->test_deps) {
                list_for_each(list, i, list) {


@@ -41,12 +39,11 @@ static void check_depends_built_without_features(struct manifest *m,
                                                       COMPILE_NOFEAT);
 
                        if (errstr) {
                                                       COMPILE_NOFEAT);
 
                        if (errstr) {

-                               score->error = talloc_asprintf(score,
-                                                              "Dependency %s"
-                                                              " did not"
-                                                              " build:\n%s",
-                                                              i->modname,
-                                                              errstr);
+                               score->error = tal_fmt(score,
+                                                      "Dependency %s"
+                                                      " did not build:\n%s",
+                                                      i->modname,
+                                                      errstr);

                                return;
                        }
                }
                                return;
                        }
                }