summaryrefslogtreecommitdiffstats
path: root/playtreeparser.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-28 09:41:07 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-28 09:41:07 +0000
commit62cc3b452b4dba6a1664cd9e4a8ec7aa96fa40ea (patch)
tree5a0c2c8e079626beef3265d391c736f7d861cafc /playtreeparser.c
parent7e23f68cf7691e2599389b8c568df8153336c48b (diff)
downloadmpv-62cc3b452b4dba6a1664cd9e4a8ec7aa96fa40ea.tar.bz2
mpv-62cc3b452b4dba6a1664cd9e4a8ec7aa96fa40ea.tar.xz
Use negative return values for errors in pls_read_entry to make it match
with the checks later on. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30793 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'playtreeparser.c')
-rw-r--r--playtreeparser.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/playtreeparser.c b/playtreeparser.c
index 39fcd76b21..587229ed01 100644
--- a/playtreeparser.c
+++ b/playtreeparser.c
@@ -252,14 +252,14 @@ pls_read_entry(char* line,pls_entry_t** _e,int* _max_entry,char** val) {
v = pls_entry_get_value(line);
if(!v) {
mp_msg(MSGT_PLAYTREE,MSGL_ERR,"No value in entry %s\n",line);
- return 0;
+ return -1;
}
num = atoi(line);
if(num <= 0 || num > limit) {
if (max_entry >= limit) {
mp_msg(MSGT_PLAYTREE, MSGL_WARN, "Too many index entries\n");
- return 0;
+ return -1;
}
num = max_entry+1;
mp_msg(MSGT_PLAYTREE,MSGL_WARN,"No or invalid entry index in entry %s\nAssuming %d\n",line,num);
@@ -267,7 +267,7 @@ pls_read_entry(char* line,pls_entry_t** _e,int* _max_entry,char** val) {
if(num > max_entry) {
e = realloc(e, num * sizeof(pls_entry_t));
if (!e)
- return 0;
+ return -1;
memset(&e[max_entry],0,(num-max_entry)*sizeof(pls_entry_t));
max_entry = num;
}