aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-23 09:53:34 +0200
committerMax Kellermann <max@duempel.org>2008-10-23 09:53:34 +0200
commit3958457256e7a594f97e7f4d7f05cabd61da3521 (patch)
treecbcef4ccf9f2eb1ccc90fe0d3da6b61a47b39ff3
parentbc938603f68d03c2a439a53b581bfc85c218a0e0 (diff)
downloadmpd-3958457256e7a594f97e7f4d7f05cabd61da3521.tar.gz
mpd-3958457256e7a594f97e7f4d7f05cabd61da3521.tar.xz
mpd-3958457256e7a594f97e7f4d7f05cabd61da3521.zip
stored_playlist: unsigned index arguments
Pass index arguments as unsigned integers. They must not be negative, and even if some caller accidently passes -1, it won't pass the bound checks (since it's now 2**32-1).
-rw-r--r--src/stored_playlist.c8
-rw-r--r--src/stored_playlist.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/stored_playlist.c b/src/stored_playlist.c
index 121f5ed3d..9e9895e9d 100644
--- a/src/stored_playlist.c
+++ b/src/stored_playlist.c
@@ -280,7 +280,7 @@ spl_move_index_internal(List *list, int src, int dest)
}
enum playlist_result
-spl_move_index(const char *utf8path, int src, int dest)
+spl_move_index(const char *utf8path, unsigned src, unsigned dest)
{
List *list;
enum playlist_result result;
@@ -323,7 +323,7 @@ spl_clear(const char *utf8path)
}
static int
-spl_remove_index_internal(List *list, int pos)
+spl_remove_index_internal(List *list, unsigned pos)
{
ListNode *node = spl_get_index(list, pos);
if (!node)
@@ -335,7 +335,7 @@ spl_remove_index_internal(List *list, int pos)
}
enum playlist_result
-spl_remove_index(const char *utf8path, int pos)
+spl_remove_index(const char *utf8path, unsigned pos)
{
List *list;
enum playlist_result result;
@@ -409,7 +409,7 @@ spl_append_uri(const char *url, const char *utf8file)
song = song_remote_new(url);
if (song) {
- int ret = spl_append_song(utf8file, song);
+ enum playlist_result ret = spl_append_song(utf8file, song);
song_free(song);
return ret;
}
diff --git a/src/stored_playlist.h b/src/stored_playlist.h
index f524829df..4841ca80e 100644
--- a/src/stored_playlist.h
+++ b/src/stored_playlist.h
@@ -46,13 +46,13 @@ List *
spl_load(const char *utf8path);
enum playlist_result
-spl_move_index(const char *utf8path, int src, int dest);
+spl_move_index(const char *utf8path, unsigned src, unsigned dest);
enum playlist_result
spl_clear(const char *utf8path);
enum playlist_result
-spl_remove_index(const char *utf8path, int pos);
+spl_remove_index(const char *utf8path, unsigned pos);
enum playlist_result
spl_append_song(const char *utf8path, struct song *song);