aboutsummaryrefslogtreecommitdiffstats
path: root/src/imagemagick.c
diff options
context:
space:
mode:
authorJohn Hawthorn <john.hawthorn@gmail.com>2015-04-11 18:16:40 -0700
committerJohn Hawthorn <john.hawthorn@gmail.com>2015-04-11 18:16:40 -0700
commit4ab1c75f97cb70543db388b3ed99bcfb7e94c758 (patch)
tree8482a14390de63083a69bd70f6a2685fa9c306e1 /src/imagemagick.c
parent1c0b8ffa1778e0274b660d657a6112676c421f66 (diff)
parent5c1fde906c6c28c020b518d461467e4178675060 (diff)
downloadmirror-meh-master.tar.gz
mirror-meh-master.tar.bz2
mirror-meh-master.zip
Merge pull request #9 from guillerodriguez/masterHEADmaster
Fix unused result warnings
Diffstat (limited to 'src/imagemagick.c')
-rw-r--r--src/imagemagick.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/imagemagick.c b/src/imagemagick.c
index ada2f6e..a168e80 100644
--- a/src/imagemagick.c
+++ b/src/imagemagick.c
@@ -30,14 +30,17 @@ struct image *imagemagick_open(FILE *f){
argv[0] = "convert";
argv[1] = "-depth";
argv[2] = "255";
- asprintf(&argv[3], "fd:%i", origfd);
- asprintf(&argv[4], "ppm:fd:%i", tmpfd[1]);
+ if((asprintf(&argv[3], "fd:%i", origfd) < 0) || (asprintf(&argv[4], "ppm:fd:%i", tmpfd[1]) < 0)){
+ fprintf(stderr, "Out of memory");
+ exit(EXIT_FAILURE);
+ }
argv[5] = NULL;
#ifdef NDEBUG
/* STFU OMFG */
- freopen("/dev/null", "w", stdout);
- freopen("/dev/null", "w", stderr);
+ FILE *unused __attribute__((unused));
+ unused = freopen("/dev/null", "w", stdout);
+ unused = freopen("/dev/null", "w", stderr);
#endif
execvp(argv[0], argv);