goulash-lover
/
legacy-imlib2
forked from old/legacy-imlib2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ID3 loader: Some mostly cosmetic rearrangements

This commit is contained in:
Kim Woelders 2020-02-19 19:52:12 +01:00
parent 4ec88a0dda
commit 4d191f6492
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/modules/loaders/loader_id3.c
View File

@ -49,7 +49,7 @@ id3_frame_id(struct id3_frame *frame)
} }
static context * static context *
context_create(const char *filename) context_create(const char *filename, FILE * f)
{ {
context *node = (context *) malloc(sizeof(context)); context *node = (context *) malloc(sizeof(context));
context *ptr, *last; context *ptr, *last;
@ -57,13 +57,16 @@ context_create(const char *filename)
node->refcount = 1; node->refcount = 1;
{ {
int fd;
struct id3_file *file; struct id3_file *file;
struct id3_tag *tag; struct id3_tag *tag;
unsigned int i; unsigned int i;
file = id3_file_open(filename, ID3_FILE_MODE_READONLY); fd = dup(fileno(f));
file = id3_file_fdopen(fd, ID3_FILE_MODE_READONLY);
if (!file) if (!file)
{ {
close(fd);
fprintf(stderr, "Unable to open tagged file %s: %s\n", fprintf(stderr, "Unable to open tagged file %s: %s\n",
filename, strerror(errno)); filename, strerror(errno));
goto fail_free; goto fail_free;
@ -81,7 +84,9 @@ context_create(const char *filename)
id3_tag_attachframe(node->tag, id3_tag_get_frame(tag, i)); id3_tag_attachframe(node->tag, id3_tag_get_frame(tag, i));
id3_file_close(file); id3_file_close(file);
} }
node->filename = strdup(filename); node->filename = strdup(filename);
if (!id3_ctxs) if (!id3_ctxs)
{ {
node->id = 1; node->id = 1;
@ -90,6 +95,7 @@ context_create(const char *filename)
return node; return node;
} }
ptr = id3_ctxs; ptr = id3_ctxs;
last = NULL; last = NULL;
while (UNLIKELY(ptr && (ptr->id + 1) >= last_id)) while (UNLIKELY(ptr && (ptr->id + 1) >= last_id))
{ {
@ -97,13 +103,16 @@ context_create(const char *filename)
last = ptr; last = ptr;
ptr = ptr->next; ptr = ptr->next;
} }
/* Paranoid! this can occur only if there are INT_MAX contexts :) */ /* Paranoid! this can occur only if there are INT_MAX contexts :) */
if (UNLIKELY(!ptr)) if (UNLIKELY(!ptr))
{ {
fprintf(stderr, "Too many open ID3 contexts\n"); fprintf(stderr, "Too many open ID3 contexts\n");
goto fail_close; goto fail_close;
} }
node->id = ptr->id + 1; node->id = ptr->id + 1;
if (UNLIKELY(!!last)) if (UNLIKELY(!!last))
{ {
node->next = last->next; node->next = last->next;
@ -238,7 +247,7 @@ typedef struct lopt {
} lopt; } lopt;
static char static char
get_options(lopt * opt, ImlibImage * im) get_options(lopt * opt, const ImlibImage * im, FILE * f)
{ {
unsigned int handle = 0, index = 0, traverse = 0; unsigned int handle = 0, index = 0, traverse = 0;
context *ctx; context *ctx;
@ -286,7 +295,7 @@ get_options(lopt * opt, ImlibImage * im)
if (handle) if (handle)
ctx = context_get(handle); ctx = context_get(handle);
else if (!(ctx = context_get_by_name(im->real_file)) && else if (!(ctx = context_get_by_name(im->real_file)) &&
!(ctx = context_create(im->real_file))) !(ctx = context_create(im->real_file, f)))
return 0; return 0;
if (!index) if (!index)
@ -490,15 +499,20 @@ char
load(ImlibImage * im, ImlibProgressFunction progress, load(ImlibImage * im, ImlibProgressFunction progress,
char progress_granularity, char load_data) char progress_granularity, char load_data)
{ {
FILE *f;
ImlibLoader *loader; ImlibLoader *loader;
lopt opt; lopt opt;
int res; int res;
struct stat st;
if (stat(im->real_file, &st) < 0) res = LOAD_FAIL;
return 0; opt.ctx = NULL;
if (!get_options(&opt, im))
return 0; f = fopen(im->real_file, "rb");
if (!f)
return LOAD_FAIL;
if (!get_options(&opt, im, f))
goto fail_context;
if (!get_loader(&opt, &loader)) if (!get_loader(&opt, &loader))
goto fail_context; goto fail_context;
@ -583,12 +597,14 @@ load(ImlibImage * im, ImlibProgressFunction progress,
} }
#endif #endif
context_delref(opt.ctx); res = LOAD_SUCCESS;
return res;
fail_context: fail_context:
context_delref(opt.ctx); if (opt.ctx)
return 0; context_delref(opt.ctx);
fclose(f);
return res;
} }
void void