Apple-2-Tools/nulib2
1
0
Fork 0
mirror of https://github.com/fadden/nulib2.git synced 2025-08-09 19:25:33 +00:00
Code Issues Projects Releases Wiki Activity

Eliminate some compiler warnings.

Browse Source
This commit is contained in:
Andy McFadden
2014-10-28 10:45:25 -07:00
parent 64fa086713
commit 7b5dc79606
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nufxlib/MiscUtils.c
View File

@@ -215,7 +215,7 @@ Nu_ReportError(NuArchive* pArchive, const char* file, int line,
va_list args; va_list args;
char buf[kNuHeftyBufSize]; char buf[kNuHeftyBufSize];
int count; int count;
#if defined(HAVE_SNPRINTF) || defined(SPRINTF_RETURNS_INT) #if !defined(HAVE_SNPRINTF) && defined(SPRINTF_RETURNS_INT)
int cc; int cc;
#endif #endif
@@ -255,10 +255,10 @@ Nu_ReportError(NuArchive* pArchive, const char* file, int line,
#if defined(HAVE_SNPRINTF) && defined(SNPRINTF_DECLARED) #if defined(HAVE_SNPRINTF) && defined(SNPRINTF_DECLARED)
if (msg == nil) if (msg == nil)
cc = snprintf(buf+count, sizeof(buf) - count, snprintf(buf+count, sizeof(buf) - count,
"(unknown err=%d)", err); "(unknown err=%d)", err);
else else
cc = snprintf(buf+count, sizeof(buf) - count, "%s", msg); snprintf(buf+count, sizeof(buf) - count, "%s", msg);
#else #else
#ifdef SPRINTF_RETURNS_INT #ifdef SPRINTF_RETURNS_INT
if (msg == nil) if (msg == nil)

1
nufxlib/Squeeze.c
View File

@@ -919,6 +919,7 @@ Nu_ExpandHuffmanSQ(NuArchive* pArchive, const NuRecord* pRecord,
usqState.dataInBuffer = 0; usqState.dataInBuffer = 0;
usqState.dataPtr = pArchive->compBuf; usqState.dataPtr = pArchive->compBuf;
usqState.bits = usqState.bitPosn = 0;
compRemaining = pThread->thCompThreadEOF; compRemaining = pThread->thCompThreadEOF;
#ifdef FULL_SQ_HEADER #ifdef FULL_SQ_HEADER

40
nufxlib/samples/ImgConv.c
View File

@@ -115,8 +115,9 @@ WriteLongLE(FILE* fp, unsigned long val)
int int
ReadImgHeader(FILE* fp, ImgHeader* pHeader) ReadImgHeader(FILE* fp, ImgHeader* pHeader)
{ {
fread(pHeader->magic, 4, 1, fp); size_t ignored;
fread(pHeader->creator, 4, 1, fp); ignored = fread(pHeader->magic, 4, 1, fp);
ignored = fread(pHeader->creator, 4, 1, fp);
ReadShortLE(fp, &pHeader->headerLen); ReadShortLE(fp, &pHeader->headerLen);
ReadShortLE(fp, &pHeader->version); ReadShortLE(fp, &pHeader->version);
ReadLongLE(fp, &pHeader->imageFormat); ReadLongLE(fp, &pHeader->imageFormat);
@@ -133,6 +134,7 @@ ReadImgHeader(FILE* fp, ImgHeader* pHeader)
ReadLongLE(fp, &pHeader->spare[2]); ReadLongLE(fp, &pHeader->spare[2]);
ReadLongLE(fp, &pHeader->spare[3]); ReadLongLE(fp, &pHeader->spare[3]);
(void) ignored;
if (feof(fp) || ferror(fp)) if (feof(fp) || ferror(fp))
return -1; return -1;
@@ -287,22 +289,24 @@ CreateDosSource(const ImgHeader* pHeader, FILE* fp,
* to ProDOS ordering. * to ProDOS ordering.
*/ */
for (offset = 0; offset < pHeader->dataLen; offset += 4096) { for (offset = 0; offset < pHeader->dataLen; offset += 4096) {
fread(diskBuffer + offset + 0x0000, 256, 1, fp); size_t ignored;
fread(diskBuffer + offset + 0x0e00, 256, 1, fp); ignored = fread(diskBuffer + offset + 0x0000, 256, 1, fp);
fread(diskBuffer + offset + 0x0d00, 256, 1, fp); ignored = fread(diskBuffer + offset + 0x0e00, 256, 1, fp);
fread(diskBuffer + offset + 0x0c00, 256, 1, fp); ignored = fread(diskBuffer + offset + 0x0d00, 256, 1, fp);
fread(diskBuffer + offset + 0x0b00, 256, 1, fp); ignored = fread(diskBuffer + offset + 0x0c00, 256, 1, fp);
fread(diskBuffer + offset + 0x0a00, 256, 1, fp); ignored = fread(diskBuffer + offset + 0x0b00, 256, 1, fp);
fread(diskBuffer + offset + 0x0900, 256, 1, fp); ignored = fread(diskBuffer + offset + 0x0a00, 256, 1, fp);
fread(diskBuffer + offset + 0x0800, 256, 1, fp); ignored = fread(diskBuffer + offset + 0x0900, 256, 1, fp);
fread(diskBuffer + offset + 0x0700, 256, 1, fp); ignored = fread(diskBuffer + offset + 0x0800, 256, 1, fp);
fread(diskBuffer + offset + 0x0600, 256, 1, fp); ignored = fread(diskBuffer + offset + 0x0700, 256, 1, fp);
fread(diskBuffer + offset + 0x0500, 256, 1, fp); ignored = fread(diskBuffer + offset + 0x0600, 256, 1, fp);
fread(diskBuffer + offset + 0x0400, 256, 1, fp); ignored = fread(diskBuffer + offset + 0x0500, 256, 1, fp);
fread(diskBuffer + offset + 0x0300, 256, 1, fp); ignored = fread(diskBuffer + offset + 0x0400, 256, 1, fp);
fread(diskBuffer + offset + 0x0200, 256, 1, fp); ignored = fread(diskBuffer + offset + 0x0300, 256, 1, fp);
fread(diskBuffer + offset + 0x0100, 256, 1, fp); ignored = fread(diskBuffer + offset + 0x0200, 256, 1, fp);
fread(diskBuffer + offset + 0x0f00, 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)) { if (feof(fp) || ferror(fp)) {
err = errno ? errno : -1; err = errno ? errno : -1;