Blob Blame History Raw
From 99599ef9d5b920de5ff739bde8814cafc91d7b37 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Tue, 17 Aug 2021 13:46:29 -0600
Subject: [PATCH] dia: fix up some compiler warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Petr Písař <ppisar@redhat.com>
---
 server/dia/audispatch.c |  3 +++
 server/dia/auevents.c   |  1 +
 server/dia/auprocess.c  |  2 ++
 server/dia/auutil.c     |  1 +
 server/dia/gram.y       | 13 +++++++------
 server/dia/lex.l        |  2 +-
 server/dia/main.c       |  9 ++++++++-
 7 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/server/dia/audispatch.c b/server/dia/audispatch.c
index 3ad499c..aa146b5 100644
--- a/server/dia/audispatch.c
+++ b/server/dia/audispatch.c
@@ -23,6 +23,7 @@
  * $NCDId: @(#)audispatch.c,v 1.13 1996/05/07 20:12:46 greg Exp $
  */
 
+#include <unistd.h>
 #include        "release.h"
 #include        "misc.h"
 #include        "dixstruct.h"
@@ -51,6 +52,8 @@ extern RESTYPE auFlowType, auComponentType;
 extern FlowPtr auClockedFlows, auUnclockedFlows;
 extern ComponentPtr auBuckets, auDevices;
 
+extern void _AuUnBlockAudio(AuBlock _x);
+
 static auConnSetupPrefix auSetupPrefix;
 auConnSetup auSetup;
 
diff --git a/server/dia/auevents.c b/server/dia/auevents.c
index b9f8c7d..1a66c49 100644
--- a/server/dia/auevents.c
+++ b/server/dia/auevents.c
@@ -40,6 +40,7 @@
 #include        "au.h"
 
 extern void WriteEventsToClient(), AuProcessClockedFlows();
+extern void _AuUnBlockAudio(AuBlock _x);
 
 typedef struct _EventQueueRec {
     auEvent event;
diff --git a/server/dia/auprocess.c b/server/dia/auprocess.c
index 61abf68..97d0649 100644
--- a/server/dia/auprocess.c
+++ b/server/dia/auprocess.c
@@ -29,6 +29,7 @@
 #include <audio/audio.h>
 #include <audio/Aproto.h>
 #include "au.h"
+#include "aulog.h"
 
 #include "nasconf.h"
 
@@ -39,6 +40,7 @@ AuUint8 *auPhysicalOutputBuffers;
 extern AuBool AuChangeElementState();
 extern void AuRequestElementNotifyEvent(), AuRequestMonitorNotifyEvent(),
 AuProcessClockedFlows();
+extern void _AuUnBlockAudio(AuBlock _x);
 
 static AuUint32 rc_1(), rc_2(), rc_4(), rc_n(), rcNull(),
 rcm_1(), rcm_2(), rcm_n();
diff --git a/server/dia/auutil.c b/server/dia/auutil.c
index 5bb775c..4d52fca 100644
--- a/server/dia/auutil.c
+++ b/server/dia/auutil.c
@@ -35,6 +35,7 @@ AuRequestElementNotifyEvent();
 extern AuBool AuStartFlow();
 extern void AuGetOutputGainAndMode(), AuGetFeedbackGain(),
 AuGetInputGain(), AuGetInputMode();
+extern void _AuUnBlockAudio(AuBlock _x);
 
 extern int auMinibufSamples;
 extern ComponentPtr auBuckets, auDevices;
diff --git a/server/dia/gram.y b/server/dia/gram.y
index a5b7821..50b40c7 100644
--- a/server/dia/gram.y
+++ b/server/dia/gram.y
@@ -14,8 +14,10 @@
 #include "misc.h"
 
 static char     *ptr;
-static int parsebool(char *str);
+static void RemoveDQuote(char *str);
+static long parsebool(char *str);
 extern int yylineno;
+void yyerror(char *s);
 
 %}
 
@@ -128,10 +130,10 @@ stmt            : error
                         }
                 | WORDSIZE number
                         {
-                          ddaSetConfig(WORDSIZE, (void *)$2);
+                            ddaSetConfig(WORDSIZE, (void *)$2);
                         }
                 | FRAGSIZE number
-                        { 
+                        {
                           ddaSetConfig(FRAGSIZE, (void *)$2);
                         }
                 | MINFRAGS number
@@ -167,8 +169,7 @@ number          : NUMBER                { $$ = $1; }
 
 %%
 
-RemoveDQuote(str)
-char *str;
+static void RemoveDQuote(char *str)
 {
     char *i, *o;
     int n;
@@ -250,7 +251,7 @@ char *str;
     *o = '\0';
 }
 
-static int
+static long
 parsebool(char *str)
 {
     char *s;
diff --git a/server/dia/lex.l b/server/dia/lex.l
index 90c993b..72eca63 100644
--- a/server/dia/lex.l
+++ b/server/dia/lex.l
@@ -54,7 +54,7 @@ number                          [0-9]+
                                 }
 %%
 #ifndef yywrap
-yywrap()
+int yywrap()
 {
     return (1);
 }
diff --git a/server/dia/main.c b/server/dia/main.c
index 9ea2a12..cb0b556 100644
--- a/server/dia/main.c
+++ b/server/dia/main.c
@@ -53,6 +53,7 @@ SOFTWARE.
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <audio/audio.h>
 #include <audio/Aproto.h>
 #include "NasConfig.h"
@@ -64,12 +65,18 @@ SOFTWARE.
 #include "globals.h"
 #include "nasconf.h"
 #include "release.h"
+#include "aulog.h"
+
+#include "gram.h"
 
 extern void OsInit(void), InitClient(), ResetWellKnownSockets(),
 Dispatch(), FreeAllResources();
 extern int AuInitSetupReply();
 extern void AuInitProcVectors(void);
 extern Bool InitClientResources();
+extern void osBecomeDaemon(void);
+extern void osBecomeOrphan(void);
+
 
 static char *AuServerName(void);
 
@@ -153,7 +160,7 @@ main(int argc, char *argv[])
 
     /* And cd to / so we don't hold anything up; core files will also
        go there. */
-    chdir("/");
+    int dummy = chdir("/");
 
     while (1) {
         serverGeneration++;
-- 
2.34.1