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

cue_tag: changed runtime checks to assertions

Browse Source 
It's illegal to pass NULL here.  This should not be ignored silently.
This commit is contained in:
Max Kellermann 2009-12-16 17:00:05 +01:00
parent 5821bd1a21
commit 41a48b14e3
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/cue/cue_tag.c
View File

@ -3,6 +3,7 @@
#include "tag.h" #include "tag.h"
#include <libcue/libcue.h> #include <libcue/libcue.h>
#include <assert.h>
static struct tag * static struct tag *
cue_tag_cd(struct Cdtext *cdtext, struct Rem *rem) cue_tag_cd(struct Cdtext *cdtext, struct Rem *rem)
@ -10,8 +11,7 @@ cue_tag_cd(struct Cdtext *cdtext, struct Rem *rem)
struct tag *tag; struct tag *tag;
char *tmp; char *tmp;
//if (cdtext == NULL) assert(cdtext != NULL);
//return NULL;
tag = tag_new(); tag = tag_new();
@ -98,8 +98,7 @@ cue_tag_track(struct Cdtext *cdtext, struct Rem *rem)
struct tag *tag; struct tag *tag;
char *tmp; char *tmp;
//if (cdtext == NULL) assert(cdtext != NULL);
//return NULL;
tag = tag_new(); tag = tag_new();
@ -162,14 +161,12 @@ cue_tag_file(FILE *fp, unsigned tnum)
struct Cd *cd; struct Cd *cd;
struct tag *cd_tag, *track_tag; struct tag *cd_tag, *track_tag;
assert(fp != NULL);
if (tnum > 256) if (tnum > 256)
return NULL; return NULL;
if (fp == NULL) cd = cue_parse_file(fp);
return NULL;
else
cd = cue_parse_file(fp);
if (cd == NULL) if (cd == NULL)
return NULL; return NULL;
@ -201,14 +198,12 @@ cue_tag_string(char *str, unsigned tnum)
struct Cd *cd; struct Cd *cd;
struct tag *cd_tag, *track_tag; struct tag *cd_tag, *track_tag;
assert(str != NULL);
if (tnum > 256) if (tnum > 256)
return NULL; return NULL;
if (str == NULL) cd = cue_parse_string(str);
return NULL;
else
cd = cue_parse_string(str);
if (cd == NULL) if (cd == NULL)
return NULL; return NULL;