Kaynağa Gözat

ncd: modules: remove logging about errors from NCDVal functions

ambrop7 13 yıl önce
ebeveyn
işleme
a0ca8e1a6a

+ 0 - 6
ncd/modules/arithmetic.c

@@ -216,9 +216,6 @@ static int boolean_func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem,
     
     if (name == NCD_STRING_EMPTY) {
         *out = ncd_make_boolean(mem, o->value, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     
@@ -271,9 +268,6 @@ static int number_func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem,
     
     if (name == NCD_STRING_EMPTY) {
         *out = ncd_make_uintmax(mem, o->value);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_uintmax failed");
-        }
         return 1;
     }
     

+ 0 - 1
ncd/modules/call.c

@@ -217,7 +217,6 @@ static void func_new (void *vo, NCDModuleInst *i, const struct NCDModuleInst_new
         // copy arguments
         NCDValRef args = NCDVal_NewCopy(&o->args_mem, args_arg);
         if (NCDVal_IsInvalid(args)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewCopy failed");
             NCDValMem_Free(&o->args_mem);
             goto fail0;
         }

+ 0 - 3
ncd/modules/choose.c

@@ -124,9 +124,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
     
     if (name == NCD_STRING_EMPTY) {
         *out = NCDVal_NewCopy(mem, o->result);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewCopy failed");
-        }
         return 1;
     }
     

+ 0 - 3
ncd/modules/concat.c

@@ -160,9 +160,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
     
     if (name == NCD_STRING_EMPTY) {
         *out = NCDVal_NewExternalString(mem, o->result->data, o->result->length, &o->result->ref_target);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewExternalString failed");
-        }
         return 1;
     }
     

+ 0 - 3
ncd/modules/event_template.c

@@ -129,9 +129,6 @@ int event_template_getvar (event_template *o, const char *name, NCDValMem *mem,
     }
     
     *out = NCDVal_NewString(mem, val);
-    if (NCDVal_IsInvalid(*out)) {
-        TemplateLog(o, BLOG_ERROR, "NCDVal_NewString failed");
-    }
     return 1;
 }
 

+ 0 - 3
ncd/modules/explode.c

@@ -194,18 +194,15 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
     if (name == NCD_STRING_EMPTY) {
         *out = NCDVal_NewList(mem, o->num);
         if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewList failed");
             goto fail;
         }
         for (size_t j = 0; j < o->num; j++) {
             struct substring *elem = &((struct substring *)o->arr.v)[j];
             NCDValRef str = NCDVal_NewStringBin(mem, (uint8_t *)elem->data, elem->len);
             if (NCDVal_IsInvalid(str)) {
-                ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewStringBin failed");
                 goto fail;
             }
             if (!NCDVal_ListAppend(*out, str)) {
-                ModuleLog(o->i, BLOG_ERROR, "NCDVal_ListAppend failed");
                 goto fail;
             }
         }

+ 0 - 12
ncd/modules/file.c

@@ -168,9 +168,6 @@ static int read_func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NC
     
     if (name == NCD_STRING_EMPTY) {
         *out = NCDVal_NewStringBin(mem, o->file_data, o->file_len);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewStringBin failed");
-        }
         return 1;
     }
     
