[xiph-cvs] cvs commit: icecast/src connection.c sighandler.c global.h

[Karl Heyes]

karl        03/07/25 10:29:33

  Modified:    src      connection.c sighandler.c global.h
  Log:
  place the config reread flag in the global structure

Revision  Changes    Path
1.78      +2 -2      icecast/src/connection.c

Index: connection.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/connection.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- connection.c	24 Jul 2003 23:45:29 -0000	1.77
+++ connection.c	25 Jul 2003 14:29:33 -0000	1.78
@@ -344,13 +344,13 @@
 
     while (global.running == ICE_RUNNING)
     {
-        if (schedule_config_reread)
+        if (global . schedule_config_reread)
         {
             /* reread config file */
             INFO0("Scheduling config reread ...");
 
             connection_inject_event(EVENT_CONFIG_READ, NULL);
-            schedule_config_reread = 0;
+            global . schedule_config_reread = 0;
         }
 
         con = _accept_connection();

<p><p>1.8       +1 -5      icecast/src/sighandler.c

Index: sighandler.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/sighandler.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sighandler.c	24 Jul 2003 23:45:29 -0000	1.7
+++ sighandler.c	25 Jul 2003 14:29:33 -0000	1.8
@@ -15,8 +15,6 @@
 #include "logging.h"
 #include "event.h"
 
-#include "sighandler.h"
-
 #define CATMODULE "sighandler"
 
 #ifndef _WIN32
@@ -24,8 +22,6 @@
 void _sig_die(int signo);
 #endif
 
-int schedule_config_reread = 0;
-
 void sighandler_initialize(void)
 {
 #ifndef _WIN32
@@ -40,7 +36,7 @@
 
 void _sig_hup(int signo)
 {
-    schedule_config_reread = 1;
+    global . schedule_config_reread = 1;
     /* some OSes require us to reattach the signal handler */
     signal(SIGHUP, _sig_hup);
 }

<p><p>1.8       +1 -0      icecast/src/global.h

Index: global.h
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/global.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- global.h	15 Mar 2003 02:10:17 -0000	1.7
+++ global.h	25 Jul 2003 14:29:33 -0000	1.8
@@ -21,6 +21,7 @@
 
     int sources;
     int clients;
+    int schedule_config_reread;
 
     avl_tree *source_tree;
 

<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.