diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2016-02-08 10:17:20 +0100 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2016-02-08 10:17:20 +0100 |
| commit | a46043a9b0387bcf8fb6dcb34d5984489644c090 (patch) | |
| tree | 2f733387c01aa8ece03dbfff642d94bec5ed3f89 | |
| parent | 4181fe8be4134955e583d1c9fe3da5856ec5108a (diff) | |
removes unused smack field
Change-Id: I3388fa366c44c96d2ebf37ba57ed1b3acce82869
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
| -rw-r--r-- | include/local-def.h | 1 | ||||
| -rw-r--r-- | src/config.c | 11 |
2 files changed, 0 insertions, 12 deletions
diff --git a/include/local-def.h b/include/local-def.h index 6d219406..0c48d678 100644 --- a/include/local-def.h +++ b/include/local-def.h @@ -170,7 +170,6 @@ typedef struct { char *console; // console device name (can be a file or a tty) int localhostOnly; int httpdPort; - char *smack; // smack label char *ldpaths; // list of plugins directories char *rootdir; // base dir for httpd file download char *rootbase; // Angular HTML5 base URL diff --git a/src/config.c b/src/config.c index f818f7ac..bd03b6ff 100644 --- a/src/config.c +++ b/src/config.c @@ -108,12 +108,6 @@ PUBLIC AFB_error configLoadFile (AFB_session * session, AFB_config *cliconfig) { session->config->rootapi= cliconfig->rootapi; } - if (cliconfig->smack == NULL) { - session->config->smack = "demo"; - } else { - session->config->smack= cliconfig->smack; - } - if (cliconfig->ldpaths == NULL) { session->config->ldpaths = PLUGIN_INSTALL_DIR; } else { @@ -186,10 +180,6 @@ PUBLIC AFB_error configLoadFile (AFB_session * session, AFB_config *cliconfig) { session->config->rootapi = strdup (json_object_get_string (value)); } - if (!cliconfig->smack && json_object_object_get_ex (AFBConfig, "smack", &value)) { - session->config->smack = strdup (json_object_get_string (value)); - } - if (!cliconfig->ldpaths && json_object_object_get_ex (AFBConfig, "plugins", &value)) { session->config->ldpaths = strdup (json_object_get_string (value)); } @@ -255,7 +245,6 @@ PUBLIC void configStoreFile (AFB_session * session) { json_object_object_add (AFBConfig, "rootdir" , json_object_new_string (session->config->rootdir)); json_object_object_add (AFBConfig, "rootapi" , json_object_new_string (session->config->rootapi)); json_object_object_add (AFBConfig, "rootbase" , json_object_new_string (session->config->rootbase)); - json_object_object_add (AFBConfig, "smack" , json_object_new_string (session->config->smack)); json_object_object_add (AFBConfig, "plugins" , json_object_new_string (session->config->ldpaths)); json_object_object_add (AFBConfig, "sessiondir" , json_object_new_string (session->config->sessiondir)); json_object_object_add (AFBConfig, "pidfile" , json_object_new_string (session->config->pidfile)); |