playlist: moved "repeat" and "random" value checks to command.c

src/command.c

@@ -773,7 +773,15 @@ static int handleRepeat(int fd, mpd_unused int *permission,
 
 	if (check_int(fd, &status, argv[1], need_integer) < 0)
 		return -1;
-	return setPlaylistRepeatStatus(fd, status);
+
+	if (status != 0 && status != 1) {
+		commandError(fd, ACK_ERROR_ARG,
+			     "\"%i\" is not 0 or 1", status);
+		return -1;
+	}
+
+	setPlaylistRepeatStatus(status);
+	return 0;
 }
 
 static int handleRandom(int fd, mpd_unused int *permission,
@@ -783,7 +791,15 @@ static int handleRandom(int fd, mpd_unused int *permission,
 
 	if (check_int(fd, &status, argv[1], need_integer) < 0)
 		return -1;
-	return setPlaylistRandomStatus(fd, status);
+
+	if (status != 0 && status != 1) {
+		commandError(fd, ACK_ERROR_ARG,
+			     "\"%i\" is not 0 or 1", status);
+		return -1;
+	}
+
+	setPlaylistRandomStatus(status);
+	return 0;
 }
 
 static int handleStats(int fd, mpd_unused int *permission,

src/playlist.c

@@ -327,9 +327,9 @@ void readPlaylistState(FILE *fp)
 			if (strcmp
 			    (&(buffer[strlen(PLAYLIST_STATE_FILE_REPEAT)]),
 			     "1") == 0) {
-				setPlaylistRepeatStatus(STDERR_FILENO, 1);
+				setPlaylistRepeatStatus(1);
 			} else
-				setPlaylistRepeatStatus(STDERR_FILENO, 0);
+				setPlaylistRepeatStatus(0);
 		} else
 		    if (strncmp
 			(buffer, PLAYLIST_STATE_FILE_CROSSFADE,
@@ -348,9 +348,9 @@ void readPlaylistState(FILE *fp)
 			     (buffer
 			      [strlen(PLAYLIST_STATE_FILE_RANDOM)]),
 			     "1") == 0) {
-				setPlaylistRandomStatus(STDERR_FILENO, 1);
+				setPlaylistRandomStatus(1);
 			} else
-				setPlaylistRandomStatus(STDERR_FILENO, 0);
+				setPlaylistRandomStatus(0);
 		} else if (strncmp(buffer, PLAYLIST_STATE_FILE_CURRENT,
 				   strlen(PLAYLIST_STATE_FILE_CURRENT))
 			   == 0) {
@@ -1012,21 +1012,14 @@ int getPlaylistRandomStatus(void)
 	return playlist.random;
 }
 
-int setPlaylistRepeatStatus(int fd, int status)
+void setPlaylistRepeatStatus(int status)
 {
-	if (status != 0 && status != 1) {
-		commandError(fd, ACK_ERROR_ARG, "\"%i\" is not 0 or 1", status);
-		return -1;
-	}
-
 	if (playlist_state == PLAYLIST_STATE_PLAY) {
 		if (playlist.repeat && !status && playlist.queued == 0)
 			clearPlayerQueue();
 	}
 
 	playlist.repeat = status;
-
-	return 0;
 }
 
 int moveSongInPlaylist(int fd, int from, int to)
@@ -1183,15 +1176,10 @@ static void randomizeOrder(int start, int end)
 	}
 }
 
-int setPlaylistRandomStatus(int fd, int status)
+void setPlaylistRandomStatus(int status)
 {
 	int statusWas = playlist.random;
 
-	if (status != 0 && status != 1) {
-		commandError(fd, ACK_ERROR_ARG, "\"%i\" is not 0 or 1", status);
-		return -1;
-	}
-
 	playlist.random = status;
 
 	if (status != statusWas) {
@@ -1209,8 +1197,6 @@ int setPlaylistRandomStatus(int fd, int status)
 		} else
 			orderPlaylist();
 	}
-
-	return 0;
 }
 
 void previousSongInPlaylist(void)

src/playlist.h

@@ -105,11 +105,11 @@ int loadPlaylist(int fd, const char *utf8file);
 
 int getPlaylistRepeatStatus(void);
 
-int setPlaylistRepeatStatus(int fd, int status);
+void setPlaylistRepeatStatus(int status);
 
 int getPlaylistRandomStatus(void);
 
-int setPlaylistRandomStatus(int fd, int status);
+void setPlaylistRandomStatus(int status);
 
 int getPlaylistCurrentSong(void);