oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

playlist/soundcloud: change scheme check to assertion

Browse Source 
The MPD core takes care for checking the scheme.
This commit is contained in:
Max Kellermann 2014-01-07 09:40:31 +01:00
parent da9dd58f34
commit 442dadd6fe
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/playlist/SoundCloudPlaylistPlugin.cxx
View File

@ -322,18 +322,10 @@ soundcloud_parse_json(const char *url, yajl_handle hand,
static SongEnumerator * static SongEnumerator *
soundcloud_open_uri(const char *uri, Mutex &mutex, Cond &cond) soundcloud_open_uri(const char *uri, Mutex &mutex, Cond &cond)
{ {
char *s = g_strdup(uri); assert(memcmp(uri, "soundcloud://", 13) == 0);
char *scheme = s;
char *const s = g_strdup(uri + 13);
char *p = s; char *p = s;
for (; *p; p++) {
if (*p == ':' && *(p+1) == '/' && *(p+2) == '/') {
*p = 0;
p += 3;
break;
}
}
char *arg = p; char *arg = p;
for (; *p; p++) { for (; *p; p++) {
if (*p == '/') { if (*p == '/') {
@ -345,14 +337,6 @@ soundcloud_open_uri(const char *uri, Mutex &mutex, Cond &cond)
char *rest = p; char *rest = p;
if (strcmp(scheme, "soundcloud") != 0) {
FormatWarning(soundcloud_domain,
"incompatible scheme for soundcloud plugin: %s",
scheme);
g_free(s);
return nullptr;
}
char *u = nullptr; char *u = nullptr;
if (strcmp(arg, "track") == 0) { if (strcmp(arg, "track") == 0) {
u = g_strconcat("https://api.soundcloud.com/tracks/", u = g_strconcat("https://api.soundcloud.com/tracks/",