[xiph-cvs] cvs commit: icecast/win32 Icecast2win.clw icecast.dsp
Ed
oddsock at xiph.org
Wed Jan 14 20:24:58 PST 2004
oddsock 04/01/14 23:24:58
Modified: src auth.c cfgfile.c
win32 Icecast2win.clw icecast.dsp
Log:
fixed some variable definitions to be ANSI compatable.
updated win32 project files with new files
Revision Changes Path
1.2 +5 -3 icecast/src/auth.c
Index: auth.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/auth.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- auth.c 15 Jan 2004 01:01:09 -0000 1.1
+++ auth.c 15 Jan 2004 04:24:54 -0000 1.2
@@ -24,6 +24,7 @@
auth_result auth_check_client(source_t *source, client_t *client)
{
auth_t *authenticator = source->authenticator;
+ auth_result result;
if(authenticator) {
/* This will look something like "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==" */
@@ -56,7 +57,7 @@
username = userpass;
password = tmp+1;
- auth_result result = authenticator->authenticate(
+ result = authenticator->authenticate(
authenticator, username, password);
if(result == AUTH_OK)
@@ -118,12 +119,12 @@
static char *get_hash(char *data, int len)
{
struct MD5Context context;
+ unsigned char digest[16];
MD5Init(&context);
MD5Update(&context, data, len);
- unsigned char digest[16];
MD5Final(digest, &context);
return util_bin_to_hex(digest, 16);
@@ -179,11 +180,12 @@
static auth_t *auth_get_htpasswd_auth(config_options_t *options)
{
auth_t *authenticator = calloc(1, sizeof(auth_t));
+ htpasswd_auth_state *state;
authenticator->authenticate = htpasswd_auth;
authenticator->free = htpasswd_clear;
- htpasswd_auth_state *state = calloc(1, sizeof(htpasswd_auth_state));
+ state = calloc(1, sizeof(htpasswd_auth_state));
while(options) {
if(!strcmp(options->name, "filename"))
<p><p>1.7 +9 -6 icecast/src/cfgfile.c
Index: cfgfile.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/cfgfile.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cfgfile.c 15 Jan 2004 01:01:09 -0000 1.6
+++ cfgfile.c 15 Jan 2004 04:24:56 -0000 1.7
@@ -106,6 +106,7 @@
mount_proxy *mount, *nextmount;
aliases *alias, *nextalias;
int i;
+ config_options_t *option;
if (c->config_filename)
free(c->config_filename);
@@ -172,7 +173,7 @@
xmlFree(mount->fallback_mount);
xmlFree(mount->auth_type);
- config_options_t *option = mount->auth_options;
+ option = mount->auth_options;
while(option) {
config_options_t *nextopt = option->next;
xmlFree(option->name);
@@ -451,6 +452,8 @@
mount_proxy *mount = calloc(1, sizeof(mount_proxy));
mount_proxy *current = configuration->mounts;
mount_proxy *last=NULL;
+ xmlNodePtr option;
+ config_options_t *last_option;
while(current) {
last = current;
@@ -506,8 +509,8 @@
}
else if (strcmp(node->name, "authentication") == 0) {
mount->auth_type = xmlGetProp(node, "type");
- xmlNodePtr option = node->xmlChildrenNode;
- config_options_t *last = NULL;
+ option = node->xmlChildrenNode;
+ last_option = NULL;
while(option != NULL) {
if(strcmp(option->name, "option") == 0) {
config_options_t *opt = malloc(sizeof(config_options_t));
@@ -525,11 +528,11 @@
continue;
}
- if(last)
- last->next = opt;
+ if(last_option)
+ last_option->next = opt;
else
mount->auth_options = opt;
- last = opt;
+ last_option = opt;
}
option = option->next;
}
<p><p>1.8 +9 -9 icecast/win32/Icecast2win.clw
Index: Icecast2win.clw
===================================================================
RCS file: /usr/local/cvsroot/icecast/win32/Icecast2win.clw,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Icecast2win.clw 7 Jan 2004 20:31:19 -0000 1.7
+++ Icecast2win.clw 15 Jan 2004 04:24:57 -0000 1.8
@@ -13,19 +13,19 @@
Class3=CAboutDlg
ResourceCount=10
-Resource1=IDD_CONFIGDIALOG
+Resource1=IDD_SSTATUS
Resource2=IDR_MAINFRAME
-Resource3=IDD_ICECAST2WIN_DIALOG
-Resource4=IDR_MENU3
+Resource3=IDD_ABOUTBOX
+Resource4=IDR_MENU2
Class4=CStatus
-Resource5=IDD_STATSDIALOG
+Resource5=IDR_TRAY
Class5=CConfigTab
Class6=CStatsTab
-Resource6=IDR_MENU2
-Resource7=IDD_SSTATUS
-Resource8=IDD_ABOUTBOX
-Resource9=IDR_TRAY
-Resource10=IDR_MENU4
+Resource6=IDR_MENU4
+Resource7=IDD_ICECAST2WIN_DIALOG
+Resource8=IDD_CONFIGDIALOG
+Resource9=IDR_MENU3
+Resource10=IDD_STATSDIALOG
[CLS:CIcecast2winApp]
Type=0
<p><p>1.18 +16 -0 icecast/win32/icecast.dsp
Index: icecast.dsp
===================================================================
RCS file: /usr/local/cvsroot/icecast/win32/icecast.dsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- icecast.dsp 7 Jan 2004 20:31:19 -0000 1.17
+++ icecast.dsp 15 Jan 2004 04:24:57 -0000 1.18
@@ -93,6 +93,14 @@
# End Source File
# Begin Source File
+SOURCE=..\src\auth.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\auth.h
+# End Source File
+# Begin Source File
+
SOURCE=..\src\avl\avl.c
# End Source File
# Begin Source File
@@ -213,6 +221,14 @@
# End Source File
# Begin Source File
+SOURCE=..\src\md5.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\md5.h
+# End Source File
+# Begin Source File
+
SOURCE=..\src\os.h
# End Source File
# Begin Source File
<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.
More information about the commits
mailing list