From 451d65660b62aa23e9d3083174153e9a5a068c5f Mon Sep 17 00:00:00 2001
From: Fulup Ar Foll <fulup@iot.bzh>
Date: Thu, 2 Nov 2017 21:50:09 +0100
Subject: Fix FD leaking on Alsa Control

---
 nbproject/configurations.xml | 88 ++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 52 deletions(-)

(limited to 'nbproject')

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 78905c4..85f3fef 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -464,81 +464,57 @@
         </cTool>
       </item>
       <item path="alsa-binding/Alsa-AddCtl.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>alsa-binding</pElem>
-            <pElem>../../../opt/include/alsa</pElem>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>../../../opt/include</pElem>
-            <pElem>build/alsa-binding</pElem>
-          </incDir>
+        <cTool flags="0">
         </cTool>
       </item>
       <item path="alsa-binding/Alsa-ApiHat.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="0">
+        </cTool>
+      </item>
+      <item path="alsa-binding/Alsa-RegEvt.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="0">
+        </cTool>
+      </item>
+      <item path="alsa-binding/Alsa-SetGet.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="0">
+        </cTool>
+      </item>
+      <item path="alsa-binding/Alsa-Ucm.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="0">
+        </cTool>
+      </item>
+      <item path="alsa-hook/PolicyAlsaHook.c" ex="false" tool="0" flavor2="3">
         <cTool flags="0">
           <incDir>
             <pElem>/usr/include/json-c</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>/usr/include/p11-kit-1</pElem>
             <pElem>../../../opt/include/alsa</pElem>
-            <pElem>afb-utilities</pElem>
-            <pElem>build/alsa-binding</pElem>
+            <pElem>build/alsa-hook</pElem>
           </incDir>
           <preprocessorList>
             <Elem>CONTROL_MAXPATH_LEN=255</Elem>
             <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
             <Elem>MAX_SND_CARD=16</Elem>
             <Elem>NATIVE_LINUX</Elem>
+            <Elem>PIC</Elem>
             <Elem>TLV_BYTE_SIZE=256</Elem>
-            <Elem>alsa_4a_EXPORTS</Elem>
+            <Elem>policy_alsa_hook_EXPORTS</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="alsa-binding/Alsa-RegEvt.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>alsa-binding</pElem>
-            <pElem>../../../opt/include/alsa</pElem>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>../../../opt/include</pElem>
-            <pElem>build/alsa-binding</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="alsa-binding/Alsa-SetGet.c" ex="false" tool="0" flavor2="3">
+      <item path="alsa-hook/PolicyHookTcp.c" ex="false" tool="0" flavor2="3">
         <cTool flags="2">
           <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>alsa-binding</pElem>
+            <pElem>alsa-hook</pElem>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
-            <pElem>../../../opt/include</pElem>
-            <pElem>build/alsa-binding</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="alsa-binding/Alsa-Ucm.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-          <incDir>
             <pElem>../../../opt/include/afb</pElem>
-            <pElem>alsa-binding</pElem>
-            <pElem>../../../opt/include/alsa</pElem>
-            <pElem>/usr/include/json-c</pElem>
             <pElem>../../../opt/include</pElem>
-            <pElem>build/alsa-binding</pElem>
+            <pElem>build/alsa-hook</pElem>
           </incDir>
         </cTool>
       </item>
-      <item path="alsa-hook/PolicyAlsaHook.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-        </cTool>
-      </item>
-      <item path="alsa-hook/PolicyHookTcp.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-        </cTool>
-      </item>
       <folder path="0/Audio-Common">
         <cTool>
           <incDir>
@@ -766,16 +742,24 @@
           </preprocessorList>
         </cTool>
       </folder>
-      <folder path="0/alsa-hook">
+      <folder path="0/alsa-binding">
         <cTool>
           <incDir>
-            <pElem>alsa-hook</pElem>
-            <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
-            <pElem>../../../opt/include/afb</pElem>
             <pElem>../../../opt/include</pElem>
-            <pElem>build/alsa-hook</pElem>
+            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>afb-utilities</pElem>
+            <pElem>build/alsa-binding</pElem>
           </incDir>
+          <preprocessorList>
+            <Elem>CONTROL_MAXPATH_LEN=255</Elem>
+            <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
+            <Elem>MAX_SND_CARD=16</Elem>
+            <Elem>NATIVE_LINUX</Elem>
+            <Elem>TLV_BYTE_SIZE=256</Elem>
+            <Elem>alsa_4a_EXPORTS</Elem>
+          </preprocessorList>
         </cTool>
       </folder>
     </conf>
-- 
cgit 1.2.3-korg