aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortjahnk <tjahnk@users.noreply.github.com>2017-08-14 14:21:13 +0200
committerGitHub <noreply@github.com>2017-08-14 14:21:13 +0200
commit6b17f2065e447c10731dc252ca5600a267971643 (patch)
tree1231f8ac36f1684130ed327422123ebffa42a1b0
parent01475efcf23f47c13f44b057e42decb916117d67 (diff)
parent0a2c7df0c9d8ef801ced567d8638ae0c86a63257 (diff)
Merge pull request #19 from tjahnk/fix_listconfig
fixes missing assignment in API 'listconfig' and removes unnecessary project configuration
-rw-r--r--nbproject/configurations.xml3
-rw-r--r--ucs2-afb/ucs_binding.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index aaa074a..250241a 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -154,9 +154,6 @@
<incDir>
<pElem>ucs2-lib/unicens/src</pElem>
</incDir>
- <preprocessorList>
- <Elem>UCS2_CFG_PATH="/etc/default/ucs:./data"</Elem>
- </preprocessorList>
</cTool>
</folder>
<item path="ucs2-afb/ucs_apihat.c" ex="false" tool="0" flavor2="3">
diff --git a/ucs2-afb/ucs_binding.c b/ucs2-afb/ucs_binding.c
index 8a1174c..7d27fc6 100644
--- a/ucs2-afb/ucs_binding.c
+++ b/ucs2-afb/ucs_binding.c
@@ -521,7 +521,7 @@ PUBLIC void ucs2_listconfig (struct afb_req request) {
queryJ = afb_req_json(request);
if (queryJ && json_object_object_get_ex (queryJ, "cfgpath" , &tmpJ)) {
- strdup (json_object_get_string(tmpJ));
+ dirList = strdup (json_object_get_string(tmpJ));
} else {
dirList = strdup (UCS2_CFG_PATH);
AFB_NOTICE ("fgpath:missing uses UCS2_CFG_PATH=%s", UCS2_CFG_PATH);