Changeset 4967:572924bdd4c6 in roaraudio

Timestamp:

05/15/11 23:14:09 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make some vars file local as they do not need to be global

Location:

roard

Files:

• driver_ao.c (modified) (1 diff)
• driver_shout.c (modified) (1 diff)
• include/streams.h (modified) (1 diff)
• roard.c (modified) (1 diff)
• streams.c (modified) (1 diff)

roard/driver_ao.c

@@ -27 +27 @@
 #ifdef ROAR_HAVE_LIBAO
 
-int _driver_ao_usage_counter = 0;
+static int _driver_ao_usage_counter = 0;
 
 void driver_ao_init (void) {

roard/driver_shout.c

@@ -27 +27 @@
 #ifdef ROAR_HAVE_LIBSHOUT
 
-int _driver_shout_usage_counter = 0;
+static int _driver_shout_usage_counter = 0;
 
 int     driver_shout_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) {

roard/include/streams.h

@@ -118 +118 @@
 } * g_streams[ROAR_STREAMS_MAX];
 
-int streams_thru_num;
-int streams_sync_num;
 int streams_recsource_id;
 

roard/roard.c

@@ -56 +56 @@
 
 #ifdef ROAR_SUPPORT_LISTEN
-char * server[ROAR_MAX_LISTEN_SOCKETS];
+static char * server[ROAR_MAX_LISTEN_SOCKETS];
 #endif
 
 #if defined(ROAR_HAVE_IO_POSIX) && defined(ROAR_HAVE_FS_POSIX)
 #define SUPPORT_PIDFILE
-char * pidfile = NULL;
+static char * pidfile = NULL;
 #endif
 
 #if defined(ROAR_HAVE_SETGID) || defined(ROAR_HAVE_SETUID)
-int    setids    = 0;
+static int    setids    = 0;
 #endif
 
 #ifdef ROAR_HAVE_LIBX11
-char * x11display = NULL;
+static char * x11display = NULL;
 #endif
 

roard/streams.c

@@ -29 +29 @@
 #define _CHECK_SID(id)         _CHECK_SID_RET((id), -1)
 
-int streams_thru_num     =  0;
-int streams_sync_num     =  0;
+static int streams_thru_num     =  0;
+static int streams_sync_num     =  0;
 int streams_recsource_id = -1;