[xiph-cvs] cvs commit: icecast/src connection.c format.c fserve.c slave.c stats.c

[Michael Smith]

msmith      02/12/29 10:46:32

  Modified:    src      connection.c format.c fserve.c slave.c stats.c
  Log:
  Fix up types after thread type rename earlier.

Revision  Changes    Path
1.33      +6 -6      icecast/src/connection.c

Index: connection.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/connection.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- connection.c	29 Dec 2002 09:21:32 -0000	1.32
+++ connection.c	29 Dec 2002 15:46:32 -0000	1.33
@@ -46,7 +46,7 @@
 } con_queue_t;
 
 typedef struct _thread_queue_tag {
-	thread_t *thread_id;
+	thread_type *thread_id;
         struct _thread_queue_tag *next;
 } thread_queue_t;
 
@@ -159,7 +159,7 @@
         thread_cond_signal(&_pool_cond);
 }
 
-static void _push_thread(thread_queue_t **queue, thread_t *thread_id)
+static void _push_thread(thread_queue_t **queue, thread_type *thread_id)
 {
         /* create item */
         thread_queue_t *item = (thread_queue_t *)malloc(sizeof(thread_queue_t));
@@ -177,9 +177,9 @@
         thread_mutex_unlock(&_queue_mutex);
 }
 
-static thread_t *_pop_thread(thread_queue_t **queue)
+static thread_type *_pop_thread(thread_queue_t **queue)
 {
-	thread_t *id;
+	thread_type *id;
         thread_queue_t *item;
 
         thread_mutex_lock(&_queue_mutex);
@@ -204,7 +204,7 @@
 {
         ice_config_t *config;
         int i;
-    thread_t *tid;
+    thread_type *tid;
         char buff[64];
 
         config = config_get_config();
@@ -218,7 +218,7 @@
 
 static void _destroy_pool(void)
 {
-	thread_t *id;
+	thread_type *id;
         int i;
 
         i = 0;

<p><p>1.9       +1 -0      icecast/src/format.c

Index: format.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/format.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- format.c	29 Dec 2002 08:10:10 -0000	1.8
+++ format.c	29 Dec 2002 15:46:32 -0000	1.9
@@ -16,6 +16,7 @@
 #include "format_vorbis.h"
 #include "format_mp3.h"
 
+#include "log.h"
 #include "logging.h"
 #define CATMODULE "format"
 

<p><p>1.7       +1 -1      icecast/src/fserve.c

Index: fserve.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/fserve.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fserve.c	22 Nov 2002 13:00:44 -0000	1.6
+++ fserve.c	29 Dec 2002 15:46:32 -0000	1.7
@@ -50,7 +50,7 @@
 static avl_tree *mimetypes = NULL;
 
 static cond_t fserv_cond;
-static thread_t *fserv_thread;
+static thread_type *fserv_thread;
 static int run_fserv;
 static int fserve_clients;
 static int client_tree_changed=0;

<p><p>1.9       +1 -1      icecast/src/slave.c

Index: slave.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/slave.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- slave.c	29 Dec 2002 14:06:20 -0000	1.8
+++ slave.c	29 Dec 2002 15:46:32 -0000	1.9
@@ -45,7 +45,7 @@
 #define CATMODULE "slave"
 
 static void *_slave_thread(void *arg);
-thread_t *_slave_thread_id;
+thread_type *_slave_thread_id;
 static int _initialized = 0;
 
 void slave_initialize(void) {

<p><p>1.22      +1 -1      icecast/src/stats.c

Index: stats.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/stats.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- stats.c	29 Dec 2002 14:06:20 -0000	1.21
+++ stats.c	29 Dec 2002 15:46:32 -0000	1.22
@@ -33,7 +33,7 @@
 } event_listener_t;
 
 int _stats_running = 0;
-thread_t *_stats_thread_id;
+thread_type *_stats_thread_id;
 int _stats_threads = 0;
 
 stats_t _stats;

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.