From e5c437fd9d5ac7e4c83e47f8bc9ea562120d7881 Mon Sep 17 00:00:00 2001
From: Fulup Ar Foll <fulup@iot.bzh>
Date: Fri, 25 Aug 2017 01:11:18 +0200
Subject: Fulup Error Message at Lua level
---
ctl-binding/ctl-lua.c | 4 +-
nbproject/configurations.xml | 93 ++++++++++++++++++++++++++++++++++++++++----
2 files changed, 88 insertions(+), 9 deletions(-)
diff --git a/ctl-binding/ctl-lua.c b/ctl-binding/ctl-lua.c
index 8d5a87e..d737026 100644
--- a/ctl-binding/ctl-lua.c
+++ b/ctl-binding/ctl-lua.c
@@ -460,7 +460,7 @@ STATIC int LuaAfbService(lua_State* luaState) {
// note: argument start at 2 because of AFB: table
if (count <5 || !lua_isstring(luaState, 2) || !lua_isstring(luaState, 3) || !lua_istable(luaState, 4) || !lua_isstring(luaState, 5)) {
- lua_pushliteral (luaState, "LuaAfbServiceCall-Syntax is AFB:service_call (api, verb, query, callback, handle ....");
+ lua_pushliteral (luaState, "ERROR: syntax AFB:service(api, verb, {[Lua Table]})");
goto OnErrorExit;
}
@@ -489,7 +489,7 @@ STATIC int LuaAfbServiceSync(lua_State* luaState) {
// note: argument start at 2 because of AFB: table
if (count <3 || !lua_isstring(luaState, 2) || !lua_isstring(luaState, 3) || !lua_istable(luaState, 4)) {
- lua_pushliteral (luaState, "LuaAfbServiceSync-Syntax is error,data=AFB:service_call (api, verb, query)");
+ lua_pushliteral (luaState, "ERROR: syntax AFB:servsync(api, verb, {[Lua Table]})");
goto OnErrorExit;
}
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index a05bf8d..a3d914b 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -30,6 +30,12 @@
<in>feature_tests.cxx</in>
</df>
</df>
+ <df name="ctl-binding">
+ <in>ctl-binding.c</in>
+ <in>ctl-dispatch.c</in>
+ <in>ctl-lua.c</in>
+ <in>ctl-timer.c</in>
+ </df>
<df name="ctl-plugin">
<in>ctl-plugin-sample.c</in>
</df>
@@ -175,13 +181,26 @@
</cTool>
</item>
<item path="afb-utilities/filescan-utils.c" ex="false" tool="0" flavor2="3">
- <cTool flags="1">
+ <cTool flags="0">
<incDir>
- <pElem>../../../opt/include/afb</pElem>
- <pElem>afb-utilities</pElem>
<pElem>/usr/include/json-c</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/lua5.3</pElem>
+ <pElem>afb-utilities</pElem>
<pElem>build/afb-utilities</pElem>
</incDir>
+ <preprocessorList>
+ <Elem>CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/conf.d/project/json.d:/home/fulup/opt/afb-controller/json.d"</Elem>
+ <Elem>CONTROL_CONFIG_POST="control"</Elem>
+ <Elem>CONTROL_CONFIG_PRE="onload"</Elem>
+ <Elem>CONTROL_DOSCRIPT_PRE="doscript"</Elem>
+ <Elem>CONTROL_MAXPATH_LEN=255</Elem>
+ <Elem>CONTROL_ONLOAD_PROFILE="onload-default"</Elem>
+ <Elem>CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/build:/home/fulup/opt/afb-controller/lib/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug"</Elem>
+ <Elem>CTL_PLUGIN_MAGIC=2468013579</Elem>
+ <Elem>NATIVE_LINUX</Elem>
+ </preprocessorList>
</cTool>
</item>
<item path="afb-utilities/wrap-json.c" ex="false" tool="0" flavor2="3">
@@ -207,8 +226,24 @@
</item>
<item path="build/CMakeFiles/feature_tests.cxx" ex="false" tool="1" flavor2="4">
</item>
+ <item path="ctl-binding/ctl-binding.c" ex="false" tool="0" flavor2="0">
+ <cTool flags="0">
+ </cTool>
+ </item>
+ <item path="ctl-binding/ctl-dispatch.c" ex="false" tool="0" flavor2="0">
+ <cTool flags="0">
+ </cTool>
+ </item>
+ <item path="ctl-binding/ctl-lua.c" ex="false" tool="0" flavor2="0">
+ <cTool flags="0">
+ </cTool>
+ </item>
+ <item path="ctl-binding/ctl-timer.c" ex="false" tool="0" flavor2="0">
+ <cTool flags="0">
+ </cTool>
+ </item>
<item path="ctl-plugin/ctl-plugin-sample.c" ex="false" tool="0" flavor2="3">
- <cTool flags="1">
+ <cTool flags="0">
</cTool>
</item>
<folder path="0/build">
@@ -218,16 +253,60 @@
</incDir>
</cTool>
</folder>
+ <folder path="0/ctl-binding">
+ <cTool>
+ <incDir>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/lua5.3</pElem>
+ <pElem>ctl-binding</pElem>
+ <pElem>afb-utilities</pElem>
+ <pElem>build/ctl-binding</pElem>
+ </incDir>
+ <preprocessorList>
+ <Elem>CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/conf.d/project/json.d:/home/fulup/opt/afb-controller/json.d"</Elem>
+ <Elem>CONTROL_CONFIG_POST="control"</Elem>
+ <Elem>CONTROL_CONFIG_PRE="onload"</Elem>
+ <Elem>CONTROL_DOSCRIPT_PRE="doscript"</Elem>
+ <Elem>CONTROL_LUA_EVENT="luaevt"</Elem>
+ <Elem>CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/conf.d/project/lua.d:/home/fulup/opt/controller-plugins/ctl-lua.d"</Elem>
+ <Elem>CONTROL_MAXPATH_LEN=255</Elem>
+ <Elem>CONTROL_ONLOAD_PROFILE="onload-default"</Elem>
+ <Elem>CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/build:/home/fulup/opt/afb-controller/lib/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug"</Elem>
+ <Elem>CONTROL_SUPPORT_LUA</Elem>
+ <Elem>CTL_PLUGIN_MAGIC=2468013579</Elem>
+ <Elem>NATIVE_LINUX</Elem>
+ <Elem>afb_controller_EXPORTS</Elem>
+ </preprocessorList>
+ </cTool>
+ </folder>
<folder path="0/ctl-plugin">
<cTool>
<incDir>
- <pElem>../../../opt/include/afb</pElem>
- <pElem>ctl-plugin</pElem>
<pElem>/usr/include/json-c</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
<pElem>/usr/include/lua5.3</pElem>
- <pElem>afb-source</pElem>
+ <pElem>ctl-binding</pElem>
+ <pElem>afb-utilities</pElem>
<pElem>build/ctl-plugin</pElem>
</incDir>
+ <preprocessorList>
+ <Elem>CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/conf.d/project/json.d:/home/fulup/opt/afb-controller/json.d"</Elem>
+ <Elem>CONTROL_CONFIG_POST="control"</Elem>
+ <Elem>CONTROL_CONFIG_PRE="onload"</Elem>
+ <Elem>CONTROL_DOSCRIPT_PRE="doscript"</Elem>
+ <Elem>CONTROL_LUA_EVENT="luaevt"</Elem>
+ <Elem>CONTROL_LUA_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/conf.d/project/lua.d:/home/fulup/opt/controller-plugins/ctl-lua.d"</Elem>
+ <Elem>CONTROL_MAXPATH_LEN=255</Elem>
+ <Elem>CONTROL_ONLOAD_PROFILE="onload-default"</Elem>
+ <Elem>CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/build:/home/fulup/opt/afb-controller/lib/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug"</Elem>
+ <Elem>CONTROL_SUPPORT_LUA</Elem>
+ <Elem>CTL_PLUGIN_MAGIC=2468013579</Elem>
+ <Elem>NATIVE_LINUX</Elem>
+ <Elem>audio_plugin_sample_EXPORTS</Elem>
+ </preprocessorList>
</cTool>
</folder>
</conf>
--
cgit