Define global variables globally

Netatalk · Sep 14, 2024 · 493d342 · 493d342
1 parent 3d2f63f
commit 493d342
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 28 deletions.
diff --git a/test/T2_spectest.c b/test/T2_spectest.c
@@ -3,9 +3,9 @@
 #include "test.h"
 #include <dlfcn.h>
 
-int Verbose = 0;
-int Quirk = 0;
-int Interactive = 0;
+// int Verbose = 0;
+// int Quirk = 0;
+// int Interactive = 0;
 
 u_int16_t VolID;
 static DSI *dsi;

diff --git a/test/afp_ls.c b/test/afp_ls.c
@@ -8,8 +8,8 @@
 #include "specs.h"
 #include <time.h>
 
-int Verbose = 0;
-int Quirk = 0;
+// int Verbose = 0;
+// int Quirk = 0;
 char    *Dir = "";
 
 u_int16_t VolID;

diff --git a/test/afparg.c b/test/afparg.c
@@ -150,7 +150,7 @@ FN_N(FPGetACL)
 };
 
 /* Some globals */
-int        Verbose = 0;
+// int        Verbose = 0;
 int        ExitCode = 0;
 uint16_t   VolID;
 static DSI *dsi;

diff --git a/test/afpcli.c b/test/afpcli.c
@@ -1,8 +1,12 @@
 #include "afpclient.h"
+#include "test.h"
 
 int     Throttle;
 int     Convert = 1;
-extern  int Quiet;
+int	Interactive = 0;
+int	Quiet = 1;
+int	Quirk = 0;
+int	Verbose = 0;
 
 #define UNICODE(a) (a->afp_version >= 30)
 

diff --git a/test/afpcmd.c b/test/afpcmd.c
@@ -9,7 +9,7 @@
 #include <stdint.h>
 
 
-int Quiet;
+// int Quiet;
 
 /* -------------------------------------------*/
 static char *dsi_command2str[] =

diff --git a/test/encoding_test.c b/test/encoding_test.c
@@ -8,8 +8,8 @@
 #include "specs.h"
 #include <time.h>
 
-int Verbose = 0;
-int Quirk = 0;
+// int Verbose = 0;
+// int Quirk = 0;
 char    *Dir = "";
 char    *Path;
 

diff --git a/test/fail_spectest.c b/test/fail_spectest.c
@@ -6,8 +6,8 @@
 #include "specs.h"
 #include <dlfcn.h>
 
-int Verbose = 0;
-int Quirk = 0;
+// int Verbose = 0;
+// int Quirk = 0;
 
 u_int16_t VolID;
 static DSI *dsi;

diff --git a/test/lantest.c b/test/lantest.c
@@ -28,8 +28,8 @@
 
 extern  int     Throttle;
 
-int Verbose = 0;
-int Quirk = 0;
+// int Verbose = 0;
+// int Quirk = 0;
 CONN *Conn;
 int ExitCode = 0;
 char Data[300000] = "";

diff --git a/test/logintest.c b/test/logintest.c
@@ -4,8 +4,8 @@
  */
 #include "specs.h"
 
-int Verbose = 0;
-int Quirk = 0;
+// int Verbose = 0;
+// int Quirk = 0;
 
 u_int16_t VolID;
 

diff --git a/test/rotest.c b/test/rotest.c
@@ -4,8 +4,8 @@
  */
 #include "specs.h"
 
-int Verbose = 0;
-int Quirk = 0;
+// int Verbose = 0;
+// int Quirk = 0;
 
 u_int16_t VolID;
 static DSI *dsi;

diff --git a/test/sleeptest.c b/test/sleeptest.c
@@ -1,9 +1,9 @@
 #include "specs.h"
 #include <dlfcn.h>
 
-int Verbose = 0;
-int Interactive = 0;
-int Quirk = 0;
+// int Verbose = 0;
+// int Interactive = 0;
+// int Quirk = 0;
 
 u_int16_t VolID;
 static DSI *dsi;

diff --git a/test/spectest.c b/test/spectest.c
@@ -5,10 +5,10 @@
 #include "specs.h"
 #include <dlfcn.h>
 
-int Verbose = 0;
-int Interactive = 0;
-int Quirk = 0;
-int Quiet = 1;
+// int Verbose = 0;
+// int Interactive = 0;
+// int Quirk = 0;
+// int Quiet = 1;
 
 u_int16_t VolID;
 static DSI *dsi;

diff --git a/test/speedtest.c b/test/speedtest.c
@@ -16,9 +16,9 @@
 #endif
 #endif
 
-int Verbose = 0;
-int Interactive = 0;
-int Quirk = 0;
+// int Verbose = 0;
+// int Interactive = 0;
+// int Quirk = 0;
 
 u_int16_t VolID;
 u_int16_t VolID2;

diff --git a/test/test.h b/test/test.h
@@ -139,3 +139,4 @@ extern int Quiet;
 extern int Locking;
 extern int Loglevel;
 extern int Color;
+extern int Interactive;