summaryrefslogtreecommitdiff
path: root/src/test_grabbag/picture
diff options
context:
space:
mode:
authorErik de Castro Lopo <erikd@mega-nerd.com>2013-03-17 20:56:41 +1100
committerErik de Castro Lopo <erikd@mega-nerd.com>2013-03-17 21:00:07 +1100
commit3c84f9e86b40b64bb42af6dff8c61521c5439ecd (patch)
tree0dc0434d74e18c324d8180386fc05170e2973df2 /src/test_grabbag/picture
parent06af237c7008086a5389871320e5669dd51a0fdc (diff)
downloadflac-3c84f9e86b40b64bb42af6dff8c61521c5439ecd.tar.gz
Use new function flac_snprintf() where ever appropriate.
This replaces un-safe usage of sprintf() and Micorsoft's _snprintf() with something sane.
Diffstat (limited to 'src/test_grabbag/picture')
-rw-r--r--src/test_grabbag/picture/main.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/test_grabbag/picture/main.c b/src/test_grabbag/picture/main.c
index 585607a7..766db7d9 100644
--- a/src/test_grabbag/picture/main.c
+++ b/src/test_grabbag/picture/main.c
@@ -70,17 +70,9 @@ static FLAC__bool test_one_picture(const char *prefix, const PictureFile *pf, co
const char *error;
char s[4096];
if(fn_only)
-#if defined _MSC_VER || defined __MINGW32__
- _snprintf(s, sizeof(s)-1, "%s/%s", prefix, pf->path);
-#else
- snprintf(s, sizeof(s)-1, "%s/%s", prefix, pf->path);
-#endif
+ flac_snprintf(s, sizeof(s), "%s/%s", prefix, pf->path);
else
-#if defined _MSC_VER || defined __MINGW32__
- _snprintf(s, sizeof(s)-1, "%u|%s|%s|%s|%s/%s", (unsigned)pf->type, pf->mime_type, pf->description, res, prefix, pf->path);
-#else
- snprintf(s, sizeof(s)-1, "%u|%s|%s|%s|%s/%s", (unsigned)pf->type, pf->mime_type, pf->description, res, prefix, pf->path);
-#endif
+ flac_snprintf(s, sizeof(s), "%u|%s|%s|%s|%s/%s", (unsigned)pf->type, pf->mime_type, pf->description, res, prefix, pf->path);
printf("testing grabbag__picture_parse_specification(\"%s\")... ", s);
if(0 == (obj = grabbag__picture_parse_specification(s, &error)))