Return NULL not -1

diff --git a/src/lib/unlang/xlat_inst.c b/src/lib/unlang/xlat_inst.c
index 97dc9ff8fb199faf6c55d84d1fbd0bd882c1bbb9..a85d1e6d35b8dc1d183e3cd21916c89b60437c3a 100644 (file)
--- a/src/lib/unlang/xlat_inst.c
+++ b/src/lib/unlang/xlat_inst.c
@@ -412,7 +412,7 @@ void xlat_thread_detach(void)
  */
 static int xlat_instantiate_init(void)
 {
-       if (unlikely(xlat_inst_tree)) return 0;
+       if (unlikely(xlat_inst_tree != NULL)) return 0;
 
        xlat_inst_tree = fr_heap_talloc_alloc(NULL, _xlat_inst_cmp, xlat_inst_t, idx, 0);
        if (!xlat_inst_tree) return -1;

diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c
index 0fc8a1eead34791beab25f692cf3f962a147b14b..265316f50601b3245ab4d69690e763af7999a386 100644 (file)
--- a/src/lib/unlang/xlat_tokenize.c
+++ b/src/lib/unlang/xlat_tokenize.c
@@ -170,7 +170,7 @@ xlat_exp_t *xlat_exp_func_alloc(TALLOC_CTX *ctx, xlat_t *func, xlat_exp_t const
        node->call.func = func;
        if (unlikely(xlat_copy(node, &node->child, args) < 0)) {
                talloc_free(node);
-               return -1;
+               return NULL;
        }
        node->flags = func->flags;