oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

cleanup logging, need to be careful with SECURE and DEBUG 

git-svn-id: https://svn.musicpd.org/mpd/trunk@58 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-02-25 19:13:10 +00:00
parent 483d8873bd
commit e1c839cd56
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/interface.c
View File

@ -156,18 +156,32 @@ void openAInterface(int fd, struct sockaddr * addr) {
SECURE("interface %i: opened from ",i); SECURE("interface %i: opened from ",i);
switch(addr->sa_family) { switch(addr->sa_family) {
case AF_INET: case AF_INET:
SECURE("%s\n",inet_ntoa( {
char * host = inet_ntoa(
((struct sockaddr_in *)addr)-> ((struct sockaddr_in *)addr)->
sin_addr)); sin_addr);
if(host) {
SECURE("%s\n",host);
}
else {
SECURE("error getting ipv4 address\n");
}
}
break; break;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
case AF_INET6: case AF_INET6:
{ {
char host[INET6_ADDRSTRLEN+1]; char host[INET6_ADDRSTRLEN+1];
memset(host,0,INET6_ADDRSTRLEN+1); memset(host,0,INET6_ADDRSTRLEN+1);
SECURE("%s\n",inet_ntop(AF_INET6,(void *) if(inet_ntop(AF_INET6,(void *)
&(((struct sockaddr_in6 *)addr)-> &(((struct sockaddr_in6 *)addr)->
sin6_addr),host,INET6_ADDRSTRLEN)); sin6_addr),host,INET6_ADDRSTRLEN))
{
SECURE("%s\n",host);
}
else {
SECURE("error getting ipv6 address\n");
}
} }
break; break;
#endif #endif

18
src/log.h
View File

@ -27,22 +27,16 @@
extern int logLevel; extern int logLevel;
#define ERROR(x, arg...) do { \ #define ERROR(x, arg...) myfprintf(stderr, x , ##arg)
myfprintf(stderr, x , ##arg); \
} while(0);
#define LOG(x, arg...) do { \ #define LOG(x, arg...) myfprintf(stdout, x , ##arg)
myfprintf(stdout, x , ##arg); \
} while(0);
#define SECURE(x, arg...) do { \ #define SECURE(x, arg...) if(logLevel>=LOG_LEVEL_SECURE) \
if(logLevel>=LOG_LEVEL_SECURE) myfprintf(stdout, x , ##arg); \ myfprintf(stdout, x , ##arg)
} while(0);
#define DEBUG(x, arg...) do { \ #define DEBUG(x, arg...) if(logLevel>=LOG_LEVEL_DEBUG) \
if(logLevel>=LOG_LEVEL_DEBUG) myfprintf(stdout, x , ##arg); \ myfprintf(stdout, x , ##arg)
} while(0);
void initLog(); void initLog();

4
src/playerData.c
View File

@ -103,7 +103,7 @@ void initPlayerData() {
playerData_pd->playerControl.queueState = PLAYER_QUEUE_BLANK; playerData_pd->playerControl.queueState = PLAYER_QUEUE_BLANK;
playerData_pd->playerControl.queueLockState = PLAYER_QUEUE_UNLOCKED; playerData_pd->playerControl.queueLockState = PLAYER_QUEUE_UNLOCKED;
playerData_pd->playerControl.seek = 0; playerData_pd->playerControl.seek = 0;
memset(playerData_pd->playerControl.file,0,MAXPATHLEN); memset(playerData_pd->playerControl.file,0,MAXPATHLEN+1);
playerData_pd->playerControl.crossFade = crossfade; playerData_pd->playerControl.crossFade = crossfade;
playerData_pd->playerControl.softwareVolume = 100; playerData_pd->playerControl.softwareVolume = 100;
playerData_pd->playerControl.totalPlayTime = 0; playerData_pd->playerControl.totalPlayTime = 0;
@ -113,7 +113,7 @@ void initPlayerData() {
playerData_pd->decoderControl.state = DECODE_STATE_STOP; playerData_pd->decoderControl.state = DECODE_STATE_STOP;
playerData_pd->decoderControl.seek = 0; playerData_pd->decoderControl.seek = 0;
playerData_pd->decoderControl.error = DECODE_ERROR_NOERROR; playerData_pd->decoderControl.error = DECODE_ERROR_NOERROR;
memset(playerData_pd->decoderControl.file,0,MAXPATHLEN); memset(playerData_pd->decoderControl.file,0,MAXPATHLEN+1);
} }
PlayerData * getPlayerData() { PlayerData * getPlayerData() {