MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-26 23:25:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

win32 fixes

Browse Source
This commit is contained in:
Ron Pedde 2006-03-29 22:02:42 +00:00
parent 5c24ad2d02
commit 970a75f00e
4 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf.c
View File

@ -1096,7 +1096,7 @@ char *conf_implode(char *section, char *key, char *delimiter) {
if(penum->type != LL_TYPE_STRING) { if(penum->type != LL_TYPE_STRING) {
DPRINTF(E_FATAL,L_CONF,"multivalued property not a string?\n"); DPRINTF(E_FATAL,L_CONF,"multivalued property not a string?\n");
} }
len += strlen(penum->value.as_string); len += (int)strlen(penum->value.as_string);
count++; count++;
} }
@ -1105,7 +1105,7 @@ char *conf_implode(char *section, char *key, char *delimiter) {
return NULL; return NULL;
} }
len += (strlen(delimiter) * (count-1)); len += ((int)strlen(delimiter) * (count-1));
retval = (char*)malloc(len + 1); retval = (char*)malloc(len + 1);
if(!retval) { if(!retval) {
DPRINTF(E_FATAL,L_CONF,"conf_implode: malloc\n"); DPRINTF(E_FATAL,L_CONF,"conf_implode: malloc\n");

2
src/redblack.c
View File

@ -451,7 +451,7 @@ static struct RB_ENTRY(node) *
RB_ENTRY(_lookup)(int mode, const RB_ENTRY(data_t) *key, struct RB_ENTRY(tree) *rbinfo) RB_ENTRY(_lookup)(int mode, const RB_ENTRY(data_t) *key, struct RB_ENTRY(tree) *rbinfo)
{ {
struct RB_ENTRY(node) *x,*y; struct RB_ENTRY(node) *x,*y;
int cmp=0;; int cmp=0;
int found=0; int found=0;
y=RBNULL; /* points to the parent of x */ y=RBNULL; /* points to the parent of x */

2
win32/config.h
View File

@ -74,7 +74,7 @@
#define HAVE_STRERROR 1 #define HAVE_STRERROR 1
/* Define to 1 if you have the <strings.h> header file. */ /* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1 /* #define HAVE_STRINGS_H 1 */
/* Define to 1 if you have the <string.h> header file. */ /* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1 #define HAVE_STRING_H 1

21
win32/nsi/mt-daapd-example.conf
View File

@ -51,7 +51,7 @@ admin_pw=mt-daapd
# info in. Valid choices are "sqlite" and "sqlite3". # info in. Valid choices are "sqlite" and "sqlite3".
# #
db_type=sqlite db_type=sqlite3
# #
# db_parms # db_parms
@ -96,24 +96,13 @@ servername=mt-daapd
# must be specified whether the server is running # must be specified whether the server is running
# as root or not. # as root or not.
# #
# This is a leftover from the port from unix -- it's
# not used on windows, but still hanging around, like
# an appendix.
#
runas=nobody runas=nobody
#
# playlist (optional)
#
# This is the location of a playlist file.
# This is for Apple-style "Smart Playlists"
# See the mt-daapd.playlist file in the
# contrib directory for syntax and examples
#
# This doesn't control static playlists... these
# are controlled with the "process_m3u" directive
# below.
#
playlist=/etc/mt-daapd.playlist
# #
# password (optional) # password (optional)
# #