@@ -282,9 +279,6 @@ static int stat_func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NC
     
     if (name == strings[STRING_SUCCEEDED].id) {
         *out = ncd_make_boolean(mem, o->succeeded, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     
@@ -312,9 +306,6 @@ static int stat_func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NC
         }
         
         *out = NCDVal_NewString(mem, str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     
@@ -327,9 +318,6 @@ static int stat_func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NC
         }
         
         *out = NCDVal_NewString(mem, str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     

+ 0 - 9
ncd/modules/file_open.c

@@ -294,9 +294,6 @@ static int open_func_getvar (void *vo, NCD_string_id_t name, NCDValMem *mem, NCD
     
     if (name == strings[STRING_IS_ERROR].id) {
         *out = ncd_make_boolean(mem, !o->fh, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     
@@ -380,17 +377,11 @@ static int read_func_getvar (void *vo, NCD_string_id_t name, NCDValMem *mem, NCD
     
     if (name == NCD_STRING_EMPTY) {
         *out = NCDVal_NewExternalString(mem, NCDBuf_Data(o->buf), o->length, NCDBuf_RefTarget(o->buf));
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewExternalString failed");
-        }
         return 1;
     }
     
     if (name == strings[STRING_NOT_EOF].id) {
         *out = ncd_make_boolean(mem, (o->length != 0), o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     

+ 0 - 12
ncd/modules/foreach.c

@@ -429,9 +429,6 @@ static int element_list_index_object_func_getvar (const NCDObject *obj, NCD_stri
     }
     
     *out = ncd_make_uintmax(mem, e->i);
-    if (NCDVal_IsInvalid(*out)) {
-        ModuleLog(o->i, BLOG_ERROR, "ncd_make_uintmax failed");
-    }
     return 1;
 }
 
@@ -447,9 +444,6 @@ static int element_list_elem_object_func_getvar (const NCDObject *obj, NCD_strin
     }
     
     *out = NCDVal_NewCopy(mem, e->list_elem);
-    if (NCDVal_IsInvalid(*out)) {
-        ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewCopy failed");
-    }
     return 1;
 }
 
@@ -465,9 +459,6 @@ static int element_map_key_object_func_getvar (const NCDObject *obj, NCD_string_
     }
     
     *out = NCDVal_NewCopy(mem, e->map_key);
-    if (NCDVal_IsInvalid(*out)) {
-        ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewCopy failed");
-    }
     return 1;
 }
 
@@ -483,9 +474,6 @@ static int element_map_val_object_func_getvar (const NCDObject *obj, NCD_string_
     }
     
     *out = NCDVal_NewCopy(mem, e->map_val);
-    if (NCDVal_IsInvalid(*out)) {
-        ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewCopy failed");
-    }
     return 1;
 }
 

+ 0 - 3
ncd/modules/from_string.c

@@ -103,9 +103,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
     
     if (name == NCD_STRING_EMPTY) {
         *out = NCDVal_NewCopy(mem, o->val);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewCopy failed");
-        }
         return 1;
     }
     

+ 0 - 3
ncd/modules/implode.c

@@ -133,9 +133,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
     
     if (name == NCD_STRING_EMPTY) {
         *out = NCDVal_NewStringBin(mem, (uint8_t *)o->result, o->result_len);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewStringBin failed");
-        }
         return 1;
     }
     

+ 0 - 3
ncd/modules/index.c

@@ -136,9 +136,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
     
     if (!strcmp(name, "")) {
         *out = ncd_make_uintmax(mem, o->value);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_uintmax failed");
-        }
         return 1;
     }
     

+ 0 - 23
ncd/modules/list.c

