Unused variable and return value cleanup.

Removed unused variables
Made non-void functions that fail to return a value into void functions
Made main() return 0
Fixed pointer signedness inconsistencies.

diff --git a/mpc-car2pc.c b/mpc-car2pc.c
index c22ba2d07b108c8480af918fb3ff42134650a39c..aec579bd32f8b8ff4b35ec9415956414488ce709 100644 (file)
--- a/mpc-car2pc.c
+++ b/mpc-car2pc.c
@@ -71,7 +71,7 @@ void handle_hup(int sig)
        hupped = 1;
 }
 
-char *read_car2pc_event(void)
+unsigned char *read_car2pc_event(void)
 {
        static unsigned char buf[258];
        static int buf_len = 0;
@@ -87,7 +87,7 @@ char *read_car2pc_event(void)
        }
 
        buf_len += rd;
- again:
+
        for (i = 0; i < buf_len; i++)
                if (buf[i] == 0xFF)
                        break;
@@ -101,7 +101,7 @@ char *read_car2pc_event(void)
                memmove(buf, buf + i, buf_len);
        }
        if (buf_len >= 2 && buf_len >= 2 + buf[1]) {
-               char *ret = malloc(buf[1] + 1);
+               unsigned char *ret = malloc(buf[1] + 1);
                if (!ret)
                        return NULL;
                memcpy(ret, buf + 2, buf[1]);
@@ -115,7 +115,7 @@ char *read_car2pc_event(void)
        return NULL;
 }
 
-int send_car2pc_command(char *cmd, ...)
+void send_car2pc_command(char *cmd, ...)
 {
        char buf[255];
 
@@ -142,7 +142,7 @@ void send_song_info(void)
        }
 }
 
-int send_timer(int seconds)
+void send_timer(int seconds)
 {
        int hours = seconds / 3600;
        int minutes = (seconds / 60) % 60;
@@ -229,7 +229,7 @@ void save_disc(void)
        syslog(LOG_NOTICE, "Saved changes to playlist %s\n", buf);
 }
 
-int mainloop(void)
+void mainloop(void)
 {
        int track = -1, plid = -1, last_time = -1;
        int nr_tracks;
@@ -298,7 +298,7 @@ int mainloop(void)
                                want_state = MPD_STATUS_STATE_PLAY;
                                break;
                        case CAR2PC_TRACK:
-                               change_track(atoi(ev+2), nr_tracks);
+                               change_track(atoi((char *)ev+2), nr_tracks);
                                track = -1;
                                break;
                        case CAR2PC_NEXT_TRACK:
@@ -481,9 +481,6 @@ void connect_mpd(void)
 
 int main(int argc, char **argv)
 {
-       char *car2pc_port;
-       struct sockaddr_in sin;
-       int port;
        pid_t pid;
 
        /* When invoked from udev, fork */
@@ -524,4 +521,6 @@ int main(int argc, char **argv)
        mainloop();
 
        syslog(LOG_NOTICE, "mpc-car2pc exiting\n");
+
+       return 0;
 }