diff options
| -rw-r--r-- | config.c | 4 | ||||
| -rw-r--r-- | frontend_svr.c | 10 | ||||
| -rw-r--r-- | media_player.c | 6 |
3 files changed, 10 insertions, 10 deletions
@@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: config.c,v 1.63 2008-04-29 12:44:25 phintuka Exp $ + * $Id: config.c,v 1.64 2008-05-18 20:24:51 phintuka Exp $ * */ @@ -239,7 +239,7 @@ static char *strcatrealloc(char *dest, const char *src) if (!src || !*src) return dest; - int l = (dest ? strlen(dest) : 0) + strlen(src) + 1; + size_t l = (dest ? strlen(dest) : 0) + strlen(src) + 1; if(dest) { dest = (char *)realloc(dest, l); strcat(dest, src); diff --git a/frontend_svr.c b/frontend_svr.c index 720106f8..67432c3b 100644 --- a/frontend_svr.c +++ b/frontend_svr.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: frontend_svr.c,v 1.56 2008-04-10 20:21:45 phintuka Exp $ + * $Id: frontend_svr.c,v 1.57 2008-05-18 20:24:51 phintuka Exp $ * */ @@ -1108,7 +1108,7 @@ void cXinelibServer::Handle_Control_KEY(int cli, const char *arg) bool repeat = false, release = false; strn0cpy(buf, arg, sizeof(buf)); - int n = strlen(buf)-1; + size_t n = *buf ? strlen(buf)-1 : 0; while(n && buf[n]==' ') buf[n--]=0; /* trailing spaces */ if(NULL != (key=strchr(buf, ' '))) { while(*key == ' ') @@ -1445,12 +1445,12 @@ void cXinelibServer::Handle_Control_RTSP(int cli, const char *arg) /*m_ssrc*/0x4df73452, xc.remote_rtp_port, xc.remote_rtp_ttl); - int sdplen = sdp_descr ? strlen(sdp_descr) : 0; + size_t sdplen = sdp_descr ? strlen(sdp_descr) : 0; RTSPOUT(RTSP_200_OK "Content-Type: application/sdp\r\n" - "Content-Length: %d\r\n" + "Content-Length: %lu\r\n" "\r\n", - CSeq, sdplen); + CSeq, (unsigned long)sdplen); fd_control[cli].write_cmd(sdp_descr, sdplen); } else { RTSPOUT(RTSP_415 /*UNSUPPORTED_MEDIATYPE*/); diff --git a/media_player.c b/media_player.c index ebaced6d..ca0bc653 100644 --- a/media_player.c +++ b/media_player.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: media_player.c,v 1.52 2008-05-07 13:27:15 phintuka Exp $ + * $Id: media_player.c,v 1.53 2008-05-18 20:24:51 phintuka Exp $ * */ @@ -90,7 +90,7 @@ cXinelibPlayer::cXinelibPlayer(const char *File, bool Queue, const char *SubFile m_Speed = 1; if(File) { - int len = strlen(File); + size_t len = strlen(File); if(len && File[len-1] == '/') { // whole directory, create temporary playlist m_Playlist.Read(File, true); @@ -487,7 +487,7 @@ void cXinelibPlayerControl::Queue(const char *File) OpenPlayer(File, true); cControl::Launch(new cXinelibPlayerControl(ShowMusic, NULL)); } else { - int len = strlen(File); + size_t len = strlen(File); if(len && File[len-1] == '/') m_Player->Playlist().Read(File, true); else |