diff --git a/src/sfascii.c b/src/sfascii.c index 0f310bf84..8789b9da6 100644 --- a/src/sfascii.c +++ b/src/sfascii.c @@ -6,6 +6,10 @@ #include "integer.h" #include "sfprocs.h" +#ifdef MACOSX +extern long long FDECL(atoll, (const char *)); +#endif + static void FDECL(put_savefield, (NHFILE *, char *, size_t)); char *FDECL(get_savefield, (NHFILE *, char *, size_t)); #ifdef SAVEFILE_DEBUGGING @@ -498,13 +502,13 @@ int indx UNUSED; static void -put_savefield(nhfp, outbuf, outbufsz) +put_savefield(nhfp, obuf, outbufsz) NHFILE *nhfp; -char *outbuf; -size_t outbufsz; +char *obuf; +size_t outbufsz UNUSED; { nhfp->count++; - fprintf(nhfp->fpdef, "%07ld|%s\n", nhfp->count, outbuf); + fprintf(nhfp->fpdef, "%07ld|%s\n", nhfp->count, obuf); } /* @@ -573,7 +577,7 @@ NHFILE *nhfp; aligntyp *d_aligntyp; const char *myparent UNUSED; const char *myname UNUSED; -int cnt; +int cnt UNUSED; { char *rstr; aligntyp tmp; @@ -598,7 +602,7 @@ NHFILE *nhfp; uint8_t *d_bitfield; const char *myparent UNUSED; const char *myname UNUSED; -int cnt; +int cnt UNUSED; { char *rstr; uint8_t tmp; @@ -684,7 +688,7 @@ int cnt; long long lltmp; char *rstr; const char *parent = "genericptr"; - static char *glorkum = "glorkum"; + static const char *glorkum = "glorkum"; char *byteptr = (char *) d_genericptr; nhUse(parent); diff --git a/src/sflendian.c b/src/sflendian.c index 81f549e29..ca2a69707 100644 --- a/src/sflendian.c +++ b/src/sflendian.c @@ -786,7 +786,7 @@ NHFILE *nhfp; uint8_t *d_bitfield; const char *myparent UNUSED; const char *myname UNUSED; -int cnt; +int cnt UNUSED; { const char *parent = "bitfield"; @@ -877,7 +877,7 @@ const char *myname UNUSED; int cnt; { int i; - static char *glorkum = "glorkum"; + static const char *glorkum = "glorkum"; int8_t p; for (i = 0; i < cnt; ++i) { @@ -1034,6 +1034,7 @@ int cnt; uint64_t ui64, val; const char *parent = "size_t"; + nhUse(parent); for (i = 0; i < cnt; ++i) { #ifdef SAVEFILE_DEBUGGING floc = ftell(nhfp->fpdef); @@ -1066,6 +1067,7 @@ int cnt UNUSED; char buf[BUFSZ]; const char *parent = "time_t"; + nhUse(parent); #ifdef SAVEFILE_DEBUGGING floc = ftell(nhfp->fpdef); #endif @@ -1268,6 +1270,7 @@ int cnt; char *src, *dest; int16_t i16, incount = 0; + nhUse(parent); #ifdef SAVEFILE_DEBUGGING floc = ftell(nhfp->fpdef); #endif