CLEANUP: da: make use of the late init registration code
Instead of having a #ifdef in the main init code we now use the registered
init functions. Doing so also enables error checking as errors were previously
reported as alerts but ignored. Also they were incorrect as the 'status'
variable was hidden by a second one and was always reporting DA_SYS (which
is apparently an error) in every case including the case where no file was
loaded. The init_deviceatlas() function was unexported since it's not used
outside of this place anymore.
diff --git a/src/da.c b/src/da.c
index 1dd148f..843da9f 100644
--- a/src/da.c
+++ b/src/da.c
@@ -1,6 +1,7 @@
#include <stdio.h>
#include <common/cfgparse.h>
+#include <common/errors.h>
#include <proto/arg.h>
#include <proto/log.h>
#include <proto/proto_http.h>
@@ -87,9 +88,13 @@
#define DA_COOKIENAME_DEFAULT "DAPROPS"
-int init_deviceatlas(void)
+/*
+ * module init / deinit functions. Returns 0 if OK, or a combination of ERR_*.
+ */
+static int init_deviceatlas(void)
{
- da_status_t status = DA_SYS;
+ int err_code = 0;
+
if (global.deviceatlas.jsonpath != 0) {
FILE *jsonp;
da_property_decl_t extraprops[] = {{0, 0}};
@@ -100,6 +105,7 @@
if (jsonp == 0) {
Alert("deviceatlas : '%s' json file has invalid path or is not readable.\n",
global.deviceatlas.jsonpath);
+ err_code |= ERR_ALERT | ERR_FATAL;
goto out;
}
@@ -111,6 +117,7 @@
if (status != DA_OK) {
Alert("deviceatlas : '%s' json file is invalid.\n",
global.deviceatlas.jsonpath);
+ err_code |= ERR_ALERT | ERR_FATAL;
goto out;
}
@@ -119,6 +126,7 @@
if (status != DA_OK) {
Alert("deviceatlas : data could not be compiled.\n");
+ err_code |= ERR_ALERT | ERR_FATAL;
goto out;
}
@@ -135,7 +143,7 @@
}
out:
- return status == DA_OK;
+ return err_code;
}
void deinit_deviceatlas(void)
@@ -365,4 +373,5 @@
sample_register_convs(&conv_kws);
cfg_register_keywords(&dacfg_kws);
hap_register_build_opts("Built with DeviceAtlas support.", 0);
+ hap_register_post_check(init_deviceatlas);
}