[xiph-cvs] cvs commit: icecast/src connection.c format.c format_mp3.c cfgfile.h

[Karl Heyes]

karl        03/07/22 20:27:10

  Modified:    conf     Makefile.am
               src      connection.c format.c format_mp3.c cfgfile.h
  Log:
  minor cleanups

Revision  Changes    Path
1.5       +1 -0      icecast/conf/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/icecast/conf/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	20 Jun 2003 04:01:31 -0000	1.4
+++ Makefile.am	23 Jul 2003 00:27:10 -0000	1.5
@@ -3,6 +3,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 EXTRA_DIST = icecast.xml.in
+DISTCLEANFILES = icecast.xml.dist
 
 docdir = $(datadir)/$(PACKAGE)/doc
 doc_DATA = icecast.xml.dist

<p><p>1.76      +2 -2      icecast/src/connection.c

Index: connection.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/connection.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- connection.c	21 Jul 2003 01:58:54 -0000	1.75
+++ connection.c	23 Jul 2003 00:27:10 -0000	1.76
@@ -673,8 +673,8 @@
     char *host;
     int port;
     int i;
-    char *serverhost;
-    int serverport;
+    char *serverhost = NULL;
+    int serverport = 0;
     aliases *alias;
     ice_config_t *config;
     int client_limit;

<p><p>1.26      +3 -0      icecast/src/format.c

Index: format.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/format.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- format.c	21 Jul 2003 01:58:54 -0000	1.25
+++ format.c	23 Jul 2003 00:27:10 -0000	1.26
@@ -11,6 +11,9 @@
 
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 #include <time.h>
 
 #include "connection.h"

<p><p>1.23      +3 -0      icecast/src/format_mp3.c

Index: format_mp3.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/format_mp3.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- format_mp3.c	21 Jul 2003 01:58:54 -0000	1.22
+++ format_mp3.c	23 Jul 2003 00:27:10 -0000	1.23
@@ -12,6 +12,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 
 #include "refbuf.h"
 #include "source.h"

<p><p>1.2       +3 -3      icecast/src/cfgfile.h

Index: cfgfile.h
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/cfgfile.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cfgfile.h	21 Jul 2003 01:39:39 -0000	1.1
+++ cfgfile.h	23 Jul 2003 00:27:10 -0000	1.2
@@ -1,5 +1,5 @@
-#ifndef __CONFIG_H__
-#define __CONFIG_H__
+#ifndef __CFGFILE_H__
+#define __CFGFILE_H__
 
 #define CONFIG_EINSANE -1
 #define CONFIG_ENOROOT -2
@@ -138,7 +138,7 @@
 /* To be used ONLY in one-time startup code */
 ice_config_t *config_get_config_unlocked(void);
 
-#endif  /* __CONFIG_H__ */
+#endif  /* __CFGFILE_H__ */
 
 
 

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