@@ -155,7 +155,6 @@ static struct elem * insert_value (NCDModuleInst *i, struct instance *o, NCDValR
     
     e->val = NCDVal_NewCopy(&e->mem, val);
     if (NCDVal_IsInvalid(e->val)) {
-        ModuleLog(i, BLOG_ERROR, "NCDVal_NewCopy failed");
         goto fail1;
     }
     
@@ -295,7 +294,6 @@ static int list_to_value (NCDModuleInst *i, struct instance *o, NCDValMem *mem,
 {
     *out_val = NCDVal_NewList(mem, IndexedList_Count(&o->il));
     if (NCDVal_IsInvalid(*out_val)) {
-        ModuleLog(i, BLOG_ERROR, "NCDVal_NewList failed");
         goto fail;
     }
     
@@ -304,12 +302,10 @@ static int list_to_value (NCDModuleInst *i, struct instance *o, NCDValMem *mem,
         
         NCDValRef copy = NCDVal_NewCopy(mem, e->val);
         if (NCDVal_IsInvalid(copy)) {
-            ModuleLog(i, BLOG_ERROR, "NCDVal_NewCopy failed");
             goto fail;
         }
         
         if (!NCDVal_ListAppend(*out_val, copy)) {
-            ModuleLog(i, BLOG_ERROR, "depth limit exceeded");
             goto fail;
         }
     }
@@ -390,9 +386,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
     
     if (!strcmp(name, "length")) {
         *out = ncd_make_uintmax(mem, list_count(o));
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_uintmax failed");
-        }
         return 1;
     }
     
@@ -495,9 +488,6 @@ static int length_func_getvar (void *vo, const char *name, NCDValMem *mem, NCDVa
     
     if (!strcmp(name, "")) {
         *out = ncd_make_uintmax(mem, o->length);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_uintmax failed");
-        }
         return 1;
     }
     
@@ -543,7 +533,6 @@ static void get_func_new (void *vo, NCDModuleInst *i, const struct NCDModuleInst
     // copy value
     o->val = NCDVal_NewCopy(&o->mem, e->val);
     if (NCDVal_IsInvalid(o->val)) {
-        ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewCopy failed");
         goto fail1;
     }
     
@@ -574,9 +563,6 @@ static int get_func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRe
     
     if (!strcmp(name, "")) {
         *out = NCDVal_NewCopy(mem, o->val);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewCopy failed");
-        }
         return 1;
     }
     
@@ -652,9 +638,6 @@ static int contains_func_getvar (void *vo, const char *name, NCDValMem *mem, NCD
     
     if (!strcmp(name, "")) {
         *out = ncd_make_boolean(mem, o->contains, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     
@@ -719,17 +702,11 @@ static int find_func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValR
         }
         
         *out = NCDVal_NewString(mem, value);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     
     if (!strcmp(name, "found")) {
         *out = ncd_make_boolean(mem, o->is_found, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     

+ 0 - 3
ncd/modules/logical.c

@@ -129,9 +129,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
     
     if (name == NCD_STRING_EMPTY) {
         *out = ncd_make_boolean(mem, o->value, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     

+ 0 - 6
ncd/modules/net_backend_wpa_supplicant.c

@@ -536,17 +536,11 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
         }
         
         *out = NCDVal_NewString(mem, str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     
     if (!strcmp(name, "ssid")) {
         *out = NCDVal_NewString(mem, o->info_ssid);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     

+ 0 - 3
ncd/modules/net_ipv4_addr_in_network.c

@@ -142,9 +142,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
     
     if (!strcmp(name, "")) {
         *out = ncd_make_boolean(mem, o->value, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     

+ 0 - 3
ncd/modules/net_ipv4_arp_probe.c

@@ -189,9 +189,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
     
     if (!strcmp(name, "exists")) {
         *out = ncd_make_boolean(mem, o->state == STATE_EXIST, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     

+ 0 - 18
ncd/modules/net_ipv4_dhcp.c

@@ -232,9 +232,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
         ipaddr_print_addr(addr, str);
         
         *out = NCDVal_NewString(mem, str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     
@@ -254,9 +251,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
         sprintf(str, "%d", ifaddr.prefix);
         
         *out = NCDVal_NewString(mem, str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     
@@ -276,9 +270,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
         ipaddr_print_ifaddr(ifaddr, str);
         
         *out = NCDVal_NewString(mem, str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     
@@ -293,9 +284,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
         }
         
         *out = NCDVal_NewString(mem, str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     
@@ -305,7 +293,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
         
         *out = NCDVal_NewList(mem, num_servers);
         if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewList failed");
             goto fail;
         }
         
@@ -315,12 +302,10 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
             
             NCDValRef server = NCDVal_NewString(mem, str);
             if (NCDVal_IsInvalid(server)) {
-                ModuleLog(o->i, BLOG_ERROR, "NCDVal_IsInvalid failed");
                 goto fail;
             }
             
             if (!NCDVal_ListAppend(*out, server)) {
-                ModuleLog(o->i, BLOG_ERROR, "NCDVal_ListAppend failed");
                 goto fail;
             }
         }
@@ -337,9 +322,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
                 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
         
         *out = NCDVal_NewString(mem, str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     

+ 0 - 3
ncd/modules/net_ipv6_addr_in_network.c

@@ -142,9 +142,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
     
     if (!strcmp(name, "")) {
         *out = ncd_make_boolean(mem, o->value, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     

+ 0 - 9
ncd/modules/net_ipv6_wait_dynamic_addr.c

@@ -162,9 +162,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
         char str[IPADDR6_PRINT_MAX];
         ipaddr6_print_addr(o->ifaddr.addr, str);
         *out = NCDVal_NewString(mem, str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     
@@ -172,9 +169,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
         char str[10];
         sprintf(str, "%d", o->ifaddr.prefix);
         *out = NCDVal_NewString(mem, str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     
@@ -182,9 +176,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
         char str[IPADDR6_PRINT_MAX];
         ipaddr6_print_ifaddr(o->ifaddr, str);
         *out = NCDVal_NewString(mem, str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     

+ 0 - 6
ncd/modules/netmask.c

@@ -171,9 +171,6 @@ static int addr_func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NC
         ipaddr_print_addr(o->addr, buf);
         
         *out = NCDVal_NewString(mem, buf);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     
@@ -234,9 +231,6 @@ static int prefix_func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem,
         sprintf(buf, "%d", o->prefix);
         
         *out = NCDVal_NewString(mem, buf);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     

+ 0 - 21
ncd/modules/parse.c

@@ -102,7 +102,6 @@ static int parse_number (NCDModuleInst *i, const char *str, size_t str_len, NCDV
     
     *out = ncd_make_uintmax(mem, n);
     if (NCDVal_IsInvalid(*out)) {
-        ModuleLog(i, BLOG_ERROR, "ncd_make_uintmax failed");
         return 0;
     }
     
@@ -132,7 +131,6 @@ static int parse_ipv4_addr (NCDModuleInst *i, const char *str, size_t str_len, N
     
     *out = NCDVal_NewString(mem, buf);
     if (NCDVal_IsInvalid(*out)) {
-        ModuleLog(i, BLOG_ERROR, "NCDVal_NewString failed");
         return 0;
     }
     
@@ -152,7 +150,6 @@ static int parse_ipv6_addr (NCDModuleInst *i, const char *str, size_t str_len, N
     
     *out = NCDVal_NewString(mem, buf);
     if (NCDVal_IsInvalid(*out)) {
-        ModuleLog(i, BLOG_ERROR, "NCDVal_NewString failed");
         return 0;
     }
     
@@ -206,17 +203,11 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
     
     if (name == strings[STRING_SUCCEEDED].id) {
         *out = ncd_make_boolean(mem, o->succeeded, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     
     if (o->succeeded && name == NCD_STRING_EMPTY) {
         *out = NCDVal_NewCopy(mem, o->value);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewCopy failed");
-        }
         return 1;
     }
     
@@ -274,9 +265,6 @@ static int ipv4_cidr_addr_func_getvar2 (void *vo, NCD_string_id_t name, NCDValMe
     
     if (name == strings[STRING_SUCCEEDED].id) {
         *out = ncd_make_boolean(mem, o->succeeded, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     
@@ -300,9 +288,6 @@ static int ipv4_cidr_addr_func_getvar2 (void *vo, NCD_string_id_t name, NCDValMe
     }
     
     *out = NCDVal_NewString(mem, str);
-    if (NCDVal_IsInvalid(*out)) {
-        ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-    }
     return 1;
 }
 
@@ -337,9 +322,6 @@ static int ipv6_cidr_addr_func_getvar2 (void *vo, NCD_string_id_t name, NCDValMe
     
     if (name == strings[STRING_SUCCEEDED].id) {
         *out = ncd_make_boolean(mem, o->succeeded, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     
@@ -363,9 +345,6 @@ static int ipv6_cidr_addr_func_getvar2 (void *vo, NCD_string_id_t name, NCDValMe
     }
     
     *out = NCDVal_NewString(mem, str);
-    if (NCDVal_IsInvalid(*out)) {
-        ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-    }
     return 1;
 }
 

+ 0 - 9
ncd/modules/regex_match.c

@@ -162,9 +162,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
     
     if (!strcmp(name, "succeeded")) {
         *out = ncd_make_boolean(mem, o->succeeded, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     
@@ -181,9 +178,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
             size_t len = m->rm_eo - m->rm_so;
             
             *out = NCDVal_NewStringBin(mem, (uint8_t *)o->input + m->rm_so, len);
-            if (NCDVal_IsInvalid(*out)) {
-                ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewStringBin failed");
-            }
             return 1;
         }
     }
@@ -349,9 +343,6 @@ static int replace_func_getvar (void *vo, const char *name, NCDValMem *mem, NCDV
     
     if (!strcmp(name, "")) {
         *out = NCDVal_NewStringBin(mem, (uint8_t *)o->output, o->output_len);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewStringBin failed");
-        }
         return 1;
     }
     

+ 0 - 3
ncd/modules/runonce.c

@@ -302,9 +302,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
         snprintf(str, sizeof(str), "%d", o->exit_status);
         
         *out = NCDVal_NewString(mem, str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     

+ 0 - 12
ncd/modules/socket.c

@@ -701,9 +701,6 @@ static int connect_func_getvar (void *vo, NCD_string_id_t name, NCDValMem *mem,
     if (name == strings[STRING_IS_ERROR].id) {
         int is_error = (o->state == CONNECTION_STATE_ERROR);
         *out = ncd_make_boolean(mem, is_error, o->connect.i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->connect.i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     
@@ -792,17 +789,11 @@ static int read_func_getvar (void *vo, NCD_string_id_t name, NCDValMem *mem, NCD
     
     if (name == NCD_STRING_EMPTY) {
         *out = NCDVal_NewExternalString(mem, NCDBuf_Data(o->buf), o->read_size, NCDBuf_RefTarget(o->buf));
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewExternalString failed");
-        }
         return 1;
     }
     
     if (name == strings[STRING_NOT_EOF].id) {
         *out = ncd_make_boolean(mem, (o->read_size != 0), o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     
@@ -1013,9 +1004,6 @@ static int listen_func_getvar (void *vo, NCD_string_id_t name, NCDValMem *mem, N
     
     if (name == strings[STRING_IS_ERROR].id) {
         *out = ncd_make_boolean(mem, o->have_error, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     

+ 0 - 3
ncd/modules/strcmp.c

@@ -86,9 +86,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
     
     if (name == NCD_STRING_EMPTY) {
         *out = ncd_make_boolean(mem, o->result, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     

+ 0 - 3
ncd/modules/substr.c

@@ -81,9 +81,6 @@ static int substr_func_getvar (void *vo, NCD_string_id_t name, NCDValMem *mem, N
         } else {
             *out = NCDVal_NewStringBin(mem, (const uint8_t *)o->data, o->length);
         }
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewExternalString/NCDVal_NewStringBin failed");
-        }
         return 1;
     }
     

+ 0 - 12
ncd/modules/sys_evdev.c

@@ -236,9 +236,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
     
     if (name == strings[STRING_TYPE].id) {
         *out = NCDVal_NewString(mem, evdev_type_to_str(o->event.type));
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     
@@ -246,17 +243,11 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
         char str[50];
         snprintf(str, sizeof(str), "%"PRIi32, o->event.value);
         *out = NCDVal_NewString(mem, str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     
     if (name == strings[STRING_CODE_NUMERIC].id) {
         *out = ncd_make_uintmax(mem, o->event.code);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_uintmax failed");
-        }
         return 1;
     }
     
@@ -299,9 +290,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
         }
         
         *out = NCDVal_NewString(mem, str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     

+ 0 - 3
ncd/modules/sys_request_client.c

@@ -351,9 +351,6 @@ static int request_process_reply_obj_func_getvar (const NCDObject *obj, NCD_stri
     
     if (name == strings[STRING_DATA].id) {
         *out = NCDVal_NewCopy(mem, o->process_reply_data);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewCopy failed");
-        }
         return 1;
     }
     

+ 0 - 7
ncd/modules/sys_request_server.c

@@ -491,21 +491,14 @@ static int request_process_func_getspecialobj (NCDModuleProcess *process, NCD_st
 static int request_process_request_obj_func_getvar (const NCDObject *obj, NCD_string_id_t name, NCDValMem *mem, NCDValRef *out)
 {
     struct request *r = NCDObject_DataPtr(obj);
-    struct instance *o = r->con->inst;
     
     if (name == strings[STRING_DATA].id) {
         *out = NCDVal_NewCopy(mem, r->request_data);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewCopy failed");
-        }
         return 1;
     }
     
     if (name == strings[STRING_CLIENT_ADDR].id) {
         *out = ncd_make_baddr(r->con->addr, mem);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_baddr failed");
-        }
         return 1;
     }
     

+ 0 - 9
ncd/modules/sys_watch_directory.c

@@ -347,17 +347,11 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
     
     if (!strcmp(name, "event_type")) {
         *out = NCDVal_NewString(mem, o->processing_type);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     
     if (!strcmp(name, "filename")) {
         *out = NCDVal_NewString(mem, o->processing_file);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     
@@ -369,9 +363,6 @@ static int func_getvar (void *vo, const char *name, NCDValMem *mem, NCDValRef *o
         }
         
         *out = NCDVal_NewString(mem, str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         
         free(str);
         return 1;

+ 0 - 3
ncd/modules/to_string.c

@@ -93,9 +93,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
     
     if (name == NCD_STRING_EMPTY) {
         *out = NCDVal_NewString(mem, o->str);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
         return 1;
     }
     

+ 0 - 3
ncd/modules/try.c

@@ -238,9 +238,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
     
     if (name == strings[STRING_SUCCEEDED].id) {
         *out = ncd_make_boolean(mem, o->succeeded, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     

+ 0 - 21
ncd/modules/value.c

@@ -630,7 +630,6 @@ static struct value * value_init_fromvalue (NCDModuleInst *i, NCDValRef value)
                 
                 NCDValRef key = NCDVal_NewCopy(&key_mem, ekey);
                 if (NCDVal_IsInvalid(key)) {
-                    BLog(BLOG_ERROR, "NCDVal_NewCopy failed");
                     NCDValMem_Free(&key_mem);
                     goto fail1;
                 }
@@ -671,7 +670,6 @@ static int value_to_value (NCDModuleInst *i, struct value *v, NCDValMem *mem, NC
         case NCDVAL_STRING: {
             *out_value = NCDVal_NewStringBin(mem, (const uint8_t *)v->string.string, v->string.length);
             if (NCDVal_IsInvalid(*out_value)) {
-                ModuleLog(i, BLOG_ERROR, "NCDVal_NewStringBin failed");
                 goto fail;
             }
         } break;
@@ -679,7 +677,6 @@ static int value_to_value (NCDModuleInst *i, struct value *v, NCDValMem *mem, NC
         case IDSTRING_TYPE: {
             *out_value = NCDVal_NewIdString(mem, v->idstring.id, v->idstring.string_index);
             if (NCDVal_IsInvalid(*out_value)) {
-                ModuleLog(i, BLOG_ERROR, "NCDVal_NewIdString failed");
                 goto fail;
             }
         } break;
@@ -687,7 +684,6 @@ static int value_to_value (NCDModuleInst *i, struct value *v, NCDValMem *mem, NC
         case NCDVAL_LIST: {
             *out_value = NCDVal_NewList(mem, value_list_len(v));
             if (NCDVal_IsInvalid(*out_value)) {
-                ModuleLog(i, BLOG_ERROR, "NCDVal_NewList failed");
                 goto fail;
             }
             
@@ -698,7 +694,6 @@ static int value_to_value (NCDModuleInst *i, struct value *v, NCDValMem *mem, NC
                 }
                 
                 if (!NCDVal_ListAppend(*out_value, eval)) {
-                    ModuleLog(i, BLOG_ERROR, "depth limit exceeded");
                     goto fail;
                 }
             }
@@ -707,7 +702,6 @@ static int value_to_value (NCDModuleInst *i, struct value *v, NCDValMem *mem, NC
         case NCDVAL_MAP: {
             *out_value = NCDVal_NewMap(mem, value_map_len(v));
             if (NCDVal_IsInvalid(*out_value)) {
-                ModuleLog(i, BLOG_ERROR, "NCDVal_NewMap failed");
                 goto fail;
             }
             
@@ -716,7 +710,6 @@ static int value_to_value (NCDModuleInst *i, struct value *v, NCDValMem *mem, NC
                 
                 NCDValRef key = NCDVal_NewCopy(mem, ev->map_parent.key);
                 if (NCDVal_IsInvalid(key)) {
-                    ModuleLog(i, BLOG_ERROR, "NCDVal_NewCopy failed");
                     goto fail;
                 }
                 
@@ -727,7 +720,6 @@ static int value_to_value (NCDModuleInst *i, struct value *v, NCDValMem *mem, NC
                 
                 int inserted;
                 if (!NCDVal_MapInsert(*out_value, key, val, &inserted)) {
-                    ModuleLog(i, BLOG_ERROR, "depth limit exceeded");
                     goto fail;
                 }
                 ASSERT_EXECUTE(inserted)
@@ -864,7 +856,6 @@ static struct value * value_insert (NCDModuleInst *i, struct value *v, NCDValRef
             
             NCDValRef key = NCDVal_NewCopy(&key_mem, where);
             if (NCDVal_IsInvalid(key)) {
-                ModuleLog(i, BLOG_ERROR, "NCDVal_NewCopy failed");
                 NCDValMem_Free(&key_mem);
                 goto fail1;
             }
@@ -1116,9 +1107,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
     
     if (name == strings[STRING_EXISTS].id) {
         *out = ncd_make_boolean(mem, !!v, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     
@@ -1134,9 +1122,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
     
     if (name == strings[STRING_TYPE].id) {
         *out = NCDVal_NewString(mem, get_type_str(v->type));
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
     }
     else if (name == strings[STRING_LENGTH].id) {
         size_t len = 0; // to remove warning
@@ -1158,9 +1143,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
         }
         
         *out = ncd_make_uintmax(mem, len);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewString failed");
-        }
     }
     else if (name == strings[STRING_KEYS].id) {
         if (v->type != NCDVAL_MAP) {
@@ -1170,7 +1152,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
         
         *out = NCDVal_NewList(mem, value_map_len(v));
         if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewList failed");
             goto fail;
         }
         
@@ -1179,12 +1160,10 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
             
             NCDValRef key = NCDVal_NewCopy(mem, ev->map_parent.key);
             if (NCDVal_IsInvalid(key)) {
-                ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewCopy failed");
                 goto fail;
             }
             
             if (!NCDVal_ListAppend(*out, key)) {
-                ModuleLog(o->i, BLOG_ERROR, "depth limit exceeded");
                 goto fail;
             }
         }

+ 0 - 3
ncd/modules/valuemetic.c

@@ -137,9 +137,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
     
     if (name == NCD_STRING_EMPTY) {
         *out = ncd_make_boolean(mem, o->result, o->i->params->iparams->string_index);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "ncd_make_boolean failed");
-        }
         return 1;
     }
     

+ 0 - 5
ncd/modules/var.c

@@ -71,7 +71,6 @@ static void func_new (void *vo, NCDModuleInst *i, const struct NCDModuleInst_new
     // copy value
     o->value = NCDVal_NewCopy(&o->mem, value_arg);
     if (NCDVal_IsInvalid(o->value)) {
-        ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewCopy failed");
         goto fail1;
     }
     
@@ -102,9 +101,6 @@ static int func_getvar2 (void *vo, NCD_string_id_t name, NCDValMem *mem, NCDValR
     
     if (name == NCD_STRING_EMPTY) {
         *out = NCDVal_NewCopy(mem, o->value);
-        if (NCDVal_IsInvalid(*out)) {
-            ModuleLog(o->i, BLOG_ERROR, "NCDVal_NewCopy failed");
-        }
         return 1;
     }
     
@@ -130,7 +126,6 @@ static void set_func_new (void *unused, NCDModuleInst *i, const struct NCDModule
     // copy value
     NCDValRef copy = NCDVal_NewCopy(&mem, value_arg);
     if (NCDVal_IsInvalid(copy)) {
-        ModuleLog(i, BLOG_ERROR, "NCDVal_NewCopy failed");
         goto fail1;
     }