diff --git a/src/io.c b/src/io.c index 296b7d1e..1ae390e1 100644 --- a/src/io.c +++ b/src/io.c @@ -323,7 +323,7 @@ int io_urldecode(char *str) { switch(*current) { case '+': *dst++ = ' '; - *current++; + current++; break; case '%': /* This is rather brute force. Maybe sscanf? */ @@ -2078,7 +2078,6 @@ int io_socket_write(IO_PRIVHANDLE *phandle, unsigned char *buf,uint32_t *len) { ssize_t byteswritten=0; uint32_t totalbytes; unsigned char *bufp; - long blocking = 0; ASSERT(phandle); ASSERT(phandle->private); diff --git a/src/plugins/out-daap.c b/src/plugins/out-daap.c index a7ef39b9..348c0914 100644 --- a/src/plugins/out-daap.c +++ b/src/plugins/out-daap.c @@ -344,6 +344,7 @@ void plugin_handler(WS_CONNINFO *pwsc) { } pi_log(E_DBG,"Tokenizing url\n"); + save = NULL; while((ppi->uri_count < 10) && (token=strtok_r(string,"/",&save))) { string=NULL; ppi->uri_sections[ppi->uri_count++] = token; diff --git a/src/plugins/rsp.c b/src/plugins/rsp.c index 8244d157..99cf0e6c 100644 --- a/src/plugins/rsp.c +++ b/src/plugins/rsp.c @@ -197,6 +197,7 @@ void plugin_handler(WS_CONNINFO *pwsc) { memset((void*)&ppi->dq,0,sizeof(DB_QUERY)); pi_log(E_DBG,"Tokenizing url\n"); + save = NULL; while((ppi->uri_count < 10) && (token=strtok_r(string,"/",&save))) { string=NULL; ppi->uri_sections[ppi->uri_count++] = token; diff --git a/src/plugins/ssc-ffmpeg.c b/src/plugins/ssc-ffmpeg.c index 99abbc7c..1e030e29 100644 --- a/src/plugins/ssc-ffmpeg.c +++ b/src/plugins/ssc-ffmpeg.c @@ -223,7 +223,7 @@ int ssc_ffmpeg_open(void *vp, MP3FILE *pmp3) { } - if(strncmp(id3.id,"ID3",3)==0) { + if(strncmp((char *)id3.id,"ID3",3)==0) { /* found an ID3 header... */ pi_log(E_DBG,"Found ID3 header\n"); size = (id3.size[0] << 21 | id3.size[1] << 14 | diff --git a/src/redblack.c b/src/redblack.c index 968fd57e..560681a6 100644 --- a/src/redblack.c +++ b/src/redblack.c @@ -146,7 +146,6 @@ RB_STATIC struct RB_ENTRY(tree) *RB_ENTRY(init)(void) #endif /* RB_CUSTOMIZE */ { struct RB_ENTRY(tree) *retval; - char c; if ((retval=(struct RB_ENTRY(tree) *) malloc(sizeof(struct RB_ENTRY(tree))))==NULL) return(NULL); diff --git a/src/scan-mpc.c b/src/scan-mpc.c index d9994579..d645a56e 100644 --- a/src/scan-mpc.c +++ b/src/scan-mpc.c @@ -42,7 +42,6 @@ * @returns TRUE if file should be added to DB, FALSE otherwise */ int scan_get_mpcinfo(char *filename, MP3FILE *pmp3) { - FILE *f; TagLib_File *file; TagLib_Tag *tag; const TagLib_AudioProperties *properties;