aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-12-16 21:15:20 +0100
committerMax Kellermann <max@duempel.org>2008-12-16 21:15:20 +0100
commit3287726736a0432d2316914767b397caab0fd11f (patch)
tree3e41cffa2495da765e68fd517fcb79b97bfbaa0f
parent3d4fb9a9a64b60d936e04c13fc391a274822b6b3 (diff)
downloadmpd-3287726736a0432d2316914767b397caab0fd11f.tar.gz
mpd-3287726736a0432d2316914767b397caab0fd11f.tar.xz
mpd-3287726736a0432d2316914767b397caab0fd11f.zip
ls: removed isValidRemoteUtf8Url()
The function didn't do anything useful, it was just several lines obfuscating that it was only forwarding isRemoteUrl()'s return value.
Diffstat (limited to '')
-rw-r--r--src/ls.c40
-rw-r--r--src/ls.h2
-rw-r--r--src/playlist.c2
-rw-r--r--src/playlist_save.c2
-rw-r--r--src/stored_playlist.c4
5 files changed, 4 insertions, 46 deletions
diff --git a/src/ls.c b/src/ls.c
index 7a2eb11f7..fb67910f7 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -44,46 +44,6 @@ int printRemoteUrlHandlers(struct client *client)
return 0;
}
-int isValidRemoteUtf8Url(const char *utf8url)
-{
- int ret = 0;
- const char *temp;
-
- switch (isRemoteUrl(utf8url)) {
- case 1:
- ret = 1;
- temp = utf8url;
- while (*temp) {
- if ((*temp >= 'a' && *temp <= 'z') ||
- (*temp >= 'A' && *temp <= 'Z') ||
- (*temp >= '0' && *temp <= '9') ||
- *temp == '$' ||
- *temp == '-' ||
- *temp == '.' ||
- *temp == '+' ||
- *temp == '!' ||
- *temp == '*' ||
- *temp == '\'' ||
- *temp == '(' ||
- *temp == ')' ||
- *temp == ',' ||
- *temp == '%' ||
- *temp == '/' ||
- *temp == ':' ||
- *temp == '?' ||
- *temp == ';' || *temp == '&' || *temp == '=') {
- } else {
- ret = 1;
- break;
- }
- temp++;
- }
- break;
- }
-
- return ret;
-}
-
int isRemoteUrl(const char *url)
{
int count = 0;
diff --git a/src/ls.h b/src/ls.h
index 8d5a6546a..80f427e22 100644
--- a/src/ls.h
+++ b/src/ls.h
@@ -26,8 +26,6 @@ struct client;
const char *getSuffix(const char *utf8file);
-int isValidRemoteUtf8Url(const char *utf8url);
-
int isRemoteUrl(const char *url);
const struct decoder_plugin *
diff --git a/src/playlist.c b/src/playlist.c
index 8581755ca..8d6d246f5 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -537,7 +537,7 @@ song_by_url(const char *url)
if (song != NULL)
return song;
- if (isValidRemoteUtf8Url(url))
+ if (isRemoteUrl(url))
return song_remote_new(url);
return NULL;
diff --git a/src/playlist_save.c b/src/playlist_save.c
index 4ae965154..2568d4293 100644
--- a/src/playlist_save.c
+++ b/src/playlist_save.c
@@ -46,7 +46,7 @@ playlist_print_uri(FILE *file, const char *uri)
char tmp[MPD_PATH_MAX];
const char *s;
- if (playlist_saveAbsolutePaths && !isValidRemoteUtf8Url(uri) &&
+ if (playlist_saveAbsolutePaths && !isRemoteUrl(uri) &&
uri[0] != '/')
s = map_directory_child_fs(db_get_root(), uri, tmp);
else
diff --git a/src/stored_playlist.c b/src/stored_playlist.c
index cadd2ccdf..5c2d46709 100644
--- a/src/stored_playlist.c
+++ b/src/stored_playlist.c
@@ -156,7 +156,7 @@ spl_load(const char *utf8path)
if (*s == PLAYLIST_COMMENT)
continue;
- if (!isValidRemoteUtf8Url(s)) {
+ if (!isRemoteUrl(s)) {
struct song *song;
path_utf8 = map_fs_to_utf8(s, path_max_tmp);
@@ -360,7 +360,7 @@ spl_append_uri(const char *url, const char *utf8file)
if (song)
return spl_append_song(utf8file, song);
- if (!isValidRemoteUtf8Url(url))
+ if (!isRemoteUrl(url))
return PLAYLIST_RESULT_NO_SUCH_SONG;
song = song_remote_new(url);