aboutsummaryrefslogtreecommitdiff
path: root/libmpio/src/mpio.c
diff options
context:
space:
mode:
authorLars-Dominik Braun <PromyLOPh@lavabit.com>2009-05-09 13:30:25 +0200
committerLars-Dominik Braun <PromyLOPh@lavabit.com>2009-05-09 13:30:25 +0200
commit2d49dfdd370852d5033b848fd69b6112368b7d20 (patch)
treee83bbefd73bc643df14b9e0728df1ff5eea11d6a /libmpio/src/mpio.c
parent5c2e36136f0c6801ef73ddeaff7f7d4ac412681f (diff)
downloadmpiosh-2d49dfdd370852d5033b848fd69b6112368b7d20.tar.gz
mpiosh-2d49dfdd370852d5033b848fd69b6112368b7d20.tar.bz2
mpiosh-2d49dfdd370852d5033b848fd69b6112368b7d20.zip
Drop id3 rewriting
Diffstat (limited to 'libmpio/src/mpio.c')
-rw-r--r--libmpio/src/mpio.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/libmpio/src/mpio.c b/libmpio/src/mpio.c
index b17fbd4..101d608 100644
--- a/libmpio/src/mpio.c
+++ b/libmpio/src/mpio.c
@@ -40,7 +40,6 @@
#include "mpio.h"
#include "smartmedia.h"
#include "fat.h"
-#include "id3.h"
void mpio_bail_out(void);
void mpio_init_internal(mpio_t *);
@@ -118,7 +117,7 @@ static const int mpio_error_num = sizeof mpio_errors / sizeof(mpio_error_t);
static int _mpio_errno = 0;
-#define MPIO_ERR_RETURN(err) { mpio_id3_end(m); _mpio_errno = err; return -1 ; }
+#define MPIO_ERR_RETURN(err) { _mpio_errno = err; return -1 ; }
#define MPIO_CHECK_FILENAME(filename) \
if (!mpio_check_filename(filename)) { \
@@ -468,11 +467,6 @@ mpio_init(mpio_callback_init_t progress_callback)
/* set default charset for filename conversion */
new_mpio->charset=strdup(MPIO_CHARSET);
- /* disable ID3 rewriting support */
- new_mpio->id3=0;
- strncpy(new_mpio->id3_format, MPIO_ID3_FORMAT, INFO_LINE);
- new_mpio->id3_temp[0]=0x00;
-
return new_mpio;
}
@@ -761,7 +755,6 @@ mpio_file_put_real(mpio_t *m, mpio_mem_t mem, mpio_filename_t i_filename,
struct stat file_stat;
struct tm tt;
time_t curr;
- int id3;
int block_size;
BYTE *p = NULL;
@@ -786,8 +779,6 @@ mpio_file_put_real(mpio_t *m, mpio_mem_t mem, mpio_filename_t i_filename,
{
fsize=filesize=memory_size;
} else {
- id3 = mpio_id3_do(m, i_filename, use_filename);
- if (!id3)
strncpy(use_filename, i_filename, INFO_LINE);
if (stat((const char *)use_filename, &file_stat)!=0) {
debug("could not find file: %s\n", use_filename);
@@ -979,8 +970,6 @@ mpio_file_put_real(mpio_t *m, mpio_mem_t mem, mpio_filename_t i_filename,
fsize, start, 0x20);
}
- mpio_id3_end(m);
-
return fsize-filesize;
}