notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
deal with some gcc7+ warnings
[picodrive.git]
/
pico
/
cd
/
cd_image.c
diff --git
a/pico/cd/cd_image.c
b/pico/cd/cd_image.c
index
97c8f3f
..
5638c9b
100644
(file)
--- a/
pico/cd/cd_image.c
+++ b/
pico/cd/cd_image.c
@@
-11,6
+11,10
@@
#include "cdd.h"
#include "cue.h"
#include "cdd.h"
#include "cue.h"
+#if defined(__GNUC__) && __GNUC__ >= 7
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
+
static int handle_mp3(const char *fname, int index)
{
track_t *track = &cdd.toc.tracks[index];
static int handle_mp3(const char *fname, int index)
{
track_t *track = &cdd.toc.tracks[index];
@@
-61,6
+65,7
@@
static void to_upper(char *d, const char *s)
else
*d = *s;
}
else
*d = *s;
}
+ *d = 0;
}
// cdd.c uses lba - 150
}
// cdd.c uses lba - 150
@@
-183,7
+188,6
@@
int load_cd_image(const char *cd_img_name, int *type)
elprintf(EL_STATUS, "Track %2i: %s %9i AUDIO %s",
n, tmp_ext, length, cue_data->tracks[n].fname);
}
elprintf(EL_STATUS, "Track %2i: %s %9i AUDIO %s",
n, tmp_ext, length, cue_data->tracks[n].fname);
}
- cue_destroy(cue_data);
goto finish;
}
goto finish;
}
@@
-260,6
+264,9
@@
finish:
if (PicoCDLoadProgressCB != NULL)
PicoCDLoadProgressCB(cd_img_name, 100);
if (PicoCDLoadProgressCB != NULL)
PicoCDLoadProgressCB(cd_img_name, 100);
+ if (cue_data != NULL)
+ cue_destroy(cue_data);
+
return 0;
}
return 0;
}