[xiph-cvs] cvs commit: icecast/src admin.c client.c

[Karl Heyes]

karl        04/02/02 19:48:03

  Modified:    src      admin.c client.c
  Log:
  minor cleanup

Revision  Changes    Path
1.21      +12 -12    icecast/src/admin.c

Index: admin.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/admin.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- admin.c	29 Jan 2004 16:46:54 -0000	1.20
+++ admin.c	3 Feb 2004 00:48:02 -0000	1.21
@@ -56,19 +56,19 @@
 #define COMMAND_TRANSFORMED_MOVE_CLIENTS    54
 
 /* Global commands */
-#define COMMAND_RAW_LIST_MOUNTS   101
-#define COMMAND_RAW_STATS         102
-#define COMMAND_RAW_LISTSTREAM    103
-#define COMMAND_PLAINTEXT_LISTSTREAM    104
-#define COMMAND_TRANSFORMED_LIST_MOUNTS   201
-#define COMMAND_TRANSFORMED_STATS         202
-#define COMMAND_TRANSFORMED_LISTSTREAM    203
+#define COMMAND_RAW_LIST_MOUNTS             101
+#define COMMAND_RAW_STATS                   102
+#define COMMAND_RAW_LISTSTREAM              103
+#define COMMAND_PLAINTEXT_LISTSTREAM        104
+#define COMMAND_TRANSFORMED_LIST_MOUNTS     201
+#define COMMAND_TRANSFORMED_STATS           202
+#define COMMAND_TRANSFORMED_LISTSTREAM      203
 
 /* Client management commands */
-#define COMMAND_RAW_KILL_CLIENT   301
-#define COMMAND_RAW_KILL_SOURCE   302
-#define COMMAND_TRANSFORMED_KILL_CLIENT   401
-#define COMMAND_TRANSFORMED_KILL_SOURCE   402
+#define COMMAND_RAW_KILL_CLIENT             301
+#define COMMAND_RAW_KILL_SOURCE             302
+#define COMMAND_TRANSFORMED_KILL_CLIENT     401
+#define COMMAND_TRANSFORMED_KILL_SOURCE     402
 
 #define FALLBACK_RAW_REQUEST "fallbacks"
 #define FALLBACK_TRANSFORMED_REQUEST "fallbacks.xsl"
@@ -465,7 +465,7 @@
         return;
     }
 
-    if (strcmp (dest->mount, source->mount) == 0) 
+    if (strcmp (dest->mount, source->mount) == 0)
     {
         client_send_400 (client, "supplied mountpoints are identical");
         return;

<p><p>1.13      +2 -0      icecast/src/client.c

Index: client.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/client.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- client.c	29 Jan 2004 01:02:06 -0000	1.12
+++ client.c	3 Feb 2004 00:48:02 -0000	1.13
@@ -49,6 +49,8 @@
 {
     refbuf_t *refbuf;
 
+    if (client == NULL)
+        return;
     /* write log entry if ip is set (some things don't set it, like outgoing 
      * slave requests
      */

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