playlist: exclude end of range

In a range "start:end", "end" itself should not be included. Use the same semantics as other languages implementing ranges, e.g. Python.

playlist: exclude end of range
b7c4b788 · Max Kellermann · 6f0781f0 · b7c4b788 · b7c4b788
Commit b7c4b788 authored Jan 10, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

command.c src/command.c +1 -1

playlist.c src/playlist.c +1 -1

No files found.
--- a/src/command.c
+++ b/src/command.c
@@ -390,7 +390,7 @@ handle_currentsong(struct client *client,
 	if (song < 0)
 		return COMMAND_RETURN_OK;

-	result = playlistInfo(client, song, song);
+	result = playlistInfo(client, song, song + 1);
 	return print_playlist_result(client, result);
 }


--- a/src/playlist.c
+++ b/src/playlist.c
@@ -425,7 +425,7 @@ enum playlist_result playlistInfo(struct client *client, int song, int max)
 	if (song >= (int)playlist.length)
 		return PLAYLIST_RESULT_BAD_RANGE;
 	if (max > 0) {
-		end = MIN((unsigned)(max + 1), playlist.length);
+		end = MIN((unsigned)max, playlist.length);
 		if (end <= begin)
 			return PLAYLIST_RESULT_BAD_RANGE;
 	}