aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nbproject/configurations.xml104
-rw-r--r--nbproject/private/Default.properties7
-rw-r--r--nbproject/private/configurations.xml39
-rw-r--r--nbproject/private/private.xml7
-rw-r--r--nbproject/project.xml1
-rw-r--r--src/rest-api.c2
6 files changed, 74 insertions, 86 deletions
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 6d98107c..3d743b11 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -13,6 +13,16 @@
<in>session.c</in>
</df>
</df>
+ <df root="." name="1">
+ </df>
+ <logicalFolder name="ExternalFiles"
+ displayName="Important Files"
+ projectFiles="false"
+ kind="IMPORTANT_FILES_FOLDER">
+ <itemPath>CMakeLists.txt</itemPath>
+ <itemPath>build/Makefile</itemPath>
+ <itemPath>nbproject/private/launcher.properties</itemPath>
+ </logicalFolder>
<logicalFolder name="ExternalFiles"
displayName="Important Files"
projectFiles="false"
@@ -25,6 +35,7 @@
<sourceFolderFilter>^(nbproject)$</sourceFolderFilter>
<sourceRootList>
<Elem>.</Elem>
+ <Elem>.</Elem>
</sourceRootList>
<projectmakefile>build/Makefile</projectmakefile>
<confs>
@@ -36,7 +47,6 @@
</toolsSet>
<flagsDictionary>
<element flagsID="0" commonFlags="-fPIE"/>
- <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -fPIE"/>
</flagsDictionary>
<codeAssistance>
</codeAssistance>
@@ -46,6 +56,13 @@
<buildCommand>${MAKE} -f Makefile</buildCommand>
<cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
<executablePath>build/src/afb-daemon</executablePath>
+ <cTool>
+ <incDir>
+ <pElem>include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>build/src</pElem>
+ </incDir>
+ </cTool>
</makeTool>
<preBuild>
<preBuildCommandWorkingDir>build</preBuildCommandWorkingDir>
@@ -54,106 +71,35 @@
</preBuild>
</makefileType>
<item path="src/afbs-api.c" ex="false" tool="0" flavor2="2">
- <cTool flags="1">
- <incDir>
- <pElem>src</pElem>
- <pElem>/usr/include/json-c</pElem>
- <pElem>include</pElem>
- <pElem>build/src</pElem>
- </incDir>
+ <cTool flags="0">
</cTool>
</item>
<item path="src/alsa-api.c" ex="false" tool="0" flavor2="2">
- <cTool flags="1">
- <incDir>
- <pElem>src</pElem>
- <pElem>/usr/include/json-c</pElem>
- <pElem>include</pElem>
- <pElem>build/src</pElem>
- </incDir>
+ <cTool flags="0">
</cTool>
</item>
<item path="src/config.c" ex="false" tool="0" flavor2="2">
- <cTool flags="1">
- <incDir>
- <pElem>src</pElem>
- <pElem>/usr/include/json-c</pElem>
- <pElem>include</pElem>
- <pElem>build/src</pElem>
- </incDir>
- <preprocessorList>
- <Elem>__PIC__=2</Elem>
- <Elem>__PIE__=2</Elem>
- <Elem>__REGISTER_PREFIX__=</Elem>
- <Elem>__USER_LABEL_PREFIX__=</Elem>
- <Elem>__pic__=2</Elem>
- <Elem>__pie__=2</Elem>
- </preprocessorList>
+ <cTool flags="0">
</cTool>
</item>
<item path="src/dbus-api.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
- <incDir>
- <pElem>include</pElem>
- <pElem>/usr/include/json-c</pElem>
- <pElem>build/src</pElem>
- </incDir>
</cTool>
</item>
<item path="src/http-svc.c" ex="false" tool="0" flavor2="2">
- <cTool flags="1">
- <incDir>
- <pElem>src</pElem>
- <pElem>/usr/include/json-c</pElem>
- <pElem>include</pElem>
- <pElem>build/src</pElem>
- </incDir>
+ <cTool flags="0">
</cTool>
</item>
<item path="src/main.c" ex="false" tool="0" flavor2="2">
- <cTool flags="1">
- <incDir>
- <pElem>src</pElem>
- <pElem>/usr/include/json-c</pElem>
- <pElem>include</pElem>
- <pElem>build/src</pElem>
- </incDir>
- <preprocessorList>
- <Elem>__PIC__=2</Elem>
- <Elem>__PIE__=2</Elem>
- <Elem>__REGISTER_PREFIX__=</Elem>
- <Elem>__USER_LABEL_PREFIX__=</Elem>
- <Elem>__pic__=2</Elem>
- <Elem>__pie__=2</Elem>
- </preprocessorList>
+ <cTool flags="0">
</cTool>
</item>
<item path="src/rest-api.c" ex="false" tool="0" flavor2="2">
- <cTool flags="1">
- <incDir>
- <pElem>src</pElem>
- <pElem>/usr/include/json-c</pElem>
- <pElem>include</pElem>
- <pElem>build/src</pElem>
- </incDir>
+ <cTool flags="0">
</cTool>
</item>
<item path="src/session.c" ex="false" tool="0" flavor2="2">
- <cTool flags="1">
- <incDir>
- <pElem>src</pElem>
- <pElem>/usr/include/json-c</pElem>
- <pElem>include</pElem>
- <pElem>build/src</pElem>
- </incDir>
- <preprocessorList>
- <Elem>__PIC__=2</Elem>
- <Elem>__PIE__=2</Elem>
- <Elem>__REGISTER_PREFIX__=</Elem>
- <Elem>__USER_LABEL_PREFIX__=</Elem>
- <Elem>__pic__=2</Elem>
- <Elem>__pie__=2</Elem>
- </preprocessorList>
+ <cTool flags="0">
</cTool>
</item>
</conf>
diff --git a/nbproject/private/Default.properties b/nbproject/private/Default.properties
index 6b8095d5..de73bf9e 100644
--- a/nbproject/private/Default.properties
+++ b/nbproject/private/Default.properties
@@ -1 +1,8 @@
+/home/fulup/Workspace/afb-daemon/src/session.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/session.c.o -c /home/fulup/Workspace/afb-daemon/src/session.c
+/home/fulup/Workspace/afb-daemon/src/alsa-api.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/alsa-api.c.o -c /home/fulup/Workspace/afb-daemon/src/alsa-api.c
/home/fulup/Workspace/afb-daemon/src/main.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/main.c.o -c /home/fulup/Workspace/afb-daemon/src/main.c
+/home/fulup/Workspace/afb-daemon/src/dbus-api.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/dbus-api.c.o -c /home/fulup/Workspace/afb-daemon/src/dbus-api.c
+/home/fulup/Workspace/afb-daemon/src/http-svc.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/http-svc.c.o -c /home/fulup/Workspace/afb-daemon/src/http-svc.c
+/home/fulup/Workspace/afb-daemon/src/afbs-api.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/afbs-api.c.o -c /home/fulup/Workspace/afb-daemon/src/afbs-api.c
+/home/fulup/Workspace/afb-daemon/src/rest-api.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/rest-api.c.o -c /home/fulup/Workspace/afb-daemon/src/rest-api.c
+/home/fulup/Workspace/afb-daemon/src/config.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/config.c.o -c /home/fulup/Workspace/afb-daemon/src/config.c
diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml
index 24aab80c..457c443c 100644
--- a/nbproject/private/configurations.xml
+++ b/nbproject/private/configurations.xml
@@ -4,13 +4,14 @@
<df root="." name="0">
<df name="build">
<df name="CMakeFiles">
- <df name="3.0.2">
+ <df name="3.3.2">
<df name="CompilerIdC">
<in>CMakeCCompilerId.c</in>
</df>
</df>
<df name="CMakeTmp">
</df>
+ <in>feature_tests.c</in>
</df>
<df name="src">
<df name="CMakeFiles">
@@ -19,6 +20,12 @@
</df>
</df>
</df>
+ <df name="dist">
+ <df name="Debug">
+ <df name="GNU-Linux">
+ </df>
+ </df>
+ </df>
<df name="include">
<in>local-def.h</in>
<in>proto-def.h</in>
@@ -34,6 +41,34 @@
<in>session.c</in>
</df>
</df>
+ <df root="." name="1">
+ <df name="build">
+ <df name="CMakeFiles">
+ <df name="3.3.2">
+ <df name="CompilerIdC">
+ </df>
+ </df>
+ <df name="CMakeTmp">
+ </df>
+ </df>
+ <df name="src">
+ <df name="CMakeFiles">
+ <df name="afb-daemon.dir">
+ </df>
+ </df>
+ </df>
+ </df>
+ <df name="dist">
+ <df name="Debug">
+ <df name="GNU-Linux">
+ </df>
+ </df>
+ </df>
+ <df name="include">
+ </df>
+ <df name="src">
+ </df>
+ </df>
</logicalFolder>
<projectmakefile>build/Makefile</projectmakefile>
<confs>
@@ -60,8 +95,6 @@
<gdb_interceptlist>
<gdbinterceptoptions gdb_all="false" gdb_unhandled="true" gdb_unexpected="true"/>
</gdb_interceptlist>
- <gdb_signals>
- </gdb_signals>
<gdb_options>
<DebugOptions>
</DebugOptions>
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index 4f3fdc62..795635d6 100644
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <code-assistance-data xmlns="http://www.netbeans.org/ns/make-project-private/1">
- <code-model-enabled>true</code-model-enabled>
- </code-assistance-data>
<data xmlns="http://www.netbeans.org/ns/make-project-private/1">
<activeConfTypeElem>0</activeConfTypeElem>
<activeConfIndexElem>0</activeConfIndexElem>
</data>
+ <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+ <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+ <group/>
+ </open-files>
</project-private>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 202336cd..b186144c 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -11,6 +11,7 @@
<make-dep-projects/>
<sourceRootList>
<sourceRootElem>.</sourceRootElem>
+ <sourceRootElem>.</sourceRootElem>
</sourceRootList>
<confList>
<confElem>
diff --git a/src/rest-api.c b/src/rest-api.c
index ca1c1a0a..b3b1c258 100644
--- a/src/rest-api.c
+++ b/src/rest-api.c
@@ -71,7 +71,7 @@ PUBLIC json_object* apiPingTest(AFB_session *session, AFB_request *request, void
// request all query key/value
len = getQueryAll (request, query, sizeof(query));
- if (len == 0) strcpy (&query,"NoSearchQueryList");
+ if (len == 0) strcpy (query,"NoSearchQueryList");
// check if we have some post data
if (request->post == NULL) request->post="NoData";