summaryrefslogtreecommitdiff
path: root/playlist.c
diff options
context:
space:
mode:
authorGravatar waker <wakeroid@gmail.com>2011-05-01 19:24:01 +0200
committerGravatar waker <wakeroid@gmail.com>2011-05-01 19:24:01 +0200
commitd06f349fce36f391bcf25bb3e823be5c06c8d0a0 (patch)
tree7b0f84b655137c420cb305f4b293838ddf26422d /playlist.c
parentdbd71ede2e7a5235b4310002ba60657f03420b0a (diff)
fixed m3u loader race condition when called recursively
Diffstat (limited to 'playlist.c')
-rw-r--r--playlist.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/playlist.c b/playlist.c
index c718354e..4f840ed1 100644
--- a/playlist.c
+++ b/playlist.c
@@ -1157,7 +1157,6 @@ pl_insert_m3u (playItem_t *after, const char *fname, int *pabort, int (*cb)(play
vfs_fclose (fp);
const uint8_t *p = buffer;
const uint8_t *end = buffer+sz;
- LOCK;
while (p < end) {
p = pl_str_skipspaces (p, end);
if (p >= end) {
@@ -1186,7 +1185,6 @@ pl_insert_m3u (playItem_t *after, const char *fname, int *pabort, int (*cb)(play
after = it;
}
if (pabort && *pabort) {
- UNLOCK;
return after;
}
p = e;
@@ -1194,7 +1192,6 @@ pl_insert_m3u (playItem_t *after, const char *fname, int *pabort, int (*cb)(play
break;
}
}
- UNLOCK;
trace ("leave pl_insert_m3u\n");
return after;
}
@@ -1241,7 +1238,6 @@ pl_insert_pls (playItem_t *after, const char *fname, int *pabort, int (*cb)(play
char title[1024] = "";
char length[20] = "";
int lastidx = -1;
- LOCK;
while (p < end) {
p = pl_str_skipspaces (p, end);
if (p >= end) {
@@ -1272,7 +1268,6 @@ pl_insert_pls (playItem_t *after, const char *fname, int *pabort, int (*cb)(play
}
}
if (pabort && *pabort) {
- UNLOCK;
return after;
}
url[0] = 0;
@@ -1313,7 +1308,6 @@ pl_insert_pls (playItem_t *after, const char *fname, int *pabort, int (*cb)(play
}
}
if (pabort && *pabort) {
- UNLOCK;
return after;
}
url[0] = 0;
@@ -1353,7 +1347,6 @@ pl_insert_pls (playItem_t *after, const char *fname, int *pabort, int (*cb)(play
}
}
if (pabort && *pabort) {
- UNLOCK;
return after;
}
url[0] = 0;
@@ -1397,7 +1390,6 @@ pl_insert_pls (playItem_t *after, const char *fname, int *pabort, int (*cb)(play
}
}
}
- UNLOCK;
return after;
}