win32 cleanups

This commit is contained in:
Ron Pedde 2006-03-14 00:45:33 +00:00
parent be7bdfbbfb
commit f0ee070937
4 changed files with 20 additions and 16 deletions

View File

@ -141,13 +141,13 @@ int db_sql_escape(char *buffer, int *size, char *fmt, ...) {
va_end(ap);
if(*size < (int)strlen(escaped)) {
*size = strlen(escaped) + 1;
*size = (int)strlen(escaped) + 1;
db_sql_vmfree_fn(escaped);
return DB_E_SIZE;
}
strcpy(buffer,escaped);
*size = strlen(escaped);
*size = (int)strlen(escaped);
db_sql_vmfree_fn(escaped);
return DB_E_SUCCESS;

View File

@ -587,7 +587,7 @@ int sp_scan(PARSETREE tree, int hint) {
token_string=tree->current;
if(found) {
if(pfield->xlat) {
len = strlen(pfield->xlat);
len = (int)strlen(pfield->xlat);
token_string = pfield->xlat;
}
}

View File

@ -145,7 +145,10 @@
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#define TIME_WITH_SYS_TIME 1
/* */
#define HAVE_SQL
/* Version number of package */
#define VERSION "cvs-win32-afu"
#define VERSION "cvs-win32-20060313"
#include "win32.h"

View File

@ -11,6 +11,7 @@
#
[general]
#
# web_root (required)
#
@ -23,7 +24,7 @@
# path is probably /usr/local/share/mt-daapd/admin-root.
#
web_root admin-root
web_root=admin-root
#
# port (required)
@ -32,7 +33,7 @@ web_root admin-root
# port, but this is the default iTunes port
#
port 9999
port=9999
#
# admin_pw (required)
@ -40,7 +41,7 @@ port 9999
# This is the password to the administrative pages
#
admin_pw mt-daapd
admin_pw=mt-daapd
#
@ -50,7 +51,7 @@ admin_pw mt-daapd
# info in. Valid choices are "sqlite" and "sqlite3".
#
db_type sqlite
db_type=sqlite
#
# db_parms
@ -64,7 +65,7 @@ db_type sqlite
# must be writable by the "runas" user.
#
db_parms .
db_parms=.
#
# mp3_dir (required)
@ -74,7 +75,7 @@ db_parms .
# in the same physical filesystem.
#
mp3_dir c:\documents and settings
mp3_dir=c:\mp3
#
# servername (required)
@ -84,7 +85,7 @@ mp3_dir c:\documents and settings
# exported via DAAP. Also know as "What shows up in iTunes".
#
servername mt-daapd
servername=mt-daapd
#
# runas (required)
@ -96,7 +97,7 @@ servername mt-daapd
# as root or not.
#
runas nobody
runas=nobody
#
# playlist (optional)
@ -111,7 +112,7 @@ runas nobody
# below.
#
playlist /etc/mt-daapd.playlist
playlist=/etc/mt-daapd.playlist
#
# password (optional)
@ -120,7 +121,7 @@ playlist /etc/mt-daapd.playlist
# i.e. the password that iTunes prompts for
#
#password mp3
#password=mp3
#
# extensions (optional)
@ -138,7 +139,7 @@ playlist /etc/mt-daapd.playlist
# See the ssc_* options below.
#
extensions .mp3,.m4a,.m4p
extensions=.mp3,.m4a,.m4p
#
# ssc_codectypes (optional)
@ -285,7 +286,7 @@ extensions .mp3,.m4a,.m4p
# the file is indexed.
#
scan_type 2
scan_type=2
#
# compress