comparison audacious/controlsocket.c @ 625:0a73d1faeb4e trunk

[svn] GCC 4.1 warning fixes by Diego 'Flameeyes' Petteno from Gentoo.
author chainsaw
date Mon, 06 Feb 2006 17:10:47 -0800
parents e4e897d20791
children 8282b365f6cb
comparison
equal deleted inserted replaced
624:a4ab65713d46 625:0a73d1faeb4e
202 { 202 {
203 ServerPktHeader pkthdr; 203 ServerPktHeader pkthdr;
204 204
205 pkthdr.version = XMMS_PROTOCOL_VERSION; 205 pkthdr.version = XMMS_PROTOCOL_VERSION;
206 pkthdr.data_length = length; 206 pkthdr.data_length = length;
207 if (write_all(fd, &pkthdr, sizeof(ServerPktHeader)) < sizeof(pkthdr)) 207 if ((size_t)write_all(fd, &pkthdr, sizeof(ServerPktHeader)) < sizeof(pkthdr))
208 return; 208 return;
209 if (data && length > 0) 209 if (data && length > 0)
210 write_all(fd, data, length); 210 write_all(fd, data, length);
211 } 211 }
212 212
309 continue; 309 continue;
310 if ((fd = accept(ctrl_fd, (struct sockaddr *) &saddr, &len)) == -1) 310 if ((fd = accept(ctrl_fd, (struct sockaddr *) &saddr, &len)) == -1)
311 continue; 311 continue;
312 312
313 pkt = g_new0(PacketNode, 1); 313 pkt = g_new0(PacketNode, 1);
314 if (read_all(fd, &pkt->hdr, sizeof(ClientPktHeader)) 314 if ((size_t)read_all(fd, &pkt->hdr, sizeof(ClientPktHeader))
315 < sizeof(ClientPktHeader)) { 315 < sizeof(ClientPktHeader)) {
316 g_free(pkt); 316 g_free(pkt);
317 continue; 317 continue;
318 } 318 }
319 319
320 if (pkt->hdr.data_length) { 320 if (pkt->hdr.data_length) {
321 size_t data_length = pkt->hdr.data_length; 321 size_t data_length = pkt->hdr.data_length;
322 pkt->data = g_malloc0(data_length); 322 pkt->data = g_malloc0(data_length);
323 if (read_all(fd, pkt->data, data_length) < data_length) { 323 if ((size_t)read_all(fd, pkt->data, data_length) < data_length) {
324 g_free(pkt->data); 324 g_free(pkt->data);
325 g_free(pkt); 325 g_free(pkt);
326 g_warning("ctrlsocket_func(): Incomplete data packet dropped"); 326 g_warning("ctrlsocket_func(): Incomplete data packet dropped");
327 continue; 327 continue;
328 } 328 }
572 else 572 else
573 bmp_playback_initiate(); 573 bmp_playback_initiate();
574 break; 574 break;
575 case CMD_PLAYQUEUE_ADD: 575 case CMD_PLAYQUEUE_ADD:
576 num = *((guint32 *) data); 576 num = *((guint32 *) data);
577 if (num < playlist_get_length()) 577 if (num < (guint)playlist_get_length())
578 playlist_queue_position(num); 578 playlist_queue_position(num);
579 break; 579 break;
580 case CMD_PLAYQUEUE_REMOVE: 580 case CMD_PLAYQUEUE_REMOVE:
581 num = *((guint32 *) data); 581 num = *((guint32 *) data);
582 if (num < playlist_get_length()) 582 if (num < (guint)playlist_get_length())
583 playlist_queue_remove(num); 583 playlist_queue_remove(num);
584 break; 584 break;
585 case CMD_SET_PLAYLIST_POS: 585 case CMD_SET_PLAYLIST_POS:
586 num = *((guint32 *) data); 586 num = *((guint32 *) data);
587 if (num < playlist_get_length()) 587 if (num < (guint)playlist_get_length())
588 playlist_set_position(num); 588 playlist_set_position(num);
589 break; 589 break;
590 case CMD_JUMP_TO_TIME: 590 case CMD_JUMP_TO_TIME:
591 num = *((guint32 *) data); 591 num = *((guint32 *) data);
592 if (playlist_get_current_length() > 0 && 592 if (playlist_get_current_length() > 0 &&
593 num < playlist_get_current_length()) 593 num < (guint)playlist_get_current_length())
594 bmp_playback_seek(num / 1000); 594 bmp_playback_seek(num / 1000);
595 break; 595 break;
596 case CMD_SET_VOLUME: 596 case CMD_SET_VOLUME:
597 v[0] = ((guint32 *) data)[0]; 597 v[0] = ((guint32 *) data)[0];
598 v[1] = ((guint32 *) data)[1]; 598 v[1] = ((guint32 *) data)[1];