diff --git a/kstars/fitsviewer/fpack.h b/kstars/fitsviewer/fpack.h --- a/kstars/fitsviewer/fpack.h +++ b/kstars/fitsviewer/fpack.h @@ -185,7 +185,8 @@ int fp_i4rescale(fitsfile *infptr, int naxis, long *naxes, double rescale, fitsfile *outfptr, int *status); -int fp_msg (char *msg); +#define fp_msg(msg) _fp_msg((const char *)msg) +int _fp_msg (const char *msg); int fp_version (void); int fp_noop (void); diff --git a/kstars/fitsviewer/fpack.c b/kstars/fitsviewer/fpack.c --- a/kstars/fitsviewer/fpack.c +++ b/kstars/fitsviewer/fpack.c @@ -30,6 +30,12 @@ exit (0); } ================================================================== */ +int _fp_msg (const char *msg) +{ + printf ("%s", msg); + return(0); +} + int fp_get_param (int argc, char *argv[], fpstate *fpptr) { int gottype=0, gottile=0, wholetile=0, iarg, len, ndim, ii, doffset; diff --git a/kstars/fitsviewer/fpackutil.c b/kstars/fitsviewer/fpackutil.c --- a/kstars/fitsviewer/fpackutil.c +++ b/kstars/fitsviewer/fpackutil.c @@ -47,11 +47,9 @@ int XSAMPLE = 4100; int YSAMPLE = 4100; -int fp_msg (char *msg) -{ - printf ("%s", msg); - return(0); -} +#define UNUSED(x) (void)(x) +#define fp_tmpnam(suffix, rootname, tmpnam) _fp_tmpnam((char *)suffix, (char *)rootname, (char *)tmpnam) + /*--------------------------------------------------------------------------*/ int fp_noop (void) { @@ -120,7 +118,7 @@ } } /*--------------------------------------------------------------------------*/ -int fp_tmpnam(char *suffix, char *rootname, char *tmpnam) +int _fp_tmpnam(char *suffix, char *rootname, char *tmpnam) { /* create temporary file name */ @@ -1582,6 +1580,8 @@ /*--------------------------------------------------------------------------*/ int fp_unpack_hdu (fitsfile *infptr, fitsfile *outfptr, fpstate fpvar, int *status) { + UNUSED(fpvar); + int hdutype, lval; if (*status > 0) return(0); @@ -1914,6 +1914,8 @@ fpstate fpvar, int *status) { /* this routine is for performance testing of the table compression methods */ + UNUSED(fpvar); + UNUSED(outfptr2); int stat = 0, hdutype, tstatus = 0; char fzalgor[FLEN_VALUE]; @@ -2366,8 +2368,9 @@ */ void abort_fpack(int sig) { - /* clean up by deleting temporary files */ - + /* clean up by deleting temporary files */ + UNUSED(sig); + if (tempfilename[0]) { remove(tempfilename); }