From fe122d557ba8cf79a3398647e2b9ca4b69e62708 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 25 Sep 2025 17:12:33 -0400 Subject: [PATCH] Resolve clang warnings, update Xcode project. --- pdfio-array.c | 4 ++-- pdfio-common.c | 12 ++++++------ pdfio-content.c | 2 +- pdfio-crypto.c | 6 ++++-- pdfio-dict.c | 10 +++++----- pdfio-file.c | 26 +++++++++++++------------- pdfio-object.c | 10 +++++----- pdfio-page.c | 2 +- pdfio-stream.c | 4 ++-- pdfio-string.c | 2 +- pdfio-token.c | 6 +++--- pdfio-value.c | 4 ++-- pdfio.xcodeproj/project.pbxproj | 15 ++++++++++++++- testpdfio.c | 3 ++- ttf.c | 6 +++--- 15 files changed, 64 insertions(+), 48 deletions(-) diff --git a/pdfio-array.c b/pdfio-array.c index de2dd30..84f96e7 100644 --- a/pdfio-array.c +++ b/pdfio-array.c @@ -262,7 +262,7 @@ pdfioArrayCopy(pdfio_file_t *pdf, // I - PDF file vdst; // Current destination value - PDFIO_DEBUG("pdfioArrayCopy(pdf=%p, a=%p(%p))\n", pdf, a, a ? a->pdf : NULL); + PDFIO_DEBUG("pdfioArrayCopy(pdf=%p, a=%p(%p))\n", (void *)pdf, (void *)a, a ? (void *)a->pdf : NULL); // Create the new array... if ((na = pdfioArrayCreate(pdf)) == NULL) @@ -606,7 +606,7 @@ _pdfioArrayRead(pdfio_file_t *pdf, // I - PDF file _pdfio_value_t value; // Value - PDFIO_DEBUG("_pdfioArrayRead(pdf=%p, tb=%p)\n", pdf, tb); + PDFIO_DEBUG("_pdfioArrayRead(pdf=%p, tb=%p)\n", (void *)pdf, (void *)tb); // Create an array... if ((array = pdfioArrayCreate(pdf)) == NULL) diff --git a/pdfio-common.c b/pdfio-common.c index e88b081..c6889aa 100644 --- a/pdfio-common.c +++ b/pdfio-common.c @@ -27,7 +27,7 @@ bool // O - `true` on sucess, `false` on EOF _pdfioFileConsume(pdfio_file_t *pdf, // I - PDF file size_t bytes) // I - Bytes to consume { - PDFIO_DEBUG("_pdfioFileConsume(pdf=%p, bytes=%u)\n", pdf, (unsigned)bytes); + PDFIO_DEBUG("_pdfioFileConsume(pdf=%p, bytes=%u)\n", (void *)pdf, (unsigned)bytes); if ((size_t)(pdf->bufend - pdf->bufptr) > bytes) pdf->bufptr += bytes; @@ -91,7 +91,7 @@ _pdfioFileError(pdfio_file_t *pdf, // I - PDF file bool // O - `true` on success, `false` on failure _pdfioFileFlush(pdfio_file_t *pdf) // I - PDF file { - PDFIO_DEBUG("_pdfioFileFlush(pdf=%p)\n", pdf); + PDFIO_DEBUG("_pdfioFileFlush(pdf=%p)\n", (void *)pdf); if (pdf->bufptr > pdf->buffer) { @@ -142,7 +142,7 @@ _pdfioFileGets(pdfio_file_t *pdf, // I - PDF file *bufend = buffer + bufsize - 1; // Pointer to end of buffer - PDFIO_DEBUG("_pdfioFileGets(pdf=%p, buffer=%p, bufsize=%lu, discard=%s) bufpos=%ld, buffer=%p, bufptr=%p, bufend=%p, offset=%lu\n", pdf, buffer, (unsigned long)bufsize, discard ? "true" : "false", (long)pdf->bufpos, pdf->buffer, pdf->bufptr, pdf->bufend, (unsigned long)(pdf->bufpos + (pdf->bufptr - pdf->buffer))); + PDFIO_DEBUG("_pdfioFileGets(pdf=%p, buffer=%p, bufsize=%lu, discard=%s) bufpos=%ld, buffer=%p, bufptr=%p, bufend=%p, offset=%lu\n", (void *)pdf, (void *)buffer, (unsigned long)bufsize, discard ? "true" : "false", (long)pdf->bufpos, (void *)pdf->buffer, (void *)pdf->bufptr, (void *)pdf->bufend, (unsigned long)(pdf->bufpos + (pdf->bufptr - pdf->buffer))); while (!eol) { @@ -359,7 +359,7 @@ _pdfioFileSeek(pdfio_file_t *pdf, // I - PDF file off_t offset, // I - Offset int whence) // I - Offset base { - PDFIO_DEBUG("_pdfioFileSeek(pdf=%p, offset=%ld, whence=%d) pdf->bufpos=%lu\n", pdf, (long)offset, whence, (unsigned long)(pdf ? pdf->bufpos : 0)); + PDFIO_DEBUG("_pdfioFileSeek(pdf=%p, offset=%ld, whence=%d) pdf->bufpos=%lu\n", (void *)pdf, (long)offset, whence, (unsigned long)(pdf ? pdf->bufpos : 0)); // Adjust offset for relative seeks... if (whence == SEEK_CUR) @@ -376,7 +376,7 @@ _pdfioFileSeek(pdfio_file_t *pdf, // I - PDF file // Yes, seek within existing buffer... pdf->bufptr = pdf->buffer + (offset - pdf->bufpos); PDFIO_DEBUG("_pdfioFileSeek: Seek within buffer, bufpos=%ld.\n", (long)pdf->bufpos); - PDFIO_DEBUG("_pdfioFileSeek: buffer=%p, bufptr=%p(<%02X%02X...>), bufend=%p\n", pdf->buffer, pdf->bufptr, pdf->bufptr[0] & 255, pdf->bufptr[1] & 255, pdf->bufend); + PDFIO_DEBUG("_pdfioFileSeek: buffer=%p, bufptr=%p(<%02X%02X...>), bufend=%p\n", (void *)pdf->buffer, (void *)pdf->bufptr, pdf->bufptr[0] & 255, pdf->bufptr[1] & 255, (void *)pdf->bufend); return (offset); } @@ -411,7 +411,7 @@ _pdfioFileSeek(pdfio_file_t *pdf, // I - PDF file } PDFIO_DEBUG("_pdfioFileSeek: Reset bufpos=%ld, offset=%lu.\n", (long)pdf->bufpos, (unsigned long)offset); - PDFIO_DEBUG("_pdfioFileSeek: buffer=%p, bufptr=%p, bufend=%p\n", pdf->buffer, pdf->bufptr, pdf->bufend); + PDFIO_DEBUG("_pdfioFileSeek: buffer=%p, bufptr=%p, bufend=%p\n", (void *)pdf->buffer, (void *)pdf->bufptr, (void *)pdf->bufend); pdf->bufpos = offset; diff --git a/pdfio-content.c b/pdfio-content.c index 771073d..81e1134 100644 --- a/pdfio-content.c +++ b/pdfio-content.c @@ -360,7 +360,7 @@ pdfioArrayCreateColorFromPrimaries( double matrix[3][3]; // CIE XYZ transform matrix - PDFIO_DEBUG("pdfioFileCreateCalibratedColorFromPrimaries(pdf=%p, num_colors=%lu, gamma=%.6f, wx=%.6f, wy=%.6f, rx=%.6f, ry=%.6f, gx=%.6f, gy=%.6f, bx=%.6f, by=%.6f)\n", pdf, (unsigned long)num_colors, gamma, wx, wy, rx, ry, gx, gy, bx, by); + PDFIO_DEBUG("pdfioFileCreateCalibratedColorFromPrimaries(pdf=%p, num_colors=%lu, gamma=%.6f, wx=%.6f, wy=%.6f, rx=%.6f, ry=%.6f, gx=%.6f, gy=%.6f, bx=%.6f, by=%.6f)\n", (void *)pdf, (unsigned long)num_colors, gamma, wx, wy, rx, ry, gx, gy, bx, by); // Range check input... if (!pdf || (num_colors != 1 && num_colors != 3) || gamma <= 0.0 || ry == 0.0 || gy == 0.0 || by == 0.0) diff --git a/pdfio-crypto.c b/pdfio-crypto.c index 53859bb..3aca546 100644 --- a/pdfio-crypto.c +++ b/pdfio-crypto.c @@ -411,7 +411,7 @@ _pdfioCryptoMakeReader( uint8_t digest[16]; // MD5 digest value - PDFIO_DEBUG("_pdfioCryptoMakeReader(pdf=%p, obj=%p(%d), ctx=%p, iv=%p, ivlen=%p(%d))\n", pdf, obj, (int)obj->number, ctx, iv, ivlen, (int)*ivlen); + PDFIO_DEBUG("_pdfioCryptoMakeReader(pdf=%p, obj=%p(%d), ctx=%p, iv=%p, ivlen=%p(%d))\n", (void *)pdf, (void *)obj, (int)obj->number, (void *)ctx, (void *)iv, (void *)ivlen, (int)*ivlen); // Range check input... if (!pdf) @@ -454,6 +454,8 @@ _pdfioCryptoMakeReader( return (NULL); } + __attribute__((fallthrough)); + case PDFIO_ENCRYPTION_RC4_128 : // Copy the key data for the MD5 hash. memcpy(data, pdf->file_key, 16); @@ -504,7 +506,7 @@ _pdfioCryptoMakeWriter( uint8_t digest[16]; /* MD5 digest value */ - PDFIO_DEBUG("_pdfioCryptoMakeWriter(pdf=%p, obj=%p(%d), ctx=%p, iv=%p, ivlen=%p(%d))\n", pdf, obj, (int)obj->number, ctx, iv, ivlen, (int)*ivlen); + PDFIO_DEBUG("_pdfioCryptoMakeWriter(pdf=%p, obj=%p(%d), ctx=%p, iv=%p, ivlen=%p(%d))\n", (void *)pdf, (void *)obj, (int)obj->number, (void *)ctx, (void *)iv, (void *)ivlen, (int)*ivlen); // Range check input... if (!pdf) diff --git a/pdfio-dict.c b/pdfio-dict.c index 642871c..663423f 100644 --- a/pdfio-dict.c +++ b/pdfio-dict.c @@ -32,7 +32,7 @@ pdfioDictClear(pdfio_dict_t *dict, // I - Dictionary pkey; // Search key - PDFIO_DEBUG("pdfioDictClear(dict=%p, key=\"%s\")\n", dict, key); + PDFIO_DEBUG("pdfioDictClear(dict=%p, key=\"%s\")\n", (void *)dict, key); if (!dict || !key) return (false); @@ -77,7 +77,7 @@ pdfioDictCopy(pdfio_file_t *pdf, // I - PDF file _pdfio_value_t v; // Current destination value - PDFIO_DEBUG("pdfioDictCopy(pdf=%p, dict=%p(%p))\n", pdf, dict, dict ? dict->pdf : NULL); + PDFIO_DEBUG("pdfioDictCopy(pdf=%p, dict=%p(%p))\n", (void *)pdf, (void *)dict, dict ? (void *)dict->pdf : NULL); // Create the new dictionary... if ((ndict = pdfioDictCreate(pdf)) == NULL) @@ -525,7 +525,7 @@ _pdfioDictGetValue(pdfio_dict_t *dict, // I - Dictionary *match; // Matching key pair - PDFIO_DEBUG("_pdfioDictGetValue(dict=%p, key=\"%s\")\n", dict, key); + PDFIO_DEBUG("_pdfioDictGetValue(dict=%p, key=\"%s\")\n", (void *)dict, key); if (!dict || !dict->num_pairs || !key) { @@ -610,7 +610,7 @@ _pdfioDictRead(pdfio_file_t *pdf, // I - PDF file _pdfio_value_t value; // Dictionary value - PDFIO_DEBUG("_pdfioDictRead(pdf=%p, obj=%p, tb=%p, depth=%lu)\n", pdf, obj, tb, (unsigned long)depth); + PDFIO_DEBUG("_pdfioDictRead(pdf=%p, obj=%p, tb=%p, depth=%lu)\n", (void *)pdf, (void *)obj, (void *)tb, (unsigned long)depth); // Create a dictionary and start reading... if ((dict = pdfioDictCreate(pdf)) == NULL) @@ -984,7 +984,7 @@ _pdfioDictSetValue( _pdfio_pair_t *pair; // Current pair - PDFIO_DEBUG("_pdfioDictSetValue(dict=%p, key=\"%s\", value=%p)\n", dict, key, (void *)value); + PDFIO_DEBUG("_pdfioDictSetValue(dict=%p, key=\"%s\", value=%p)\n", (void *)dict, key, (void *)value); // See if the key is already set... if (dict->num_pairs > 0) diff --git a/pdfio-file.c b/pdfio-file.c index 7732660..5d46724 100644 --- a/pdfio-file.c +++ b/pdfio-file.c @@ -756,7 +756,7 @@ pdfioFileFindObj( if (number == pdf->objs[current]->number) { // Fast match... - PDFIO_DEBUG("pdfioFileFindObj: Returning %lu (%p)\n", (unsigned long)current, pdf->objs[current]); + PDFIO_DEBUG("pdfioFileFindObj: Returning %lu (%p)\n", (unsigned long)current, (void *)pdf->objs[current]); return (pdf->objs[current]); } else if (number < pdf->objs[current]->number) @@ -784,12 +784,12 @@ pdfioFileFindObj( if (number == pdf->objs[left]->number) { - PDFIO_DEBUG("pdfioFileFindObj: Returning %lu (%p)\n", (unsigned long)left, pdf->objs[left]); + PDFIO_DEBUG("pdfioFileFindObj: Returning %lu (%p)\n", (unsigned long)left, (void *)pdf->objs[left]); return (pdf->objs[left]); } else if (number == pdf->objs[right]->number) { - PDFIO_DEBUG("pdfioFileFindObj: Returning %lu (%p)\n", (unsigned long)right, pdf->objs[right]); + PDFIO_DEBUG("pdfioFileFindObj: Returning %lu (%p)\n", (unsigned long)right, (void *)pdf->objs[right]); return (pdf->objs[right]); } else @@ -1183,7 +1183,7 @@ pdfioFileOpen( } else { - PDFIO_DEBUG("pdfioFileOpen: line=%p,ptr=%p(\"%s\")\n", line, ptr, ptr); + PDFIO_DEBUG("pdfioFileOpen: line=%p,ptr=%p(\"%s\")\n", (void *)line, (void *)ptr, ptr); xref_offset = (off_t)strtol(ptr + 9, NULL, 10); @@ -1414,7 +1414,7 @@ add_obj(pdfio_file_t *pdf, // I - PDF file obj->generation = generation; obj->offset = offset; - PDFIO_DEBUG("add_obj: obj=%p, ->pdf=%p, ->number=%lu, ->offset=%lu\n", obj, pdf, (unsigned long)obj->number, (unsigned long)offset); + PDFIO_DEBUG("add_obj: obj=%p, ->pdf=%p, ->number=%lu, ->offset=%lu\n", (void *)obj, (void *)pdf, (unsigned long)obj->number, (unsigned long)offset); // Insert object into array as needed... if (pdf->num_objs == 0 || obj->number > pdf->objs[pdf->num_objs - 1]->number) @@ -1710,7 +1710,7 @@ get_lconv(void) if ((loc = localeconv()) != NULL) { - PDFIO_DEBUG("get_lconv: loc=%p, loc->decimal_point=\"%s\"\n", loc, loc->decimal_point); + PDFIO_DEBUG("get_lconv: loc=%p, loc->decimal_point=\"%s\"\n", (void *)loc, loc->decimal_point); if (!loc->decimal_point || !strcmp(loc->decimal_point, ".")) loc = NULL; @@ -1747,7 +1747,7 @@ load_obj_stream(pdfio_obj_t *obj) // I - Object to load int count; // Count of objects - PDFIO_DEBUG("load_obj_stream(obj=%p(%d))\n", obj, (int)obj->number); + PDFIO_DEBUG("load_obj_stream(obj=%p(%d))\n", (void *)obj, (int)obj->number); // Open the object stream... if ((st = pdfioObjOpenStream(obj, true)) == NULL) @@ -2014,7 +2014,7 @@ load_xref( goto repair; } - PDFIO_DEBUG("load_xref: tb.bufptr=%p, tb.bufend=%p, tb.bufptr[0]=0x%02x, tb.bufptr[0]=0x%02x\n", tb.bufptr, tb.bufend, tb.bufptr[0], tb.bufptr[1]); + PDFIO_DEBUG("load_xref: tb.bufptr=%p, tb.bufend=%p, tb.bufptr[0]=0x%02x, tb.bufptr[0]=0x%02x\n", (void *)tb.bufptr, (void *)tb.bufend, tb.bufptr[0], tb.bufptr[1]); if (tb.bufptr && tb.bufptr < tb.bufend && (tb.bufptr[0] == 0x0d || tb.bufptr[0] == 0x0a)) tb.bufptr ++; // Skip trailing CR or LF after token @@ -2207,7 +2207,7 @@ load_xref( { if ((obj = pdfioFileFindObj(pdf, sobjs[i])) != NULL) { - PDFIO_DEBUG("load_xref: Loading compressed object stream %lu (pdf=%p, obj->pdf=%p).\n", (unsigned long)sobjs[i], pdf, obj->pdf); + PDFIO_DEBUG("load_xref: Loading compressed object stream %lu (pdf=%p, obj->pdf=%p).\n", (unsigned long)sobjs[i], (void *)pdf, (void *)obj->pdf); if (!load_obj_stream(obj)) return (false); @@ -2386,7 +2386,7 @@ load_xref( goto repair; } - PDFIO_DEBUG("load_xref: Root=%p(%lu)\n", pdf->root_obj, (unsigned long)pdf->root_obj->number); + PDFIO_DEBUG("load_xref: Root=%p(%lu)\n", (void *)pdf->root_obj, (unsigned long)pdf->root_obj->number); if ((pages_obj = pdfioDictGetObj(pdfioObjGetDict(pdf->root_obj), "Pages")) == NULL) { @@ -2394,7 +2394,7 @@ load_xref( goto repair; } - PDFIO_DEBUG("load_xref: Pages=%p(%lu)\n", pdf->root_obj, (unsigned long)pdf->root_obj->number); + PDFIO_DEBUG("load_xref: Pages=%p(%lu)\n", (void *)pages_obj, (unsigned long)pages_obj->number); return (load_pages(pdf, pages_obj, 0)); @@ -2608,7 +2608,7 @@ repair_xref( return (false); } - PDFIO_DEBUG("repair_xref: Root=%p(%lu)\n", pdf->root_obj, (unsigned long)pdf->root_obj->number); + PDFIO_DEBUG("repair_xref: Root=%p(%lu)\n", (void *)pdf->root_obj, (unsigned long)pdf->root_obj->number); if ((pages_obj = pdfioDictGetObj(pdfioObjGetDict(pdf->root_obj), "Pages")) == NULL) { @@ -2616,7 +2616,7 @@ repair_xref( return (false); } - PDFIO_DEBUG("repair_xref: Pages=%p(%lu)\n", pages_obj, (unsigned long)pages_obj->number); + PDFIO_DEBUG("repair_xref: Pages=%p(%lu)\n", (void *)pages_obj, (unsigned long)pages_obj->number); // Load pages... return (load_pages(pdf, pages_obj, 0)); diff --git a/pdfio-object.c b/pdfio-object.c index 8f13fbd..b480404 100644 --- a/pdfio-object.c +++ b/pdfio-object.c @@ -69,7 +69,7 @@ pdfioObjCopy(pdfio_file_t *pdf, // I - PDF file ssize_t bytes; // Bytes read - PDFIO_DEBUG("pdfioObjCopy(pdf=%p, srcobj=%p(%p))\n", pdf, srcobj, srcobj ? srcobj->pdf : NULL); + PDFIO_DEBUG("pdfioObjCopy(pdf=%p, srcobj=%p(%p))\n", (void *)pdf, (void *)srcobj, srcobj ? (void *)srcobj->pdf : NULL); // Range check input if (!pdf || !srcobj) @@ -308,7 +308,7 @@ pdfioObjGetLength(pdfio_obj_t *obj) // I - Object // Try getting the length, directly or indirectly if ((length = (size_t)pdfioDictGetNumber(obj->value.value.dict, "Length")) > 0) { - PDFIO_DEBUG("pdfioObjGetLength(obj=%p) returning %lu.\n", obj, (unsigned long)length); + PDFIO_DEBUG("pdfioObjGetLength(obj=%p) returning %lu.\n", (void *)obj, (unsigned long)length); return (length); } @@ -328,7 +328,7 @@ pdfioObjGetLength(pdfio_obj_t *obj) // I - Object return (0); } - PDFIO_DEBUG("pdfioObjGetLength(obj=%p) returning %lu.\n", obj, (unsigned long)lenobj->value.value.number); + PDFIO_DEBUG("pdfioObjGetLength(obj=%p) returning %lu.\n", (void *)obj, (unsigned long)lenobj->value.value.number); return ((size_t)lenobj->value.value.number); } @@ -440,7 +440,7 @@ _pdfioObjLoad(pdfio_obj_t *obj) // I - Object _pdfio_token_t tb; // Token buffer/stack - PDFIO_DEBUG("_pdfioObjLoad(obj=%p(%lu)), offset=%lu\n", obj, (unsigned long)obj->number, (unsigned long)obj->offset); + PDFIO_DEBUG("_pdfioObjLoad(obj=%p(%lu)), offset=%lu\n", (void *)obj, (unsigned long)obj->number, (unsigned long)obj->offset); // Seek to the start of the object and read its header... if (_pdfioFileSeek(obj->pdf, obj->offset, SEEK_SET) != obj->offset) @@ -502,7 +502,7 @@ _pdfioObjLoad(pdfio_obj_t *obj) // I - Object return (false); } - PDFIO_DEBUG("_pdfioObjLoad: tb.bufptr=%p, tb.bufend=%p, tb.bufptr[0]=0x%02x, tb.bufptr[1]=0x%02x\n", tb.bufptr, tb.bufend, tb.bufptr[0], tb.bufptr[1]); + PDFIO_DEBUG("_pdfioObjLoad: tb.bufptr=%p, tb.bufend=%p, tb.bufptr[0]=0x%02x, tb.bufptr[1]=0x%02x\n", (void *)tb.bufptr, (void *)tb.bufend, tb.bufptr[0], tb.bufptr[1]); _pdfioTokenFlush(&tb); diff --git a/pdfio-page.c b/pdfio-page.c index b350bd6..94e6ff8 100644 --- a/pdfio-page.c +++ b/pdfio-page.c @@ -28,7 +28,7 @@ pdfioPageCopy(pdfio_file_t *pdf, // I - PDF file pdfio_obj_t *dstpage; // Destination page object - PDFIO_DEBUG("pdfioPageCopy(pdf=%p, srcpage=%p(%p))\n", pdf, srcpage, srcpage ? srcpage->pdf : NULL); + PDFIO_DEBUG("pdfioPageCopy(pdf=%p, srcpage=%p(%p))\n", (void *)pdf, (void *)srcpage, srcpage ? (void *)srcpage->pdf : NULL); // Range check input if (!pdf || !srcpage || srcpage->value.type != PDFIO_VALTYPE_DICT) diff --git a/pdfio-stream.c b/pdfio-stream.c index 808e454..4791b7c 100644 --- a/pdfio-stream.c +++ b/pdfio-stream.c @@ -427,7 +427,7 @@ _pdfioStreamOpen(pdfio_obj_t *obj, // I - Object const char *type; // Object type - PDFIO_DEBUG("_pdfioStreamOpen(obj=%p(%u), decode=%s)\n", obj, (unsigned)obj->number, decode ? "true" : "false"); + PDFIO_DEBUG("_pdfioStreamOpen(obj=%p(%u), decode=%s)\n", (void *)obj, (unsigned)obj->number, decode ? "true" : "false"); // Allocate a new stream object... if ((st = (pdfio_stream_t *)calloc(1, sizeof(pdfio_stream_t))) == NULL) @@ -848,7 +848,7 @@ pdfioStreamWrite( *pptr; // Previous raw buffer - PDFIO_DEBUG("pdfioStreamWrite(st=%p, buffer=%p, bytes=%lu)\n", st, buffer, (unsigned long)bytes); + PDFIO_DEBUG("pdfioStreamWrite(st=%p, buffer=%p, bytes=%lu)\n", (void *)st, buffer, (unsigned long)bytes); // Range check input... if (!st || st->pdf->mode != _PDFIO_MODE_WRITE || !buffer || !bytes) diff --git a/pdfio-string.c b/pdfio-string.c index d8033de..8790bc4 100644 --- a/pdfio-string.c +++ b/pdfio-string.c @@ -723,7 +723,7 @@ pdfioStringCreate( int diff; // Different - PDFIO_DEBUG("pdfioStringCreate(pdf=%p, s=\"%s\")\n", pdf, s); + PDFIO_DEBUG("pdfioStringCreate(pdf=%p, s=\"%s\")\n", (void *)pdf, s); // Range check input... if (!pdf || !s) diff --git a/pdfio-token.c b/pdfio-token.c index dd9cef6..c13adb8 100644 --- a/pdfio-token.c +++ b/pdfio-token.c @@ -54,7 +54,7 @@ static int get_char(_pdfio_token_t *tb); void _pdfioTokenClear(_pdfio_token_t *tb) // I - Token buffer/stack { - PDFIO_DEBUG("_pdfioTokenClear(tb=%p)\n", tb); + PDFIO_DEBUG("_pdfioTokenClear(tb=%p)\n", (void *)tb); while (tb->num_tokens > 0) { @@ -132,7 +132,7 @@ _pdfioTokenGet(_pdfio_token_t *tb, // I - Token buffer/stack if ((len = strlen(tb->tokens[tb->num_tokens])) > (bufsize - 1)) { // Value too large... - PDFIO_DEBUG("_pdfioTokenGet(tb=%p, buffer=%p, bufsize=%u): Token '%s' from stack too large.\n", tb, buffer, (unsigned)bufsize, tb->tokens[tb->num_tokens]); + PDFIO_DEBUG("_pdfioTokenGet(tb=%p, buffer=%p, bufsize=%u): Token '%s' from stack too large.\n", (void *)tb, (void *)buffer, (unsigned)bufsize, tb->tokens[tb->num_tokens]); *buffer = '\0'; return (false); } @@ -140,7 +140,7 @@ _pdfioTokenGet(_pdfio_token_t *tb, // I - Token buffer/stack memcpy(buffer, tb->tokens[tb->num_tokens], len); buffer[len] = '\0'; - PDFIO_DEBUG("_pdfioTokenGet(tb=%p, buffer=%p, bufsize=%u): Popping '%s' from stack.\n", tb, buffer, (unsigned)bufsize, buffer); + PDFIO_DEBUG("_pdfioTokenGet(tb=%p, buffer=%p, bufsize=%u): Popping '%s' from stack.\n", (void *)tb, (void *)buffer, (unsigned)bufsize, buffer); free(tb->tokens[tb->num_tokens]); tb->tokens[tb->num_tokens] = NULL; diff --git a/pdfio-value.c b/pdfio-value.c index f4051f1..46bb234 100644 --- a/pdfio-value.c +++ b/pdfio-value.c @@ -46,7 +46,7 @@ _pdfioValueCopy(pdfio_file_t *pdfdst, // I - Destination PDF file #endif // DEBUG - PDFIO_DEBUG("_pdfioValueCopy(pdfdst=%p, vdst=%p, pdfsrc=%p, vsrc=%p(%s))\n", pdfdst, vdst, pdfsrc, vsrc, types[vsrc->type]); + PDFIO_DEBUG("_pdfioValueCopy(pdfdst=%p, vdst=%p, pdfsrc=%p, vsrc=%p(%s))\n", (void *)pdfdst, (void *)vdst, (void *)pdfsrc, (void *)vsrc, types[vsrc->type]); if (pdfdst == pdfsrc && vsrc->type != PDFIO_VALTYPE_BINARY) { @@ -359,7 +359,7 @@ _pdfioValueRead(pdfio_file_t *pdf, // I - PDF file #endif // DEBUG - PDFIO_DEBUG("_pdfioValueRead(pdf=%p, obj=%p, v=%p)\n", pdf, obj, v); + PDFIO_DEBUG("_pdfioValueRead(pdf=%p, obj=%p, v=%p)\n", (void *)pdf, (void *)obj, (void *)v); if (!token) goto done; diff --git a/pdfio.xcodeproj/project.pbxproj b/pdfio.xcodeproj/project.pbxproj index e75deed..52bef57 100644 --- a/pdfio.xcodeproj/project.pbxproj +++ b/pdfio.xcodeproj/project.pbxproj @@ -261,7 +261,7 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 1600; + LastUpgradeCheck = 2600; TargetAttributes = { 273440AF263D6FE200FBFD63 = { CreatedOnToolsVersion = 12.5; @@ -353,12 +353,14 @@ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; + CLANG_WARN_COMPLETION_HANDLER_MISUSE = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_IMPLICIT_FALLTHROUGH = YES; CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; @@ -390,8 +392,11 @@ "DEBUG=1", ); GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; + GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; + GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; @@ -399,6 +404,7 @@ GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNKNOWN_PRAGMAS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_PARAMETER = YES; @@ -409,6 +415,7 @@ ONLY_ACTIVE_ARCH = YES; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = macosx; + STRING_CATALOG_GENERATE_SYMBOLS = YES; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -432,12 +439,14 @@ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; + CLANG_WARN_COMPLETION_HANDLER_MISUSE = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_IMPLICIT_FALLTHROUGH = YES; CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; @@ -467,8 +476,10 @@ GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; + GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; @@ -476,6 +487,7 @@ GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNKNOWN_PRAGMAS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_PARAMETER = YES; @@ -485,6 +497,7 @@ MTL_FAST_MATH = YES; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = macosx; + STRING_CATALOG_GENERATE_SYMBOLS = YES; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; diff --git a/testpdfio.c b/testpdfio.c index 70b8a08..230ab0a 100644 --- a/testpdfio.c +++ b/testpdfio.c @@ -483,7 +483,7 @@ do_test_file(const char *filename, // I - PDF filename { dict = pdfioObjGetDict(obj); - printf(" %u %u obj dict=%p(%lu pairs)\n", (unsigned)pdfioObjGetNumber(obj), (unsigned)pdfioObjGetGeneration(obj), dict, dict ? (unsigned long)dict->num_pairs : 0UL); + printf(" %u %u obj dict=%p(%lu pairs)\n", (unsigned)pdfioObjGetNumber(obj), (unsigned)pdfioObjGetGeneration(obj), (void *)dict, dict ? (unsigned long)dict->num_pairs : 0UL); fputs(" ", stdout); _pdfioValueDebug(&obj->value, stdout); putchar('\n'); @@ -4019,6 +4019,7 @@ write_text_test(pdfio_file_t *pdf, // I - PDF file else { testEnd(false); + fclose(fp); return (1); } } diff --git a/ttf.c b/ttf.c index ec9d538..31ed896 100644 --- a/ttf.c +++ b/ttf.c @@ -344,7 +344,7 @@ ttfCreate(const char *filename, // I - Filename ttf_err_cb_t err_cb, // I - Error callback or `NULL` to log to stderr void *err_data) // I - Error callback data { - TTF_DEBUG("ttfCreate(filename=\"%s\", idx=%u, err_cb=%p, err_data=%p)\n", filename, (unsigned)idx, err_cb, err_data); + TTF_DEBUG("ttfCreate(filename=\"%s\", idx=%u, err_cb=%p, err_data=%p)\n", filename, (unsigned)idx, (void *)err_cb, err_data); // Range check input.. if (!filename) @@ -393,7 +393,7 @@ ttfCreateData(const void *data, // I - Buffer ttf_err_cb_t err_cb, // I - Error callback or `NULL` to log to stderr void *err_data) // I - Error callback data { - TTF_DEBUG("ttfCreateData(data=%p, datasize=%lu, idx=%u, err_cb=%p, err_data=%p)\n", data, (unsigned long)datasize, (unsigned)idx, err_cb, err_data); + TTF_DEBUG("ttfCreateData(data=%p, datasize=%lu, idx=%u, err_cb=%p, err_data=%p)\n", data, (unsigned long)datasize, (unsigned)idx, (void *)err_cb, err_data); // Range check input.. if (!data || datasize == 0) @@ -949,7 +949,7 @@ create_font(const char *filename, // I - Filename of `NULL` _ttf_off_post_t post; // PostScript table - TTF_DEBUG("create_font(filename=\"%s\", data=%p, datasize=%lu, idx=%u, err_cb=%p, err_data=%p)\n", filename, data, (unsigned long)datasize, (unsigned)idx, err_cb, err_data); + TTF_DEBUG("create_font(filename=\"%s\", data=%p, datasize=%lu, idx=%u, err_cb=%p, err_data=%p)\n", filename, data, (unsigned long)datasize, (unsigned)idx, (void *)err_cb, err_data); // Allocate memory... if ((font = (ttf_t *)calloc(1, sizeof(ttf_t))) == NULL)