From 7b5dc7960602af23f65c418c7d5287112812e089 Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@fadden.com>
Date: Tue, 28 Oct 2014 10:45:25 -0700
Subject: [PATCH] Eliminate some compiler warnings.

---
 nufxlib/MiscUtils.c       |  6 +++---
 nufxlib/Squeeze.c         |  1 +
 nufxlib/samples/ImgConv.c | 40 +++++++++++++++++++++------------------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/nufxlib/MiscUtils.c b/nufxlib/MiscUtils.c
index fc6284c..9d6a7c6 100644
--- a/nufxlib/MiscUtils.c
+++ b/nufxlib/MiscUtils.c
@@ -215,7 +215,7 @@ Nu_ReportError(NuArchive* pArchive, const char* file, int line,
     va_list args;
     char buf[kNuHeftyBufSize];
     int count;
-    #if defined(HAVE_SNPRINTF) || defined(SPRINTF_RETURNS_INT)
+    #if !defined(HAVE_SNPRINTF) && defined(SPRINTF_RETURNS_INT)
     int cc;
     #endif
 
@@ -255,10 +255,10 @@ Nu_ReportError(NuArchive* pArchive, const char* file, int line,
 
         #if defined(HAVE_SNPRINTF) && defined(SNPRINTF_DECLARED)
         if (msg == nil)
-            cc = snprintf(buf+count, sizeof(buf) - count,
+            snprintf(buf+count, sizeof(buf) - count,
                         "(unknown err=%d)", err);
         else
-            cc = snprintf(buf+count, sizeof(buf) - count, "%s", msg);
+            snprintf(buf+count, sizeof(buf) - count, "%s", msg);
         #else
           #ifdef SPRINTF_RETURNS_INT
             if (msg == nil)
diff --git a/nufxlib/Squeeze.c b/nufxlib/Squeeze.c
index 6164385..f28b3c4 100644
--- a/nufxlib/Squeeze.c
+++ b/nufxlib/Squeeze.c
@@ -919,6 +919,7 @@ Nu_ExpandHuffmanSQ(NuArchive* pArchive, const NuRecord* pRecord,
 
     usqState.dataInBuffer = 0;
     usqState.dataPtr = pArchive->compBuf;
+    usqState.bits = usqState.bitPosn = 0;
 
     compRemaining = pThread->thCompThreadEOF;
 #ifdef FULL_SQ_HEADER
diff --git a/nufxlib/samples/ImgConv.c b/nufxlib/samples/ImgConv.c
index 60a53c2..a697b60 100644
--- a/nufxlib/samples/ImgConv.c
+++ b/nufxlib/samples/ImgConv.c
@@ -115,8 +115,9 @@ WriteLongLE(FILE* fp, unsigned long val)
 int
 ReadImgHeader(FILE* fp, ImgHeader* pHeader)
 {
-    fread(pHeader->magic, 4, 1, fp);
-    fread(pHeader->creator, 4, 1, fp);
+    size_t ignored;
+    ignored = fread(pHeader->magic, 4, 1, fp);
+    ignored = fread(pHeader->creator, 4, 1, fp);
     ReadShortLE(fp, &pHeader->headerLen);
     ReadShortLE(fp, &pHeader->version);
     ReadLongLE(fp, &pHeader->imageFormat);
@@ -133,6 +134,7 @@ ReadImgHeader(FILE* fp, ImgHeader* pHeader)
     ReadLongLE(fp, &pHeader->spare[2]);
     ReadLongLE(fp, &pHeader->spare[3]);
 
+    (void) ignored;
     if (feof(fp) || ferror(fp))
         return -1;
 
@@ -287,22 +289,24 @@ CreateDosSource(const ImgHeader* pHeader, FILE* fp,
      * to ProDOS ordering.
      */
     for (offset = 0; offset < pHeader->dataLen; offset += 4096) {
-        fread(diskBuffer + offset + 0x0000, 256, 1, fp);
-        fread(diskBuffer + offset + 0x0e00, 256, 1, fp);
-        fread(diskBuffer + offset + 0x0d00, 256, 1, fp);
-        fread(diskBuffer + offset + 0x0c00, 256, 1, fp);
-        fread(diskBuffer + offset + 0x0b00, 256, 1, fp);
-        fread(diskBuffer + offset + 0x0a00, 256, 1, fp);
-        fread(diskBuffer + offset + 0x0900, 256, 1, fp);
-        fread(diskBuffer + offset + 0x0800, 256, 1, fp);
-        fread(diskBuffer + offset + 0x0700, 256, 1, fp);
-        fread(diskBuffer + offset + 0x0600, 256, 1, fp);
-        fread(diskBuffer + offset + 0x0500, 256, 1, fp);
-        fread(diskBuffer + offset + 0x0400, 256, 1, fp);
-        fread(diskBuffer + offset + 0x0300, 256, 1, fp);
-        fread(diskBuffer + offset + 0x0200, 256, 1, fp);
-        fread(diskBuffer + offset + 0x0100, 256, 1, fp);
-        fread(diskBuffer + offset + 0x0f00, 256, 1, fp);
+        size_t ignored;
+        ignored = fread(diskBuffer + offset + 0x0000, 256, 1, fp);
+        ignored = fread(diskBuffer + offset + 0x0e00, 256, 1, fp);
+        ignored = fread(diskBuffer + offset + 0x0d00, 256, 1, fp);
+        ignored = fread(diskBuffer + offset + 0x0c00, 256, 1, fp);
+        ignored = fread(diskBuffer + offset + 0x0b00, 256, 1, fp);
+        ignored = fread(diskBuffer + offset + 0x0a00, 256, 1, fp);
+        ignored = fread(diskBuffer + offset + 0x0900, 256, 1, fp);
+        ignored = fread(diskBuffer + offset + 0x0800, 256, 1, fp);
+        ignored = fread(diskBuffer + offset + 0x0700, 256, 1, fp);
+        ignored = fread(diskBuffer + offset + 0x0600, 256, 1, fp);
+        ignored = fread(diskBuffer + offset + 0x0500, 256, 1, fp);
+        ignored = fread(diskBuffer + offset + 0x0400, 256, 1, fp);
+        ignored = fread(diskBuffer + offset + 0x0300, 256, 1, fp);
+        ignored = fread(diskBuffer + offset + 0x0200, 256, 1, fp);
+        ignored = fread(diskBuffer + offset + 0x0100, 256, 1, fp);
+        ignored = fread(diskBuffer + offset + 0x0f00, 256, 1, fp);
+        (void) ignored;
     }
     if (feof(fp) || ferror(fp)) {
         err = errno ? errno : -1;