[xiph-commits] r7763 - icecast/branches/kh/icecast/src
karl at motherfish-iii.xiph.org
karl at motherfish-iii.xiph.org
Wed Sep 15 09:00:25 PDT 2004
Author: karl
Date: 2004-09-15 09:00:24 -0700 (Wed, 15 Sep 2004)
New Revision: 7763
Modified:
icecast/branches/kh/icecast/src/auth.h
icecast/branches/kh/icecast/src/auth_cmd.h
icecast/branches/kh/icecast/src/auth_htpasswd.h
icecast/branches/kh/icecast/src/auth_url.h
icecast/branches/kh/icecast/src/md5.c
icecast/branches/kh/icecast/src/md5.h
icecast/branches/kh/icecast/src/slave.c
icecast/branches/kh/icecast/src/xslt.c
icecast/branches/kh/icecast/src/yp.c
Log:
minor compile/include cleanups
Modified: icecast/branches/kh/icecast/src/auth.h
===================================================================
--- icecast/branches/kh/icecast/src/auth.h 2004-09-15 15:53:33 UTC (rev 7762)
+++ icecast/branches/kh/icecast/src/auth.h 2004-09-15 16:00:24 UTC (rev 7763)
@@ -13,12 +13,14 @@
#ifndef __AUTH_H__
#define __AUTH_H__
-#include "source.h"
-#include "client.h"
-#include "config.h"
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "source.h"
+#include "client.h"
typedef enum
{
Modified: icecast/branches/kh/icecast/src/auth_cmd.h
===================================================================
--- icecast/branches/kh/icecast/src/auth_cmd.h 2004-09-15 15:53:33 UTC (rev 7762)
+++ icecast/branches/kh/icecast/src/auth_cmd.h 2004-09-15 16:00:24 UTC (rev 7763)
@@ -13,12 +13,9 @@
#ifndef __AUTH_CMD_H__
#define __AUTH_CMD_H__
-#include "source.h"
-#include "client.h"
-#include "config.h"
-#include <libxml/xmlmemory.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
auth_t *auth_get_cmd_auth (config_options_t *options);
Modified: icecast/branches/kh/icecast/src/auth_htpasswd.h
===================================================================
--- icecast/branches/kh/icecast/src/auth_htpasswd.h 2004-09-15 15:53:33 UTC (rev 7762)
+++ icecast/branches/kh/icecast/src/auth_htpasswd.h 2004-09-15 16:00:24 UTC (rev 7763)
@@ -13,12 +13,9 @@
#ifndef __AUTH_HTPASSWD_H__
#define __AUTH_HTPASSWD_H__
-#include "source.h"
-#include "client.h"
-#include "config.h"
-#include <libxml/xmlmemory.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
auth_t *auth_get_htpasswd_auth(config_options_t *options);
Modified: icecast/branches/kh/icecast/src/auth_url.h
===================================================================
--- icecast/branches/kh/icecast/src/auth_url.h 2004-09-15 15:53:33 UTC (rev 7762)
+++ icecast/branches/kh/icecast/src/auth_url.h 2004-09-15 16:00:24 UTC (rev 7763)
@@ -12,17 +12,13 @@
#ifndef __AUTH_URL_H__
#define __AUTH_URL_H__
-#ifdef HAVE_AUTH_URL
-#include "source.h"
-#include "client.h"
-#include "config.h"
-#include <libxml/xmlmemory.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
auth_t *auth_get_url_auth (config_options_t *options);
+
#endif
-#endif
Modified: icecast/branches/kh/icecast/src/md5.c
===================================================================
--- icecast/branches/kh/icecast/src/md5.c 2004-09-15 15:53:33 UTC (rev 7762)
+++ icecast/branches/kh/icecast/src/md5.c 2004-09-15 16:00:24 UTC (rev 7763)
@@ -33,7 +33,9 @@
* and type definitions
*/
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "compat.h"
#include "md5.h"
Modified: icecast/branches/kh/icecast/src/md5.h
===================================================================
--- icecast/branches/kh/icecast/src/md5.h 2004-09-15 15:53:33 UTC (rev 7762)
+++ icecast/branches/kh/icecast/src/md5.h 2004-09-15 16:00:24 UTC (rev 7763)
@@ -13,7 +13,6 @@
#ifndef __MD5_H__
#define __MD5_H__
-#include "config.h"
#include "compat.h"
#define HASH_LEN 16
Modified: icecast/branches/kh/icecast/src/slave.c
===================================================================
--- icecast/branches/kh/icecast/src/slave.c 2004-09-15 15:53:33 UTC (rev 7762)
+++ icecast/branches/kh/icecast/src/slave.c 2004-09-15 16:00:24 UTC (rev 7763)
@@ -201,7 +201,7 @@
do
{
char *auth_header;
- char *redirect_header;
+ char *redirect_header = NULL;
streamsock = sock_connect_wto (relay->server, relay->port, 10);
if (streamsock == SOCK_ERROR)
Modified: icecast/branches/kh/icecast/src/xslt.c
===================================================================
--- icecast/branches/kh/icecast/src/xslt.c 2004-09-15 15:53:33 UTC (rev 7762)
+++ icecast/branches/kh/icecast/src/xslt.c 2004-09-15 16:00:24 UTC (rev 7763)
@@ -19,7 +19,6 @@
#include <libxml/debugXML.h>
#include <libxml/HTMLtree.h>
#include <libxml/xmlIO.h>
-#include <libxml/DOCBparser.h>
#include <libxml/xinclude.h>
#include <libxml/catalog.h>
#include <libxslt/xslt.h>
Modified: icecast/branches/kh/icecast/src/yp.c
===================================================================
--- icecast/branches/kh/icecast/src/yp.c 2004-09-15 15:53:33 UTC (rev 7762)
+++ icecast/branches/kh/icecast/src/yp.c 2004-09-15 16:00:24 UTC (rev 7763)
@@ -18,6 +18,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#include <curl/curl.h>
#include <thread/thread.h>
@@ -29,7 +30,6 @@
#include "source.h"
#include "cfgfile.h"
#include "stats.h"
-#include <curl/curl.h>
#ifdef WIN32
#define snprintf _snprintf
@@ -378,6 +378,7 @@
}
free (artist);
free (title);
+
val = (char *)stats_get_value (yp->mount, "listeners");
if (val)
{
@@ -418,6 +419,7 @@
yp->process = do_yp_remove;
yp->next_update = 0;
}
+
ret = yp->process (yp, s, len);
if (ret == 0)
{
@@ -681,6 +683,7 @@
active_yps = server->next;
destroy_yp_server (server);
}
+
return NULL;
}
@@ -885,12 +888,13 @@
trigger = time(NULL) + 3;
if (server)
search_list = server->mounts;
+
while (server)
{
ypdata_t *yp = find_yp_mount (search_list, mount);
if (yp)
{
- /* we may of found entries not purged yet, so skip them */
+ /* we may of found old entries not purged yet, so skip them */
if (yp->release == 0 || yp->remove == 0)
{
search_list = yp->next;
More information about the commits
mailing list