From 97fe75a0bf4ce5a0769a7509f758eda3f52fd6b3 Mon Sep 17 00:00:00 2001 From: Warren Dukes Date: Mon, 31 May 2004 02:21:06 +0000 Subject: little cleanup of plugin stuff git-svn-id: https://svn.musicpd.org/mpd/trunk@1247 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/tag.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/tag.c') diff --git a/src/tag.c b/src/tag.c index 493b1a19d..101c004b3 100644 --- a/src/tag.c +++ b/src/tag.c @@ -101,22 +101,22 @@ char * getID3Info(struct id3_tag * tag, char * id) { } #endif -MpdTag * id3Dup(char * utf8filename) { +MpdTag * id3Dup(char * file) { MpdTag * ret = NULL; #ifdef HAVE_ID3TAG - struct id3_file * file; + struct id3_file * id3_file; struct id3_tag * tag; char * str; - file = id3_file_open(rmp2amp(utf8ToFsCharset(utf8filename)), - ID3_FILE_MODE_READONLY); - if(!file) { + id3_file = id3_file_open(file, ID3_FILE_MODE_READONLY); + + if(!id3_file) { return NULL; } - tag = id3_file_tag(file); + tag = id3_file_tag(id3_file); if(!tag) { - id3_file_close(file); + id3_file_close(id3_file); return NULL; } @@ -148,7 +148,7 @@ MpdTag * id3Dup(char * utf8filename) { ret->track = str; } - id3_file_close(file); + id3_file_close(id3_file); #endif return ret; -- cgit v1.2.3