From 807315e64e0867fb7cea00b35ba4454691e844e2 Mon Sep 17 00:00:00 2001 From: Michael Sweet Date: Wed, 23 Mar 2016 18:52:56 -0400 Subject: [PATCH] Changes to eliminate warnings from new Clang. --- cups/array.c | 12 ++-- cups/auth.c | 6 +- cups/dest-job.c | 20 ++----- cups/dest-localization.c | 2 +- cups/dest-options.c | 15 +++-- cups/dest.c | 32 +++------- cups/dir.c | 6 +- cups/encode.c | 7 +-- cups/file.c | 58 +++++++----------- cups/getdevices.c | 11 +--- cups/getputfile.c | 6 +- cups/http-addr.c | 5 +- cups/http-addrlist.c | 5 +- cups/http-support.c | 8 +-- cups/http.c | 111 ++++++++++++---------------------- cups/ipp.c | 126 +++++++++++++-------------------------- cups/language.c | 2 +- cups/options.c | 19 ++---- cups/pwg-media.c | 5 +- cups/request.c | 28 +++------ cups/tls-darwin.c | 18 +++--- cups/transcode.c | 9 +-- cups/usersys.c | 2 +- cups/util.c | 20 ++----- filter/error.c | 2 +- filter/raster.c | 17 +++--- 26 files changed, 186 insertions(+), 366 deletions(-) diff --git a/cups/array.c b/cups/array.c index 855706994..cbe52e59f 100644 --- a/cups/array.c +++ b/cups/array.c @@ -86,7 +86,7 @@ int /* O - 1 on success, 0 on failure */ cupsArrayAdd(cups_array_t *a, /* I - Array */ void *e) /* I - Element */ { - DEBUG_printf(("2cupsArrayAdd(a=%p, e=%p)", a, e)); + DEBUG_printf(("2cupsArrayAdd(a=%p, e=%p)", (void *)a, e)); /* * Range check input... @@ -125,8 +125,7 @@ _cupsArrayAddStrings(cups_array_t *a, /* I - Array */ int status = 1; /* Status of add */ - DEBUG_printf(("_cupsArrayAddStrings(a=%p, s=\"%s\", delim='%c')", a, s, - delim)); + DEBUG_printf(("_cupsArrayAddStrings(a=%p, s=\"%s\", delim='%c')", (void *)a, s, delim)); if (!a || !s || !*s) { @@ -624,7 +623,7 @@ int /* O - 0 on failure, 1 on success */ cupsArrayInsert(cups_array_t *a, /* I - Array */ void *e) /* I - Element */ { - DEBUG_printf(("2cupsArrayInsert(a=%p, e=%p)", a, e)); + DEBUG_printf(("2cupsArrayInsert(a=%p, e=%p)", (void *)a, e)); /* * Range check input... @@ -1027,7 +1026,7 @@ cups_array_add(cups_array_t *a, /* I - Array */ int diff; /* Comparison with current element */ - DEBUG_printf(("7cups_array_add(a=%p, e=%p, insert=%d)", a, e, insert)); + DEBUG_printf(("7cups_array_add(a=%p, e=%p, insert=%d)", (void *)a, e, insert)); /* * Verify we have room for the new element... @@ -1207,8 +1206,7 @@ cups_array_find(cups_array_t *a, /* I - Array */ diff; /* Comparison with current element */ - DEBUG_printf(("7cups_array_find(a=%p, e=%p, prev=%d, rdiff=%p)", a, e, prev, - rdiff)); + DEBUG_printf(("7cups_array_find(a=%p, e=%p, prev=%d, rdiff=%p)", (void *)a, e, prev, (void *)rdiff)); if (a->compare) { diff --git a/cups/auth.c b/cups/auth.c index ce9fce694..5802a504e 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -122,8 +122,7 @@ cupsDoAuthentication( _cups_globals_t *cg; /* Global data */ - DEBUG_printf(("cupsDoAuthentication(http=%p, method=\"%s\", resource=\"%s\")", - http, method, resource)); + DEBUG_printf(("cupsDoAuthentication(http=%p, method=\"%s\", resource=\"%s\")", (void *)http, method, resource)); if (!http) http = _cupsConnect(); @@ -668,8 +667,7 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ # endif /* HAVE_AUTHORIZATION_H */ - DEBUG_printf(("7cups_local_auth(http=%p) hostaddr=%s, hostname=\"%s\"", - http, httpAddrString(http->hostaddr, filename, sizeof(filename)), http->hostname)); + DEBUG_printf(("7cups_local_auth(http=%p) hostaddr=%s, hostname=\"%s\"", (void *)http, httpAddrString(http->hostaddr, filename, sizeof(filename)), http->hostname)); /* * See if we are accessing localhost... diff --git a/cups/dest-job.c b/cups/dest-job.c index 759c5b354..6b7a9e2c1 100644 --- a/cups/dest-job.c +++ b/cups/dest-job.c @@ -81,9 +81,7 @@ cupsCloseDestJob( ipp_attribute_t *attr; /* operations-supported attribute */ - DEBUG_printf(("cupsCloseDestJob(http=%p, dest=%p(%s/%s), info=%p, job_id=%d)", - http, dest, dest ? dest->name : NULL, - dest ? dest->instance : NULL, info, job_id)); + DEBUG_printf(("cupsCloseDestJob(http=%p, dest=%p(%s/%s), info=%p, job_id=%d)", (void *)http, (void *)dest, dest ? dest->name : NULL, dest ? dest->instance : NULL, (void *)info, job_id)); /* * Range check input... @@ -171,10 +169,7 @@ cupsCreateDestJob( DEBUG_printf(("cupsCreateDestJob(http=%p, dest=%p(%s/%s), info=%p, " - "job_id=%p, title=\"%s\", num_options=%d, options=%p)", - http, dest, dest ? dest->name : NULL, - dest ? dest->instance : NULL, info, job_id, title, num_options, - options)); + "job_id=%p, title=\"%s\", num_options=%d, options=%p)", (void *)http, (void *)dest, dest ? dest->name : NULL, dest ? dest->instance : NULL, (void *)info, (void *)job_id, title, num_options, (void *)options)); /* * Range check input... @@ -254,9 +249,7 @@ cupsFinishDestDocument( cups_dest_t *dest, /* I - Destination */ cups_dinfo_t *info) /* I - Destination information */ { - DEBUG_printf(("cupsFinishDestDocument(http=%p, dest=%p(%s/%s), info=%p)", - http, dest, dest ? dest->name : NULL, - dest ? dest->instance : NULL, info)); + DEBUG_printf(("cupsFinishDestDocument(http=%p, dest=%p(%s/%s), info=%p)", (void *)http, (void *)dest, dest ? dest->name : NULL, dest ? dest->instance : NULL, (void *)info)); /* * Range check input... @@ -311,12 +304,7 @@ cupsStartDestDocument( http_status_t status; /* HTTP status */ - DEBUG_printf(("cupsStartDestDocument(http=%p, dest=%p(%s/%s), info=%p, " - "job_id=%d, docname=\"%s\", format=\"%s\", num_options=%d, " - "options=%p, last_document=%d)", - http, dest, dest ? dest->name : NULL, - dest ? dest->instance : NULL, info, job_id, docname, format, - num_options, options, last_document)); + DEBUG_printf(("cupsStartDestDocument(http=%p, dest=%p(%s/%s), info=%p, job_id=%d, docname=\"%s\", format=\"%s\", num_options=%d, options=%p, last_document=%d)", (void *)http, (void *)dest, dest ? dest->name : NULL, dest ? dest->instance : NULL, (void *)info, job_id, docname, format, num_options, (void *)options, last_document)); /* * Range check input... diff --git a/cups/dest-localization.c b/cups/dest-localization.c index 5174953b5..5439465d3 100644 --- a/cups/dest-localization.c +++ b/cups/dest-localization.c @@ -143,7 +143,7 @@ cupsLocalizeDestMedia( if (mdb) { - DEBUG_printf(("1cupsLocalizeDestMedia: MATCH mdb%p [key=\"%s\" size_name=\"%s\" source=\"%s\" type=\"%s\" width=%d length=%d B%d L%d R%d T%d]", mdb, mdb->key, mdb->size_name, mdb->source, mdb->type, mdb->width, mdb->length, mdb->bottom, mdb->left, mdb->right, mdb->top)); + DEBUG_printf(("1cupsLocalizeDestMedia: MATCH mdb%p [key=\"%s\" size_name=\"%s\" source=\"%s\" type=\"%s\" width=%d length=%d B%d L%d R%d T%d]", (void *)mdb, mdb->key, mdb->size_name, mdb->source, mdb->type, mdb->width, mdb->length, mdb->bottom, mdb->left, mdb->right, mdb->top)); lsource = cupsLocalizeDestValue(http, dest, dinfo, "media-source", mdb->source); ltype = cupsLocalizeDestValue(http, dest, dinfo, "media-type", mdb->type); diff --git a/cups/dest-options.c b/cups/dest-options.c index 43d231b2b..82f5a4275 100644 --- a/cups/dest-options.c +++ b/cups/dest-options.c @@ -572,8 +572,7 @@ cupsCopyDestInfo( }; - DEBUG_printf(("cupsCopyDestSupported(http=%p, dest=%p(%s))", http, dest, - dest ? dest->name : "")); + DEBUG_printf(("cupsCopyDestSupported(http=%p, dest=%p(%s))", (void *)http, (void *)dest, dest ? dest->name : "")); /* * Range check input... @@ -1261,7 +1260,7 @@ cups_create_cached(http_t *http, /* I - Connection to destination */ *first; /* First entry this size */ - DEBUG_printf(("3cups_create_cached(http=%p, dinfo=%p, flags=%u)", http, dinfo, flags)); + DEBUG_printf(("3cups_create_cached(http=%p, dinfo=%p, flags=%u)", (void *)http, (void *)dinfo, flags)); if (dinfo->cached_db) cupsArrayDelete(dinfo->cached_db); @@ -1290,13 +1289,13 @@ cups_create_cached(http_t *http, /* I - Connection to destination */ mdb; mdb = (_cups_media_db_t *)cupsArrayNext(db)) { - DEBUG_printf(("4cups_create_cached: %p key=\"%s\", type=\"%s\", %dx%d, B%d L%d R%d T%d", mdb, mdb->key, mdb->type, mdb->width, mdb->length, mdb->bottom, mdb->left, mdb->right, mdb->top)); + DEBUG_printf(("4cups_create_cached: %p key=\"%s\", type=\"%s\", %dx%d, B%d L%d R%d T%d", (void *)mdb, mdb->key, mdb->type, mdb->width, mdb->length, mdb->bottom, mdb->left, mdb->right, mdb->top)); if (flags & CUPS_MEDIA_FLAGS_BORDERLESS) { if (!mdb->left && !mdb->right && !mdb->top && !mdb->bottom) { - DEBUG_printf(("4cups_create_cached: add %p", mdb)); + DEBUG_printf(("4cups_create_cached: add %p", (void *)mdb)); cupsArrayAdd(dinfo->cached_db, mdb); } } @@ -1304,7 +1303,7 @@ cups_create_cached(http_t *http, /* I - Connection to destination */ { if (first->width != mdb->width || first->length != mdb->length) { - DEBUG_printf(("4cups_create_cached: add %p", first)); + DEBUG_printf(("4cups_create_cached: add %p", (void *)first)); cupsArrayAdd(dinfo->cached_db, first); first = mdb; } @@ -1314,14 +1313,14 @@ cups_create_cached(http_t *http, /* I - Connection to destination */ } else { - DEBUG_printf(("4cups_create_cached: add %p", mdb)); + DEBUG_printf(("4cups_create_cached: add %p", (void *)mdb)); cupsArrayAdd(dinfo->cached_db, mdb); } } if (flags & CUPS_MEDIA_FLAGS_DUPLEX) { - DEBUG_printf(("4cups_create_cached: add %p", first)); + DEBUG_printf(("4cups_create_cached: add %p", (void *)first)); cupsArrayAdd(dinfo->cached_db, first); } } diff --git a/cups/dest.c b/cups/dest.c index 10705065a..f22e0965c 100644 --- a/cups/dest.c +++ b/cups/dest.c @@ -566,7 +566,7 @@ cupsConnectDest( http_t *http; /* Connection to server */ - DEBUG_printf(("cupsConnectDest(dest=%p, flags=0x%x, msec=%d, cancel=%p(%d), resource=\"%s\", resourcesize=" CUPS_LLFMT ", cb=%p, user_data=%p)", dest, flags, msec, cancel, cancel ? *cancel : -1, resource, CUPS_LLCAST resourcesize, cb, user_data)); + DEBUG_printf(("cupsConnectDest(dest=%p, flags=0x%x, msec=%d, cancel=%p(%d), resource=\"%s\", resourcesize=" CUPS_LLFMT ", cb=%p, user_data=%p)", (void *)dest, flags, msec, (void *)cancel, cancel ? *cancel : -1, resource, CUPS_LLCAST resourcesize, (void *)cb, user_data)); /* * Range check input... @@ -2772,11 +2772,7 @@ cups_dnssd_browse_cb( /* Enumeration data */ - DEBUG_printf(("5cups_dnssd_browse_cb(sdRef=%p, flags=%x, " - "interfaceIndex=%d, errorCode=%d, serviceName=\"%s\", " - "regtype=\"%s\", replyDomain=\"%s\", context=%p)", - sdRef, flags, interfaceIndex, errorCode, serviceName, regtype, - replyDomain, context)); + DEBUG_printf(("5cups_dnssd_browse_cb(sdRef=%p, flags=%x, interfaceIndex=%d, errorCode=%d, serviceName=\"%s\", regtype=\"%s\", replyDomain=\"%s\", context=%p)", (void *)sdRef, flags, interfaceIndex, errorCode, serviceName, regtype, replyDomain, context)); /* * Don't do anything on error... @@ -2913,8 +2909,7 @@ cups_dnssd_free_device( _cups_dnssd_device_t *device, /* I - Device */ _cups_dnssd_data_t *data) /* I - Enumeration data */ { - DEBUG_printf(("5cups_dnssd_free_device(device=%p(%s), data=%p)", device, - device->dest.name, data)); + DEBUG_printf(("5cups_dnssd_free_device(device=%p(%s), data=%p)", (void *)device, device->dest.name, (void *)data)); # ifdef HAVE_DNSSD if (device->ref) @@ -2952,9 +2947,7 @@ cups_dnssd_get_device( /* Full name for query */ - DEBUG_printf(("5cups_dnssd_get_device(data=%p, serviceName=\"%s\", " - "regtype=\"%s\", replyDomain=\"%s\")", data, serviceName, - regtype, replyDomain)); + DEBUG_printf(("5cups_dnssd_get_device(data=%p, serviceName=\"%s\", regtype=\"%s\", replyDomain=\"%s\")", (void *)data, serviceName, regtype, replyDomain)); /* * See if this is an existing device... @@ -3085,11 +3078,7 @@ cups_dnssd_local_cb( _cups_dnssd_device_t *device; /* Device */ - DEBUG_printf(("5cups_dnssd_local_cb(sdRef=%p, flags=%x, " - "interfaceIndex=%d, errorCode=%d, serviceName=\"%s\", " - "regtype=\"%s\", replyDomain=\"%s\", context=%p)", - sdRef, flags, interfaceIndex, errorCode, serviceName, - regtype, replyDomain, context)); + DEBUG_printf(("5cups_dnssd_local_cb(sdRef=%p, flags=%x, interfaceIndex=%d, errorCode=%d, serviceName=\"%s\", regtype=\"%s\", replyDomain=\"%s\", context=%p)", (void *)sdRef, flags, interfaceIndex, errorCode, serviceName, regtype, replyDomain, context)); /* * Only process "add" data... @@ -3211,11 +3200,7 @@ cups_dnssd_query_cb( # ifdef HAVE_DNSSD - DEBUG_printf(("5cups_dnssd_query_cb(sdRef=%p, flags=%x, " - "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", " - "rrtype=%u, rrclass=%u, rdlen=%u, rdata=%p, ttl=%u, " - "context=%p)", sdRef, flags, interfaceIndex, errorCode, - fullName, rrtype, rrclass, rdlen, rdata, ttl, context)); + DEBUG_printf(("5cups_dnssd_query_cb(sdRef=%p, flags=%x, interfaceIndex=%d, errorCode=%d, fullName=\"%s\", rrtype=%u, rrclass=%u, rdlen=%u, rdata=%p, ttl=%u, context=%p)", (void *)sdRef, flags, interfaceIndex, errorCode, fullName, rrtype, rrclass, rdlen, rdata, ttl, context)); /* * Only process "add" data... @@ -3789,10 +3774,7 @@ cups_get_dests( int linenum; /* Current line number */ - DEBUG_printf(("7cups_get_dests(filename=\"%s\", match_name=\"%s\", " - "match_inst=\"%s\", user_default_set=%d, num_dests=%d, " - "dests=%p)", filename, match_name, match_inst, - user_default_set, num_dests, dests)); + DEBUG_printf(("7cups_get_dests(filename=\"%s\", match_name=\"%s\", match_inst=\"%s\", user_default_set=%d, num_dests=%d, dests=%p)", filename, match_name, match_inst, user_default_set, num_dests, (void *)dests)); /* * Try to open the file... diff --git a/cups/dir.c b/cups/dir.c index d30009ecf..04706d467 100644 --- a/cups/dir.c +++ b/cups/dir.c @@ -269,7 +269,7 @@ struct _cups_dir_s /**** Directory data structure ****/ void cupsDirClose(cups_dir_t *dp) /* I - Directory pointer */ { - DEBUG_printf(("cupsDirClose(dp=%p)", dp)); + DEBUG_printf(("cupsDirClose(dp=%p)", (void *)dp)); /* * Range check input... @@ -358,7 +358,7 @@ cupsDirRead(cups_dir_t *dp) /* I - Directory pointer */ # endif /* HAVE_PTHREAD_H */ - DEBUG_printf(("2cupsDirRead(dp=%p)", dp)); + DEBUG_printf(("2cupsDirRead(dp=%p)", (void *)dp)); /* * Range check input... @@ -448,7 +448,7 @@ cupsDirRead(cups_dir_t *dp) /* I - Directory pointer */ void cupsDirRewind(cups_dir_t *dp) /* I - Directory pointer */ { - DEBUG_printf(("cupsDirRewind(dp=%p)", dp)); + DEBUG_printf(("cupsDirRewind(dp=%p)", (void *)dp)); /* * Range check input... diff --git a/cups/encode.c b/cups/encode.c index 44fe31ea2..757d53bf7 100644 --- a/cups/encode.c +++ b/cups/encode.c @@ -340,7 +340,7 @@ cupsEncodeOptions(ipp_t *ipp, /* I - Request to add to */ int num_options, /* I - Number of options */ cups_option_t *options) /* I - Options */ { - DEBUG_printf(("cupsEncodeOptions(%p, %d, %p)", ipp, num_options, options)); + DEBUG_printf(("cupsEncodeOptions(%p, %d, %p)", (void *)ipp, num_options, (void *)options)); /* * Add the options in the proper groups & order... @@ -386,10 +386,7 @@ cupsEncodeOptions2( const ipp_op_t *ops; /* List of allowed operations */ - DEBUG_printf(("cupsEncodeOptions2(ipp=%p(%s), num_options=%d, options=%p, " - "group_tag=%x)", ipp, - ipp ? ippOpString(ippGetOperation(ipp)) : "", num_options, - options, group_tag)); + DEBUG_printf(("cupsEncodeOptions2(ipp=%p(%s), num_options=%d, options=%p, group_tag=%x)", (void *)ipp, ipp ? ippOpString(ippGetOperation(ipp)) : "", num_options, (void *)options, group_tag)); /* * Range check input... diff --git a/cups/file.c b/cups/file.c index 3b951aa6c..7814dba99 100644 --- a/cups/file.c +++ b/cups/file.c @@ -326,7 +326,7 @@ cupsFileClose(cups_file_t *fp) /* I - CUPS file */ int is_stdio; /* Is a stdio file? */ - DEBUG_printf(("cupsFileClose(fp=%p)", fp)); + DEBUG_printf(("cupsFileClose(fp=%p)", (void *)fp)); /* * Range check... @@ -496,9 +496,7 @@ cupsFileFind(const char *filename, /* I - File to find */ * Range check input... */ - DEBUG_printf(("cupsFileFind(filename=\"%s\", path=\"%s\", executable=%d, " - "buffer=%p, bufsize=%d)", filename, path, executable, buffer, - bufsize)); + DEBUG_printf(("cupsFileFind(filename=\"%s\", path=\"%s\", executable=%d, buffer=%p, bufsize=%d)", filename, path, executable, (void *)buffer, bufsize)); if (!filename || !buffer || bufsize < 2) return (NULL); @@ -590,7 +588,7 @@ cupsFileFlush(cups_file_t *fp) /* I - CUPS file */ ssize_t bytes; /* Bytes to write */ - DEBUG_printf(("cupsFileFlush(fp=%p)", fp)); + DEBUG_printf(("cupsFileFlush(fp=%p)", (void *)fp)); /* * Range check input... @@ -639,7 +637,7 @@ cupsFileGetChar(cups_file_t *fp) /* I - CUPS file */ * Range check input... */ - DEBUG_printf(("4cupsFileGetChar(fp=%p)", fp)); + DEBUG_printf(("4cupsFileGetChar(fp=%p)", (void *)fp)); if (!fp || (fp->mode != 'r' && fp->mode != 's')) { @@ -651,7 +649,7 @@ cupsFileGetChar(cups_file_t *fp) /* I - CUPS file */ * If the input buffer is empty, try to read more data... */ - DEBUG_printf(("5cupsFileGetChar: fp->eof=%d, fp->ptr=%p, fp->end=%p", fp->eof, fp->ptr, fp->end)); + DEBUG_printf(("5cupsFileGetChar: fp->eof=%d, fp->ptr=%p, fp->end=%p", fp->eof, (void *)fp->ptr, (void *)fp->end)); if (fp->ptr >= fp->end) if (cups_fill(fp) <= 0) @@ -695,8 +693,7 @@ cupsFileGetConf(cups_file_t *fp, /* I - CUPS file */ */ DEBUG_printf(("2cupsFileGetConf(fp=%p, buf=%p, buflen=" CUPS_LLFMT - ", value=%p, linenum=%p)", fp, buf, CUPS_LLCAST buflen, - value, linenum)); + ", value=%p, linenum=%p)", (void *)fp, (void *)buf, CUPS_LLCAST buflen, (void *)value, (void *)linenum)); if (!fp || (fp->mode != 'r' && fp->mode != 's') || !buf || buflen < 2 || !value) @@ -838,8 +835,7 @@ cupsFileGetLine(cups_file_t *fp, /* I - File to read from */ * Range check input... */ - DEBUG_printf(("2cupsFileGetLine(fp=%p, buf=%p, buflen=" CUPS_LLFMT ")", - fp, buf, CUPS_LLCAST buflen)); + DEBUG_printf(("2cupsFileGetLine(fp=%p, buf=%p, buflen=" CUPS_LLFMT ")", (void *)fp, (void *)buf, CUPS_LLCAST buflen)); if (!fp || (fp->mode != 'r' && fp->mode != 's') || !buf || buflen < 3) return (0); @@ -913,8 +909,7 @@ cupsFileGets(cups_file_t *fp, /* I - CUPS file */ * Range check input... */ - DEBUG_printf(("2cupsFileGets(fp=%p, buf=%p, buflen=" CUPS_LLFMT ")", fp, buf, - CUPS_LLCAST buflen)); + DEBUG_printf(("2cupsFileGets(fp=%p, buf=%p, buflen=" CUPS_LLFMT ")", (void *)fp, (void *)buf, CUPS_LLCAST buflen)); if (!fp || (fp->mode != 'r' && fp->mode != 's') || !buf || buflen < 2) return (NULL); @@ -1314,7 +1309,7 @@ cupsFilePrintf(cups_file_t *fp, /* I - CUPS file */ ssize_t bytes; /* Formatted size */ - DEBUG_printf(("2cupsFilePrintf(fp=%p, format=\"%s\", ...)", fp, format)); + DEBUG_printf(("2cupsFilePrintf(fp=%p, format=\"%s\", ...)", (void *)fp, format)); if (!fp || !format || (fp->mode != 'w' && fp->mode != 's')) return (-1); @@ -1590,8 +1585,7 @@ cupsFileRead(cups_file_t *fp, /* I - CUPS file */ ssize_t count; /* Bytes read */ - DEBUG_printf(("2cupsFileRead(fp=%p, buf=%p, bytes=" CUPS_LLFMT ")", fp, buf, - CUPS_LLCAST bytes)); + DEBUG_printf(("2cupsFileRead(fp=%p, buf=%p, bytes=" CUPS_LLFMT ")", (void *)fp, (void *)buf, CUPS_LLCAST bytes)); /* * Range check input... @@ -1665,7 +1659,7 @@ cupsFileRewind(cups_file_t *fp) /* I - CUPS file */ * Range check input... */ - DEBUG_printf(("cupsFileRewind(fp=%p)", fp)); + DEBUG_printf(("cupsFileRewind(fp=%p)", (void *)fp)); DEBUG_printf(("2cupsFileRewind: pos=" CUPS_LLFMT, CUPS_LLCAST fp->pos)); if (!fp || fp->mode != 'r') @@ -1737,10 +1731,9 @@ cupsFileSeek(cups_file_t *fp, /* I - CUPS file */ ssize_t bytes; /* Number bytes in buffer */ - DEBUG_printf(("cupsFileSeek(fp=%p, pos=" CUPS_LLFMT ")", fp, - CUPS_LLCAST pos)); + DEBUG_printf(("cupsFileSeek(fp=%p, pos=" CUPS_LLFMT ")", (void *)fp, CUPS_LLCAST pos)); DEBUG_printf(("2cupsFileSeek: fp->pos=" CUPS_LLFMT, CUPS_LLCAST fp->pos)); - DEBUG_printf(("2cupsFileSeek: fp->ptr=%p, fp->end=%p", fp->ptr, fp->end)); + DEBUG_printf(("2cupsFileSeek: fp->ptr=%p, fp->end=%p", (void *)fp->ptr, (void *)fp->end)); /* * Range check input... @@ -1988,9 +1981,8 @@ cupsFileStdout(void) off_t /* O - File position */ cupsFileTell(cups_file_t *fp) /* I - CUPS file */ { - DEBUG_printf(("2cupsFileTell(fp=%p)", fp)); - DEBUG_printf(("3cupsFileTell: pos=" CUPS_LLFMT, - CUPS_LLCAST (fp ? fp->pos : -1))); + DEBUG_printf(("2cupsFileTell(fp=%p)", (void *)fp)); + DEBUG_printf(("3cupsFileTell: pos=" CUPS_LLFMT, CUPS_LLCAST (fp ? fp->pos : -1))); return (fp ? fp->pos : 0); } @@ -2009,7 +2001,7 @@ cupsFileUnlock(cups_file_t *fp) /* I - CUPS file */ * Range check... */ - DEBUG_printf(("cupsFileUnlock(fp=%p)", fp)); + DEBUG_printf(("cupsFileUnlock(fp=%p)", (void *)fp)); if (!fp || fp->mode == 's') return (-1); @@ -2041,8 +2033,7 @@ cupsFileWrite(cups_file_t *fp, /* I - CUPS file */ * Range check input... */ - DEBUG_printf(("2cupsFileWrite(fp=%p, buf=%p, bytes=" CUPS_LLFMT ")", - fp, buf, CUPS_LLCAST bytes)); + DEBUG_printf(("2cupsFileWrite(fp=%p, buf=%p, bytes=" CUPS_LLFMT ")", (void *)fp, (void *)buf, CUPS_LLCAST bytes)); if (!fp || !buf || (fp->mode != 'w' && fp->mode != 's')) return (-1); @@ -2102,8 +2093,7 @@ cups_compress(cups_file_t *fp, /* I - CUPS file */ const char *buf, /* I - Buffer */ size_t bytes) /* I - Number bytes */ { - DEBUG_printf(("7cups_compress(fp=%p, buf=%p, bytes=" CUPS_LLFMT ")", fp, buf, - CUPS_LLCAST bytes)); + DEBUG_printf(("7cups_compress(fp=%p, buf=%p, bytes=" CUPS_LLFMT ")", (void *)fp, (void *)buf, CUPS_LLCAST bytes)); /* * Update the CRC... @@ -2159,10 +2149,8 @@ cups_fill(cups_file_t *fp) /* I - CUPS file */ #endif /* HAVE_LIBZ */ - DEBUG_printf(("7cups_fill(fp=%p)", fp)); - DEBUG_printf(("9cups_fill: fp->ptr=%p, fp->end=%p, fp->buf=%p, " - "fp->bufpos=" CUPS_LLFMT ", fp->eof=%d", - fp->ptr, fp->end, fp->buf, CUPS_LLCAST fp->bufpos, fp->eof)); + DEBUG_printf(("7cups_fill(fp=%p)", (void *)fp)); + DEBUG_printf(("9cups_fill: fp->ptr=%p, fp->end=%p, fp->buf=%p, fp->bufpos=" CUPS_LLFMT ", fp->eof=%d", (void *)fp->ptr, (void *)fp->end, (void *)fp->buf, CUPS_LLCAST fp->bufpos, fp->eof)); if (fp->ptr && fp->end) fp->bufpos += fp->end - fp->buf; @@ -2641,8 +2629,7 @@ cups_read(cups_file_t *fp, /* I - CUPS file */ ssize_t total; /* Total bytes read */ - DEBUG_printf(("7cups_read(fp=%p, buf=%p, bytes=" CUPS_LLFMT ")", fp, buf, - CUPS_LLCAST bytes)); + DEBUG_printf(("7cups_read(fp=%p, buf=%p, bytes=" CUPS_LLFMT ")", (void *)fp, (void *)buf, CUPS_LLCAST bytes)); /* * Loop until we read at least 0 bytes... @@ -2698,8 +2685,7 @@ cups_write(cups_file_t *fp, /* I - CUPS file */ ssize_t count; /* Count this time */ - DEBUG_printf(("7cups_write(fp=%p, buf=%p, bytes=" CUPS_LLFMT ")", fp, buf, - CUPS_LLCAST bytes)); + DEBUG_printf(("7cups_write(fp=%p, buf=%p, bytes=" CUPS_LLFMT ")", (void *)fp, (void *)buf, CUPS_LLCAST bytes)); /* * Loop until all bytes are written... diff --git a/cups/getdevices.c b/cups/getdevices.c index 0d5397858..9ecc722d7 100644 --- a/cups/getdevices.c +++ b/cups/getdevices.c @@ -65,10 +65,7 @@ cupsGetDevices( * Range check input... */ - DEBUG_printf(("cupsGetDevices(http=%p, timeout=%d, include_schemes=\"%s\", " - "exclude_schemes=\"%s\", callback=%p, user_data=%p)", http, - timeout, include_schemes, exclude_schemes, callback, - user_data)); + DEBUG_printf(("cupsGetDevices(http=%p, timeout=%d, include_schemes=\"%s\", exclude_schemes=\"%s\", callback=%p, user_data=%p)", (void *)http, timeout, include_schemes, exclude_schemes, (void *)callback, user_data)); if (!callback) return (IPP_STATUS_ERROR_INTERNAL); @@ -190,8 +187,7 @@ cupsGetDevices( if ((state = ippRead(http, response)) == IPP_STATE_ERROR) break; - DEBUG_printf(("2cupsGetDevices: state=%d, response->last=%p", state, - response->last)); + DEBUG_printf(("2cupsGetDevices: state=%d, response->last=%p", state, (void *)response->last)); if (!response->attrs) continue; @@ -243,8 +239,7 @@ cupsGetDevices( } while (state != IPP_STATE_DATA); - DEBUG_printf(("2cupsGetDevices: state=%d, response->last=%p", state, - response->last)); + DEBUG_printf(("2cupsGetDevices: state=%d, response->last=%p", state, (void *)response->last)); if (device_class && device_id && device_info && device_make_and_model && device_uri) diff --git a/cups/getputfile.c b/cups/getputfile.c index 443e0c4f1..478c55cb2 100644 --- a/cups/getputfile.c +++ b/cups/getputfile.c @@ -53,8 +53,7 @@ cupsGetFd(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DEFA * Range check input... */ - DEBUG_printf(("cupsGetFd(http=%p, resource=\"%s\", fd=%d)", http, - resource, fd)); + DEBUG_printf(("cupsGetFd(http=%p, resource=\"%s\", fd=%d)", (void *)http, resource, fd)); if (!resource || fd < 0) { @@ -276,8 +275,7 @@ cupsPutFd(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DEFA * Range check input... */ - DEBUG_printf(("cupsPutFd(http=%p, resource=\"%s\", fd=%d)", http, - resource, fd)); + DEBUG_printf(("cupsPutFd(http=%p, resource=\"%s\", fd=%d)", (void *)http, resource, fd)); if (!resource || fd < 0) { diff --git a/cups/http-addr.c b/cups/http-addr.c index 9ad2ea307..7ae25e449 100644 --- a/cups/http-addr.c +++ b/cups/http-addr.c @@ -325,8 +325,7 @@ httpAddrLookup( /* Global data */ - DEBUG_printf(("httpAddrLookup(addr=%p, name=%p, namelen=%d)", addr, name, - namelen)); + DEBUG_printf(("httpAddrLookup(addr=%p, name=%p, namelen=%d)", (void *)addr, (void *)name, namelen)); /* * Range check input... @@ -503,7 +502,7 @@ httpAddrString(const http_addr_t *addr, /* I - Address to convert */ char *s, /* I - String buffer */ int slen) /* I - Length of string */ { - DEBUG_printf(("httpAddrString(addr=%p, s=%p, slen=%d)", addr, s, slen)); + DEBUG_printf(("httpAddrString(addr=%p, s=%p, slen=%d)", (void *)addr, (void *)s, slen)); /* * Range check input... diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index 8a17f6fa6..9f5cad56d 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -42,7 +42,7 @@ httpAddrConnect( http_addrlist_t *addrlist, /* I - List of potential addresses */ int *sock) /* O - Socket */ { - DEBUG_printf(("httpAddrConnect(addrlist=%p, sock=%p)", addrlist, sock)); + DEBUG_printf(("httpAddrConnect(addrlist=%p, sock=%p)", (void *)addrlist, (void *)sock)); return (httpAddrConnect2(addrlist, sock, 30000, NULL)); } @@ -87,8 +87,7 @@ httpAddrConnect2( #endif /* DEBUG */ - DEBUG_printf(("httpAddrConnect2(addrlist=%p, sock=%p, msec=%d, cancel=%p)", - addrlist, sock, msec, cancel)); + DEBUG_printf(("httpAddrConnect2(addrlist=%p, sock=%p, msec=%d, cancel=%p)", (void *)addrlist, (void *)sock, msec, (void *)cancel)); if (!sock) { diff --git a/cups/http-support.c b/cups/http-support.c index c574fc52d..b62ef3596 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -1578,7 +1578,7 @@ _httpResolveURI( #endif /* DEBUG */ - DEBUG_printf(("_httpResolveURI(uri=\"%s\", resolved_uri=%p, resolved_size=" CUPS_LLFMT ", options=0x%x, cb=%p, context=%p)", uri, resolved_uri, CUPS_LLCAST resolved_size, options, cb, context)); + DEBUG_printf(("_httpResolveURI(uri=\"%s\", resolved_uri=%p, resolved_size=" CUPS_LLFMT ", options=0x%x, cb=%p, context=%p)", uri, (void *)resolved_uri, CUPS_LLCAST resolved_size, options, (void *)cb, context)); /* * Get the device URI... @@ -2147,11 +2147,7 @@ http_resolve_cb( uint8_t valueLen; /* Length of value */ - DEBUG_printf(("4http_resolve_cb(sdRef=%p, flags=%x, interfaceIndex=%u, " - "errorCode=%d, fullName=\"%s\", hostTarget=\"%s\", port=%u, " - "txtLen=%u, txtRecord=%p, context=%p)", sdRef, flags, - interfaceIndex, errorCode, fullName, hostTarget, port, txtLen, - txtRecord, context)); + DEBUG_printf(("4http_resolve_cb(sdRef=%p, flags=%x, interfaceIndex=%u, errorCode=%d, fullName=\"%s\", hostTarget=\"%s\", port=%u, txtLen=%u, txtRecord=%p, context=%p)", (void *)sdRef, flags, interfaceIndex, errorCode, fullName, hostTarget, port, txtLen, (void *)txtRecord, context)); /* * If we have a UUID, compare it... diff --git a/cups/http.c b/cups/http.c index de0ee46b8..47ac8e4ab 100644 --- a/cups/http.c +++ b/cups/http.c @@ -289,7 +289,7 @@ httpClearCookie(http_t *http) /* I - HTTP connection */ void httpClearFields(http_t *http) /* I - HTTP connection */ { - DEBUG_printf(("httpClearFields(http=%p)", http)); + DEBUG_printf(("httpClearFields(http=%p)", (void *)http)); if (http) { @@ -344,7 +344,7 @@ httpClose(http_t *http) /* I - HTTP connection */ #endif /* HAVE_GSSAPI */ - DEBUG_printf(("httpClose(http=%p)", http)); + DEBUG_printf(("httpClose(http=%p)", (void *)http)); /* * Range check input... @@ -451,9 +451,7 @@ httpConnect2( http_t *http; /* New HTTP connection */ - DEBUG_printf(("httpConnect2(host=\"%s\", port=%d, addrlist=%p, family=%d, " - "encryption=%d, blocking=%d, msec=%d, cancel=%p)", host, port, - addrlist, family, encryption, blocking, msec, cancel)); + DEBUG_printf(("httpConnect2(host=\"%s\", port=%d, addrlist=%p, family=%d, encryption=%d, blocking=%d, msec=%d, cancel=%p)", host, port, (void *)addrlist, family, encryption, blocking, msec, (void *)cancel)); /* * Create the HTTP structure... @@ -541,7 +539,7 @@ int /* O - -1 on error, 0 on success */ httpEncryption(http_t *http, /* I - HTTP connection */ http_encryption_t e) /* I - New encryption preference */ { - DEBUG_printf(("httpEncryption(http=%p, e=%d)", http, e)); + DEBUG_printf(("httpEncryption(http=%p, e=%d)", (void *)http, e)); #ifdef HAVE_SSL if (!http) @@ -624,8 +622,7 @@ httpFlush(http_t *http) /* I - HTTP connection */ http_state_t oldstate; /* Old state */ - DEBUG_printf(("httpFlush(http=%p), state=%s", http, - httpStateString(http->state))); + DEBUG_printf(("httpFlush(http=%p), state=%s", (void *)http, httpStateString(http->state))); /* * Nothing to do if we are in the "waiting" state... @@ -695,8 +692,7 @@ httpFlushWrite(http_t *http) /* I - HTTP connection */ ssize_t bytes; /* Bytes written */ - DEBUG_printf(("httpFlushWrite(http=%p) data_encoding=%d", http, - http ? http->data_encoding : 100)); + DEBUG_printf(("httpFlushWrite(http=%p) data_encoding=%d", (void *)http, http ? http->data_encoding : 100)); if (!http || !http->wused) { @@ -1049,8 +1045,7 @@ httpGetLength2(http_t *http) /* I - HTTP connection */ off_t remaining; /* Remaining length */ - DEBUG_printf(("2httpGetLength2(http=%p), state=%s", http, - httpStateString(http->state))); + DEBUG_printf(("2httpGetLength2(http=%p), state=%s", (void *)http, httpStateString(http->state))); if (!http) return (-1); @@ -1170,7 +1165,7 @@ httpGets(char *line, /* I - Line to read into */ int eol; /* End-of-line? */ - DEBUG_printf(("2httpGets(line=%p, length=%d, http=%p)", line, length, http)); + DEBUG_printf(("2httpGets(line=%p, length=%d, http=%p)", (void *)line, length, (void *)http)); if (!http || !line || length <= 1) return (NULL); @@ -1384,8 +1379,7 @@ httpGetSubField2(http_t *http, /* I - HTTP connection */ *ptr, /* Pointer into string buffer */ *end; /* End of value buffer */ - DEBUG_printf(("2httpGetSubField2(http=%p, field=%d, name=\"%s\", value=%p, " - "valuelen=%d)", http, field, name, value, valuelen)); + DEBUG_printf(("2httpGetSubField2(http=%p, field=%d, name=\"%s\", value=%p, valuelen=%d)", (void *)http, field, name, (void *)value, valuelen)); if (!http || !name || !value || valuelen < 2 || field <= HTTP_FIELD_UNKNOWN || field >= HTTP_FIELD_MAX) @@ -1517,7 +1511,7 @@ int /* O - Status of call (0 = success) */ httpHead(http_t *http, /* I - HTTP connection */ const char *uri) /* I - URI for head */ { - DEBUG_printf(("httpHead(http=%p, uri=\"%s\")", http, uri)); + DEBUG_printf(("httpHead(http=%p, uri=\"%s\")", (void *)http, uri)); return (http_send(http, HTTP_STATE_HEAD, uri)); } @@ -1640,8 +1634,7 @@ httpPeek(http_t *http, /* I - HTTP connection */ char len[32]; /* Length string */ - DEBUG_printf(("httpPeek(http=%p, buffer=%p, length=" CUPS_LLFMT ")", - http, buffer, CUPS_LLCAST length)); + DEBUG_printf(("httpPeek(http=%p, buffer=%p, length=" CUPS_LLFMT ")", (void *)http, (void *)buffer, CUPS_LLCAST length)); if (http == NULL || buffer == NULL) return (-1); @@ -1904,7 +1897,7 @@ httpPrintf(http_t *http, /* I - HTTP connection */ va_list ap; /* Variable argument pointer */ - DEBUG_printf(("2httpPrintf(http=%p, format=\"%s\", ...)", http, format)); + DEBUG_printf(("2httpPrintf(http=%p, format=\"%s\", ...)", (void *)http, format)); va_start(ap, format); bytes = vsnprintf(buf, sizeof(buf), format, ap); @@ -1937,7 +1930,7 @@ int /* O - Status of call (0 = success) */ httpPut(http_t *http, /* I - HTTP connection */ const char *uri) /* I - URI to put */ { - DEBUG_printf(("httpPut(http=%p, uri=\"%s\")", http, uri)); + DEBUG_printf(("httpPut(http=%p, uri=\"%s\")", (void *)http, uri)); return (http_send(http, HTTP_STATE_PUT, uri)); } @@ -1975,16 +1968,9 @@ httpRead2(http_t *http, /* I - HTTP connection */ #ifdef HAVE_LIBZ - DEBUG_printf(("httpRead2(http=%p, buffer=%p, length=" CUPS_LLFMT - ") coding=%d data_encoding=%d data_remaining=" CUPS_LLFMT, - http, buffer, CUPS_LLCAST length, - http->coding, - http->data_encoding, CUPS_LLCAST http->data_remaining)); + DEBUG_printf(("httpRead2(http=%p, buffer=%p, length=" CUPS_LLFMT ") coding=%d data_encoding=%d data_remaining=" CUPS_LLFMT, (void *)http, (void *)buffer, CUPS_LLCAST length, http->coding, http->data_encoding, CUPS_LLCAST http->data_remaining)); #else - DEBUG_printf(("httpRead2(http=%p, buffer=%p, length=" CUPS_LLFMT - ") data_encoding=%d data_remaining=" CUPS_LLFMT, - http, buffer, CUPS_LLCAST length, - http->data_encoding, CUPS_LLCAST http->data_remaining)); + DEBUG_printf(("httpRead2(http=%p, buffer=%p, length=" CUPS_LLFMT ") data_encoding=%d data_remaining=" CUPS_LLFMT, (void *)http, (void *)buffer, CUPS_LLCAST length, http->data_encoding, CUPS_LLCAST http->data_remaining)); #endif /* HAVE_LIBZ */ if (http == NULL || buffer == NULL) @@ -2195,8 +2181,7 @@ httpReadRequest(http_t *http, /* I - HTTP connection */ * Range check input... */ - DEBUG_printf(("httpReadRequest(http=%p, uri=%p, urilen=" CUPS_LLFMT ")", - http, uri, CUPS_LLCAST urilen)); + DEBUG_printf(("httpReadRequest(http=%p, uri=%p, urilen=" CUPS_LLFMT ")", (void *)http, (void *)uri, CUPS_LLCAST urilen)); if (uri) *uri = '\0'; @@ -2349,7 +2334,7 @@ httpReadRequest(http_t *http, /* I - HTTP connection */ int /* O - 0 on success, non-zero on failure */ httpReconnect(http_t *http) /* I - HTTP connection */ { - DEBUG_printf(("httpReconnect(http=%p)", http)); + DEBUG_printf(("httpReconnect(http=%p)", (void *)http)); return (httpReconnect2(http, 30000, NULL)); } @@ -2372,8 +2357,7 @@ httpReconnect2(http_t *http, /* I - HTTP connection */ #endif /* DEBUG */ - DEBUG_printf(("httpReconnect2(http=%p, msec=%d, cancel=%p)", http, msec, - cancel)); + DEBUG_printf(("httpReconnect2(http=%p, msec=%d, cancel=%p)", (void *)http, msec, (void *)cancel)); if (!http) { @@ -2603,8 +2587,7 @@ httpSetDefaultField(http_t *http, /* I - HTTP connection */ http_field_t field, /* I - Field index */ const char *value)/* I - Value */ { - DEBUG_printf(("httpSetDefaultField(http=%p, field=%d(%s), value=\"%s\")", - http, field, http_fields[field], value)); + DEBUG_printf(("httpSetDefaultField(http=%p, field=%d(%s), value=\"%s\")", (void *)http, field, http_fields[field], value)); if (!http) return; @@ -2653,7 +2636,7 @@ httpSetExpect(http_t *http, /* I - HTTP connection */ http_status_t expect) /* I - HTTP status to expect (@code HTTP_STATUS_CONTINUE@) */ { - DEBUG_printf(("httpSetExpect(http=%p, expect=%d)", http, expect)); + DEBUG_printf(("httpSetExpect(http=%p, expect=%d)", (void *)http, expect)); if (http) http->expect = expect; @@ -2669,8 +2652,7 @@ httpSetField(http_t *http, /* I - HTTP connection */ http_field_t field, /* I - Field index */ const char *value) /* I - Value */ { - DEBUG_printf(("httpSetField(http=%p, field=%d(%s), value=\"%s\")", http, - field, http_fields[field], value)); + DEBUG_printf(("httpSetField(http=%p, field=%d(%s), value=\"%s\")", (void *)http, field, http_fields[field], value)); if (http == NULL || field < HTTP_FIELD_ACCEPT_LANGUAGE || @@ -2806,8 +2788,7 @@ void httpSetLength(http_t *http, /* I - HTTP connection */ size_t length) /* I - Length (0 for chunked) */ { - DEBUG_printf(("httpSetLength(http=%p, length=" CUPS_LLFMT ")", http, - CUPS_LLCAST length)); + DEBUG_printf(("httpSetLength(http=%p, length=" CUPS_LLFMT ")", (void *)http, CUPS_LLCAST length)); if (!http) return; @@ -2912,8 +2893,7 @@ _httpUpdate(http_t *http, /* I - HTTP connection */ int major, minor; /* HTTP version numbers */ - DEBUG_printf(("_httpUpdate(http=%p, status=%p), state=%s", http, status, - httpStateString(http->state))); + DEBUG_printf(("_httpUpdate(http=%p, status=%p), state=%s", (void *)http, (void *)status, httpStateString(http->state))); /* * Grab a single line from the connection... @@ -3082,8 +3062,7 @@ httpUpdate(http_t *http) /* I - HTTP connection */ http_status_t status; /* Request status */ - DEBUG_printf(("httpUpdate(http=%p), state=%s", http, - httpStateString(http->state))); + DEBUG_printf(("httpUpdate(http=%p), state=%s", (void *)http, httpStateString(http->state))); /* * Flush pending data, if any... @@ -3154,7 +3133,7 @@ _httpWait(http_t *http, /* I - HTTP connection */ int nfds; /* Result from select()/poll() */ - DEBUG_printf(("4_httpWait(http=%p, msec=%d, usessl=%d)", http, msec, usessl)); + DEBUG_printf(("4_httpWait(http=%p, msec=%d, usessl=%d)", (void *)http, msec, usessl)); if (http->fd < 0) { @@ -3237,7 +3216,7 @@ httpWait(http_t *http, /* I - HTTP connection */ * First see if there is data in the buffer... */ - DEBUG_printf(("2httpWait(http=%p, msec=%d)", http, msec)); + DEBUG_printf(("2httpWait(http=%p, msec=%d)", (void *)http, msec)); if (http == NULL) return (0); @@ -3308,8 +3287,7 @@ httpWrite2(http_t *http, /* I - HTTP connection */ ssize_t bytes; /* Bytes written */ - DEBUG_printf(("httpWrite2(http=%p, buffer=%p, length=" CUPS_LLFMT ")", http, - buffer, CUPS_LLCAST length)); + DEBUG_printf(("httpWrite2(http=%p, buffer=%p, length=" CUPS_LLFMT ")", (void *)http, (void *)buffer, CUPS_LLCAST length)); /* * Range check input... @@ -3504,7 +3482,7 @@ httpWriteResponse(http_t *http, /* I - HTTP connection */ * Range check input... */ - DEBUG_printf(("httpWriteResponse(http=%p, status=%d)", http, status)); + DEBUG_printf(("httpWriteResponse(http=%p, status=%d)", (void *)http, status)); if (!http || status < HTTP_STATUS_CONTINUE) { @@ -3721,7 +3699,7 @@ http_content_coding_finish( size_t bytes; /* Number of bytes to write */ - DEBUG_printf(("http_content_coding_finish(http=%p)", http)); + DEBUG_printf(("http_content_coding_finish(http=%p)", (void *)http)); DEBUG_printf(("1http_content_coding_finishing: http->coding=%d", http->coding)); switch (http->coding) @@ -3788,8 +3766,7 @@ http_content_coding_start( _http_coding_t coding; /* Content coding value */ - DEBUG_printf(("http_content_coding_start(http=%p, value=\"%s\")", http, - value)); + DEBUG_printf(("http_content_coding_start(http=%p, value=\"%s\")", (void *)http, value)); if (http->coding != _HTTP_CODING_IDENTITY) { @@ -3931,9 +3908,7 @@ http_create( http_addrlist_t *myaddrlist = NULL; /* My address list */ - DEBUG_printf(("4http_create(host=\"%s\", port=%d, addrlist=%p, family=%d, " - "encryption=%d, blocking=%d, mode=%d)", host, port, addrlist, - family, encryption, blocking, mode)); + DEBUG_printf(("4http_create(host=\"%s\", port=%d, addrlist=%p, family=%d, encryption=%d, blocking=%d, mode=%d)", host, port, (void *)addrlist, family, encryption, blocking, mode)); if (!host && mode == _HTTP_MODE_CLIENT) return (NULL); @@ -4075,8 +4050,7 @@ http_read(http_t *http, /* I - HTTP connection */ ssize_t bytes; /* Bytes read */ - DEBUG_printf(("http_read(http=%p, buffer=%p, length=" CUPS_LLFMT ")", http, - buffer, CUPS_LLCAST length)); + DEBUG_printf(("http_read(http=%p, buffer=%p, length=" CUPS_LLFMT ")", (void *)http, (void *)buffer, CUPS_LLCAST length)); if (!http->blocking) { @@ -4189,9 +4163,7 @@ http_read_buffered(http_t *http, /* I - HTTP connection */ ssize_t bytes; /* Bytes read */ - DEBUG_printf(("http_read_buffered(http=%p, buffer=%p, length=" CUPS_LLFMT - ") used=%d", - http, buffer, CUPS_LLCAST length, http->used)); + DEBUG_printf(("http_read_buffered(http=%p, buffer=%p, length=" CUPS_LLFMT ") used=%d", (void *)http, (void *)buffer, CUPS_LLCAST length, http->used)); if (http->used > 0) { @@ -4228,8 +4200,7 @@ http_read_chunk(http_t *http, /* I - HTTP connection */ char *buffer, /* I - Buffer */ size_t length) /* I - Maximum bytes to read */ { - DEBUG_printf(("http_read_chunk(http=%p, buffer=%p, length=" CUPS_LLFMT ")", - http, buffer, CUPS_LLCAST length)); + DEBUG_printf(("http_read_chunk(http=%p, buffer=%p, length=" CUPS_LLFMT ")", (void *)http, (void *)buffer, CUPS_LLCAST length)); if (http->data_remaining <= 0) { @@ -4317,8 +4288,7 @@ http_send(http_t *http, /* I - HTTP connection */ }; - DEBUG_printf(("4http_send(http=%p, request=HTTP_%s, uri=\"%s\")", - http, codes[request], uri)); + DEBUG_printf(("4http_send(http=%p, request=HTTP_%s, uri=\"%s\")", (void *)http, codes[request], uri)); if (http == NULL || uri == NULL) return (-1); @@ -4482,8 +4452,7 @@ http_set_length(http_t *http) /* I - Connection */ off_t remaining; /* Remainder */ - DEBUG_printf(("http_set_length(http=%p) mode=%d state=%s", http, http->mode, - httpStateString(http->state))); + DEBUG_printf(("http_set_length(http=%p) mode=%d state=%s", (void *)http, http->mode, httpStateString(http->state))); if ((remaining = httpGetLength2(http)) >= 0) { @@ -4582,7 +4551,7 @@ http_tls_upgrade(http_t *http) /* I - HTTP connection */ http_t myhttp; /* Local copy of HTTP data */ - DEBUG_printf(("7http_tls_upgrade(%p)", http)); + DEBUG_printf(("7http_tls_upgrade(%p)", (void *)http)); /* * Flush the connection to make sure any previous "Upgrade" message @@ -4670,8 +4639,7 @@ http_write(http_t *http, /* I - HTTP connection */ bytes; /* Bytes sent */ - DEBUG_printf(("2http_write(http=%p, buffer=%p, length=" CUPS_LLFMT ")", http, - buffer, CUPS_LLCAST length)); + DEBUG_printf(("2http_write(http=%p, buffer=%p, length=" CUPS_LLFMT ")", (void *)http, (void *)buffer, CUPS_LLCAST length)); http->error = 0; tbytes = 0; @@ -4818,8 +4786,7 @@ http_write_chunk(http_t *http, /* I - HTTP connection */ ssize_t bytes; /* Bytes written */ - DEBUG_printf(("7http_write_chunk(http=%p, buffer=%p, length=" CUPS_LLFMT ")", - http, buffer, CUPS_LLCAST length)); + DEBUG_printf(("7http_write_chunk(http=%p, buffer=%p, length=" CUPS_LLFMT ")", (void *)http, (void *)buffer, CUPS_LLCAST length)); /* * Write the chunk header, data, and trailer. diff --git a/cups/ipp.c b/cups/ipp.c index e1a528c70..440432049 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -127,8 +127,7 @@ ippAddBoolean(ipp_t *ipp, /* I - IPP message */ ipp_attribute_t *attr; /* New attribute */ - DEBUG_printf(("ippAddBoolean(ipp=%p, group=%02x(%s), name=\"%s\", value=%d)", - ipp, group, ippTagString(group), name, value)); + DEBUG_printf(("ippAddBoolean(ipp=%p, group=%02x(%s), name=\"%s\", value=%d)", (void *)ipp, group, ippTagString(group), name, value)); /* * Range check input... @@ -176,9 +175,7 @@ ippAddBooleans(ipp_t *ipp, /* I - IPP message */ _ipp_value_t *value; /* Current value */ - DEBUG_printf(("ippAddBooleans(ipp=%p, group=%02x(%s), name=\"%s\", " - "num_values=%d, values=%p)", ipp, group, ippTagString(group), - name, num_values, values)); + DEBUG_printf(("ippAddBooleans(ipp=%p, group=%02x(%s), name=\"%s\", num_values=%d, values=%p)", (void *)ipp, group, ippTagString(group), name, num_values, (void *)values)); /* * Range check input... @@ -232,8 +229,7 @@ ippAddCollection(ipp_t *ipp, /* I - IPP message */ ipp_attribute_t *attr; /* New attribute */ - DEBUG_printf(("ippAddCollection(ipp=%p, group=%02x(%s), name=\"%s\", " - "value=%p)", ipp, group, ippTagString(group), name, value)); + DEBUG_printf(("ippAddCollection(ipp=%p, group=%02x(%s), name=\"%s\", value=%p)", (void *)ipp, group, ippTagString(group), name, (void *)value)); /* * Range check input... @@ -287,9 +283,7 @@ ippAddCollections( _ipp_value_t *value; /* Current value */ - DEBUG_printf(("ippAddCollections(ipp=%p, group=%02x(%s), name=\"%s\", " - "num_values=%d, values=%p)", ipp, group, ippTagString(group), - name, num_values, values)); + DEBUG_printf(("ippAddCollections(ipp=%p, group=%02x(%s), name=\"%s\", num_values=%d, values=%p)", (void *)ipp, group, ippTagString(group), name, num_values, (void *)values)); /* * Range check input... @@ -345,8 +339,7 @@ ippAddDate(ipp_t *ipp, /* I - IPP message */ ipp_attribute_t *attr; /* New attribute */ - DEBUG_printf(("ippAddDate(ipp=%p, group=%02x(%s), name=\"%s\", value=%p)", - ipp, group, ippTagString(group), name, value)); + DEBUG_printf(("ippAddDate(ipp=%p, group=%02x(%s), name=\"%s\", value=%p)", (void *)ipp, group, ippTagString(group), name, (void *)value)); /* * Range check input... @@ -395,9 +388,7 @@ ippAddInteger(ipp_t *ipp, /* I - IPP message */ ipp_attribute_t *attr; /* New attribute */ - DEBUG_printf(("ippAddInteger(ipp=%p, group=%02x(%s), type=%02x(%s), " - "name=\"%s\", value=%d)", ipp, group, ippTagString(group), - value_tag, ippTagString(value_tag), name, value)); + DEBUG_printf(("ippAddInteger(ipp=%p, group=%02x(%s), type=%02x(%s), name=\"%s\", value=%d)", (void *)ipp, group, ippTagString(group), value_tag, ippTagString(value_tag), name, value)); value_tag &= IPP_TAG_CUPS_MASK; @@ -466,10 +457,7 @@ ippAddIntegers(ipp_t *ipp, /* I - IPP message */ _ipp_value_t *value; /* Current value */ - DEBUG_printf(("ippAddIntegers(ipp=%p, group=%02x(%s), type=%02x(%s), " - "name=\"%s\", num_values=%d, values=%p)", ipp, - group, ippTagString(group), value_tag, ippTagString(value_tag), name, - num_values, values)); + DEBUG_printf(("ippAddIntegers(ipp=%p, group=%02x(%s), type=%02x(%s), name=\"%s\", num_values=%d, values=%p)", (void *)ipp, group, ippTagString(group), value_tag, ippTagString(value_tag), name, num_values, (void *)values)); value_tag &= IPP_TAG_CUPS_MASK; @@ -594,9 +582,7 @@ ippAddOutOfBand(ipp_t *ipp, /* I - IPP message */ ipp_tag_t value_tag, /* I - Type of attribute */ const char *name) /* I - Name of attribute */ { - DEBUG_printf(("ippAddOutOfBand(ipp=%p, group=%02x(%s), value_tag=%02x(%s), " - "name=\"%s\")", ipp, group, ippTagString(group), value_tag, - ippTagString(value_tag), name)); + DEBUG_printf(("ippAddOutOfBand(ipp=%p, group=%02x(%s), value_tag=%02x(%s), name=\"%s\")", (void *)ipp, group, ippTagString(group), value_tag, ippTagString(value_tag), name)); value_tag &= IPP_TAG_CUPS_MASK; @@ -648,9 +634,7 @@ ippAddRange(ipp_t *ipp, /* I - IPP message */ ipp_attribute_t *attr; /* New attribute */ - DEBUG_printf(("ippAddRange(ipp=%p, group=%02x(%s), name=\"%s\", lower=%d, " - "upper=%d)", ipp, group, ippTagString(group), name, lower, - upper)); + DEBUG_printf(("ippAddRange(ipp=%p, group=%02x(%s), name=\"%s\", lower=%d, upper=%d)", (void *)ipp, group, ippTagString(group), name, lower, upper)); /* * Range check input... @@ -700,9 +684,7 @@ ippAddRanges(ipp_t *ipp, /* I - IPP message */ _ipp_value_t *value; /* Current value */ - DEBUG_printf(("ippAddRanges(ipp=%p, group=%02x(%s), name=\"%s\", " - "num_values=%d, lower=%p, upper=%p)", ipp, group, - ippTagString(group), name, num_values, lower, upper)); + DEBUG_printf(("ippAddRanges(ipp=%p, group=%02x(%s), name=\"%s\", num_values=%d, lower=%p, upper=%p)", (void *)ipp, group, ippTagString(group), name, num_values, (void *)lower, (void *)upper)); /* * Range check input... @@ -759,8 +741,7 @@ ippAddResolution(ipp_t *ipp, /* I - IPP message */ ipp_attribute_t *attr; /* New attribute */ - DEBUG_printf(("ippAddResolution(ipp=%p, group=%02x(%s), name=\"%s\", " - "units=%d, xres=%d, yres=%d)", ipp, group, + DEBUG_printf(("ippAddResolution(ipp=%p, group=%02x(%s), name=\"%s\", units=%d, xres=%d, yres=%d)", (void *)ipp, group, ippTagString(group), name, units, xres, yres)); /* @@ -815,9 +796,7 @@ ippAddResolutions(ipp_t *ipp, /* I - IPP message */ _ipp_value_t *value; /* Current value */ - DEBUG_printf(("ippAddResolutions(ipp=%p, group=%02x(%s), name=\"%s\", " - "num_value=%d, units=%d, xres=%p, yres=%p)", ipp, group, - ippTagString(group), name, num_values, units, xres, yres)); + DEBUG_printf(("ippAddResolutions(ipp=%p, group=%02x(%s), name=\"%s\", num_value=%d, units=%d, xres=%p, yres=%p)", (void *)ipp, group, ippTagString(group), name, num_values, units, (void *)xres, (void *)yres)); /* * Range check input... @@ -862,7 +841,7 @@ ippAddResolutions(ipp_t *ipp, /* I - IPP message */ ipp_attribute_t * /* O - New attribute */ ippAddSeparator(ipp_t *ipp) /* I - IPP message */ { - DEBUG_printf(("ippAddSeparator(ipp=%p)", ipp)); + DEBUG_printf(("ippAddSeparator(ipp=%p)", (void *)ipp)); /* * Range check input... @@ -916,10 +895,7 @@ ippAddString(ipp_t *ipp, /* I - IPP message */ /* Charset/language code buffer */ - DEBUG_printf(("ippAddString(ipp=%p, group=%02x(%s), value_tag=%02x(%s), " - "name=\"%s\", language=\"%s\", value=\"%s\")", ipp, - group, ippTagString(group), value_tag, ippTagString(value_tag), name, - language, value)); + DEBUG_printf(("ippAddString(ipp=%p, group=%02x(%s), value_tag=%02x(%s), name=\"%s\", language=\"%s\", value=\"%s\")", (void *)ipp, group, ippTagString(group), value_tag, ippTagString(value_tag), name, language, value)); /* * Range check input... @@ -1251,10 +1227,7 @@ ippAddStrings( char code[32]; /* Language/charset value buffer */ - DEBUG_printf(("ippAddStrings(ipp=%p, group=%02x(%s), value_tag=%02x(%s), " - "name=\"%s\", num_values=%d, language=\"%s\", values=%p)", ipp, - group, ippTagString(group), value_tag, ippTagString(value_tag), name, - num_values, language, values)); + DEBUG_printf(("ippAddStrings(ipp=%p, group=%02x(%s), value_tag=%02x(%s), name=\"%s\", num_values=%d, language=\"%s\", values=%p)", (void *)ipp, group, ippTagString(group), value_tag, ippTagString(value_tag), name, num_values, language, (void *)values)); /* * Range check input... @@ -1423,7 +1396,7 @@ ippContainsString( _ipp_value_t *avalue; /* Current attribute value */ - DEBUG_printf(("ippContainsString(attr=%p, value=\"%s\")", attr, value)); + DEBUG_printf(("ippContainsString(attr=%p, value=\"%s\")", (void *)attr, value)); /* * Range check input... @@ -1503,8 +1476,7 @@ ippCopyAttribute( *dstval; /* Destination value */ - DEBUG_printf(("ippCopyAttribute(dst=%p, srcattr=%p, quickcopy=%d)", dst, srcattr, - quickcopy)); + DEBUG_printf(("ippCopyAttribute(dst=%p, srcattr=%p, quickcopy=%d)", (void *)dst, (void *)srcattr, quickcopy)); /* * Range check input... @@ -1752,8 +1724,7 @@ ippCopyAttributes( ipp_attribute_t *srcattr; /* Source attribute */ - DEBUG_printf(("ippCopyAttributes(dst=%p, src=%p, quickcopy=%d, cb=%p, context=%p)", - dst, src, quickcopy, cb, context)); + DEBUG_printf(("ippCopyAttributes(dst=%p, src=%p, quickcopy=%d, cb=%p, context=%p)", (void *)dst, (void *)src, quickcopy, (void *)cb, context)); /* * Range check input... @@ -1838,7 +1809,7 @@ ippDelete(ipp_t *ipp) /* I - IPP message */ *next; /* Next attribute */ - DEBUG_printf(("ippDelete(ipp=%p)", ipp)); + DEBUG_printf(("ippDelete(ipp=%p)", (void *)ipp)); if (!ipp) return; @@ -1878,8 +1849,7 @@ ippDeleteAttribute( *prev; /* Previous attribute */ - DEBUG_printf(("ippDeleteAttribute(ipp=%p, attr=%p(%s))", ipp, attr, - attr ? attr->name : "(null)")); + DEBUG_printf(("ippDeleteAttribute(ipp=%p, attr=%p(%s))", (void *)ipp, (void *)attr, attr ? attr->name : "(null)")); /* * Range check input... @@ -1994,8 +1964,7 @@ ippFindAttribute(ipp_t *ipp, /* I - IPP message */ const char *name, /* I - Name of attribute */ ipp_tag_t type) /* I - Type of attribute */ { - DEBUG_printf(("2ippFindAttribute(ipp=%p, name=\"%s\", type=%02x(%s))", ipp, - name, type, ippTagString(type))); + DEBUG_printf(("2ippFindAttribute(ipp=%p, name=\"%s\", type=%02x(%s))", (void *)ipp, name, type, ippTagString(type))); if (!ipp || !name) return (NULL); @@ -2035,8 +2004,7 @@ ippFindNextAttribute(ipp_t *ipp, /* I - IPP message */ *child = NULL; /* Child attribute name */ - DEBUG_printf(("2ippFindNextAttribute(ipp=%p, name=\"%s\", type=%02x(%s))", - ipp, name, type, ippTagString(type))); + DEBUG_printf(("2ippFindNextAttribute(ipp=%p, name=\"%s\", type=%02x(%s))", (void *)ipp, name, type, ippTagString(type))); if (!ipp || !name) return (NULL); @@ -2107,8 +2075,7 @@ ippFindNextAttribute(ipp_t *ipp, /* I - IPP message */ for (; attr != NULL; ipp->prev = attr, attr = attr->next) { - DEBUG_printf(("4ippFindAttribute: attr=%p, name=\"%s\"", attr, - attr->name)); + DEBUG_printf(("4ippFindAttribute: attr=%p, name=\"%s\"", (void *)attr, attr->name)); value_tag = (ipp_tag_t)(attr->value_tag & IPP_TAG_CUPS_MASK); @@ -2731,7 +2698,7 @@ ippNew(void) temp->use = 1; } - DEBUG_printf(("1ippNew: Returning %p", temp)); + DEBUG_printf(("1ippNew: Returning %p", (void *)temp)); return (temp); } @@ -2917,14 +2884,12 @@ ipp_state_t /* O - Current state */ ippRead(http_t *http, /* I - HTTP connection */ ipp_t *ipp) /* I - IPP data */ { - DEBUG_printf(("ippRead(http=%p, ipp=%p), data_remaining=" CUPS_LLFMT, - http, ipp, CUPS_LLCAST (http ? http->data_remaining : -1))); + DEBUG_printf(("ippRead(http=%p, ipp=%p), data_remaining=" CUPS_LLFMT, (void *)http, (void *)ipp, CUPS_LLCAST (http ? http->data_remaining : -1))); if (!http) return (IPP_STATE_ERROR); - DEBUG_printf(("2ippRead: http->state=%d, http->used=%d", http->state, - http->used)); + DEBUG_printf(("2ippRead: http->state=%d, http->used=%d", http->state, http->used)); return (ippReadIO(http, (ipp_iocb_t)ipp_read_http, http->blocking, NULL, ipp)); @@ -2941,7 +2906,7 @@ ipp_state_t /* O - Current state */ ippReadFile(int fd, /* I - HTTP data */ ipp_t *ipp) /* I - IPP data */ { - DEBUG_printf(("ippReadFile(fd=%d, ipp=%p)", fd, ipp)); + DEBUG_printf(("ippReadFile(fd=%d, ipp=%p)", fd, (void *)ipp)); return (ippReadIO(&fd, (ipp_iocb_t)ipp_read_file, 1, NULL, ipp)); } @@ -2971,8 +2936,7 @@ ippReadIO(void *src, /* I - Data source */ _ipp_value_t *value; /* Current value */ - DEBUG_printf(("ippReadIO(src=%p, cb=%p, blocking=%d, parent=%p, ipp=%p)", - src, cb, blocking, parent, ipp)); + DEBUG_printf(("ippReadIO(src=%p, cb=%p, blocking=%d, parent=%p, ipp=%p)", (void *)src, (void *)cb, blocking, (void *)parent, (void *)ipp)); DEBUG_printf(("2ippReadIO: ipp->state=%d", ipp ? ipp->state : IPP_STATE_ERROR)); if (!src || !ipp) @@ -3042,8 +3006,7 @@ ippReadIO(void *src, /* I - Data source */ return (IPP_STATE_ERROR); } - DEBUG_printf(("2ippReadIO: ipp->current=%p, ipp->prev=%p", - ipp->current, ipp->prev)); + DEBUG_printf(("2ippReadIO: ipp->current=%p, ipp->prev=%p", (void *)ipp->current, (void *)ipp->prev)); /* * Read this attribute... @@ -3103,8 +3066,7 @@ ippReadIO(void *src, /* I - Data source */ ipp->curtag = tag; ipp->current = NULL; - DEBUG_printf(("2ippReadIO: group tag=%x(%s), ipp->prev=%p", tag, - ippTagString(tag), ipp->prev)); + DEBUG_printf(("2ippReadIO: group tag=%x(%s), ipp->prev=%p", tag, ippTagString(tag), (void *)ipp->prev)); continue; } @@ -3275,8 +3237,7 @@ ippReadIO(void *src, /* I - Data source */ return (IPP_STATE_ERROR); } - DEBUG_printf(("2ippReadIO: membername, ipp->current=%p, ipp->prev=%p", - ipp->current, ipp->prev)); + DEBUG_printf(("2ippReadIO: membername, ipp->current=%p, ipp->prev=%p", (void *)ipp->current, (void *)ipp->prev)); value = attr->values; } @@ -3307,8 +3268,7 @@ ippReadIO(void *src, /* I - Data source */ return (IPP_STATE_ERROR); } - DEBUG_printf(("2ippReadIO: name=\"%s\", ipp->current=%p, " - "ipp->prev=%p", buffer, ipp->current, ipp->prev)); + DEBUG_printf(("2ippReadIO: name=\"%s\", ipp->current=%p, ipp->prev=%p", buffer, (void *)ipp->current, (void *)ipp->prev)); value = attr->values; } @@ -5461,7 +5421,7 @@ ipp_state_t /* O - Current state */ ippWrite(http_t *http, /* I - HTTP connection */ ipp_t *ipp) /* I - IPP data */ { - DEBUG_printf(("ippWrite(http=%p, ipp=%p)", http, ipp)); + DEBUG_printf(("ippWrite(http=%p, ipp=%p)", (void *)http, (void *)ipp)); if (!http) return (IPP_STATE_ERROR); @@ -5480,7 +5440,7 @@ ipp_state_t /* O - Current state */ ippWriteFile(int fd, /* I - HTTP data */ ipp_t *ipp) /* I - IPP data */ { - DEBUG_printf(("ippWriteFile(fd=%d, ipp=%p)", fd, ipp)); + DEBUG_printf(("ippWriteFile(fd=%d, ipp=%p)", fd, (void *)ipp)); ipp->state = IPP_STATE_IDLE; @@ -5509,8 +5469,7 @@ ippWriteIO(void *dst, /* I - Destination */ _ipp_value_t *value; /* Current value */ - DEBUG_printf(("ippWriteIO(dst=%p, cb=%p, blocking=%d, parent=%p, ipp=%p)", - dst, cb, blocking, parent, ipp)); + DEBUG_printf(("ippWriteIO(dst=%p, cb=%p, blocking=%d, parent=%p, ipp=%p)", (void *)dst, (void *)cb, blocking, (void *)parent, (void *)ipp)); if (!dst || !ipp) return (IPP_STATE_ERROR); @@ -5572,7 +5531,7 @@ ippWriteIO(void *dst, /* I - Destination */ ipp->current = ipp->attrs; ipp->curtag = IPP_TAG_ZERO; - DEBUG_printf(("1ippWriteIO: ipp->current=%p", ipp->current)); + DEBUG_printf(("1ippWriteIO: ipp->current=%p", (void *)ipp->current)); /* * If blocking is disabled, stop here... @@ -6401,8 +6360,7 @@ ipp_add_attr(ipp_t *ipp, /* I - IPP message */ ipp_attribute_t *attr; /* New attribute */ - DEBUG_printf(("4ipp_add_attr(ipp=%p, name=\"%s\", group_tag=0x%x, value_tag=0x%x, " - "num_values=%d)", ipp, name, group_tag, value_tag, num_values)); + DEBUG_printf(("4ipp_add_attr(ipp=%p, name=\"%s\", group_tag=0x%x, value_tag=0x%x, num_values=%d)", (void *)ipp, name, group_tag, value_tag, num_values)); /* * Range check input... @@ -6449,7 +6407,7 @@ ipp_add_attr(ipp_t *ipp, /* I - IPP message */ ipp->last = ipp->current = attr; } - DEBUG_printf(("5ipp_add_attr: Returning %p", attr)); + DEBUG_printf(("5ipp_add_attr: Returning %p", (void *)attr)); return (attr); } @@ -6468,8 +6426,7 @@ ipp_free_values(ipp_attribute_t *attr, /* I - Attribute to free values from */ _ipp_value_t *value; /* Current value */ - DEBUG_printf(("4ipp_free_values(attr=%p, element=%d, count=%d)", attr, - element, count)); + DEBUG_printf(("4ipp_free_values(attr=%p, element=%d, count=%d)", (void *)attr, element, count)); if (!(attr->value_tag & IPP_TAG_CUPS_CONST)) { @@ -6638,7 +6595,7 @@ ipp_length(ipp_t *ipp, /* I - IPP message or collection */ _ipp_value_t *value; /* Current value */ - DEBUG_printf(("3ipp_length(ipp=%p, collection=%d)", ipp, collection)); + DEBUG_printf(("3ipp_length(ipp=%p, collection=%d)", (void *)ipp, collection)); if (!ipp) { @@ -6798,8 +6755,7 @@ ipp_read_http(http_t *http, /* I - Client connection */ bytes; /* Bytes read this pass */ - DEBUG_printf(("7ipp_read_http(http=%p, buffer=%p, length=%d)", - http, buffer, (int)length)); + DEBUG_printf(("7ipp_read_http(http=%p, buffer=%p, length=%d)", (void *)http, (void *)buffer, (int)length)); /* * Loop until all bytes are read... diff --git a/cups/language.c b/cups/language.c index 69e391f2a..aa167ad24 100644 --- a/cups/language.c +++ b/cups/language.c @@ -1476,7 +1476,7 @@ cups_cache_lookup( for (lang = lang_cache; lang != NULL; lang = lang->next) { DEBUG_printf(("9cups_cache_lookup: lang=%p, language=\"%s\", " - "encoding=%d(%s)", lang, lang->language, lang->encoding, + "encoding=%d(%s)", (void *)lang, lang->language, lang->encoding, lang_encodings[lang->encoding])); if (!strcmp(lang->language, name) && diff --git a/cups/options.c b/cups/options.c index 073edaee9..798728905 100644 --- a/cups/options.c +++ b/cups/options.c @@ -49,8 +49,7 @@ cupsAddOption(const char *name, /* I - Name of option */ diff; /* Result of search */ - DEBUG_printf(("2cupsAddOption(name=\"%s\", value=\"%s\", num_options=%d, " - "options=%p)", name, value, num_options, options)); + DEBUG_printf(("2cupsAddOption(name=\"%s\", value=\"%s\", num_options=%d, options=%p)", name, value, num_options, (void *)options)); if (!name || !name[0] || !value || !options || num_options < 0) { @@ -142,8 +141,7 @@ cupsFreeOptions( int i; /* Looping var */ - DEBUG_printf(("cupsFreeOptions(num_options=%d, options=%p)", num_options, - options)); + DEBUG_printf(("cupsFreeOptions(num_options=%d, options=%p)", num_options, (void *)options)); if (num_options <= 0 || !options) return; @@ -171,8 +169,7 @@ cupsGetOption(const char *name, /* I - Name of option */ match; /* Matching index */ - DEBUG_printf(("2cupsGetOption(name=\"%s\", num_options=%d, options=%p)", - name, num_options, options)); + DEBUG_printf(("2cupsGetOption(name=\"%s\", num_options=%d, options=%p)", name, num_options, (void *)options)); if (!name || num_options <= 0 || !options) { @@ -217,8 +214,7 @@ cupsParseOptions( quote; /* Quote character */ - DEBUG_printf(("cupsParseOptions(arg=\"%s\", num_options=%d, options=%p)", - arg, num_options, options)); + DEBUG_printf(("cupsParseOptions(arg=\"%s\", num_options=%d, options=%p)", arg, num_options, (void *)options)); /* * Range check input... @@ -438,8 +434,7 @@ cupsRemoveOption( cups_option_t *option; /* Current option */ - DEBUG_printf(("2cupsRemoveOption(name=\"%s\", num_options=%d, options=%p)", - name, num_options, options)); + DEBUG_printf(("2cupsRemoveOption(name=\"%s\", num_options=%d, options=%p)", name, num_options, (void *)options)); /* * Range check input... @@ -600,9 +595,7 @@ cups_find_option( cups_option_t key; /* Search key */ - DEBUG_printf(("7cups_find_option(name=\"%s\", num_options=%d, options=%p, " - "prev=%d, rdiff=%p)", name, num_options, options, prev, - rdiff)); + DEBUG_printf(("7cups_find_option(name=\"%s\", num_options=%d, options=%p, prev=%d, rdiff=%p)", name, num_options, (void *)options, prev, (void *)rdiff)); #ifdef DEBUG for (left = 0; left < num_options; left ++) diff --git a/cups/pwg-media.c b/cups/pwg-media.c index 09c8c2538..1f3961efa 100644 --- a/cups/pwg-media.c +++ b/cups/pwg-media.c @@ -280,10 +280,7 @@ pwgFormatSizeName(char *keyword, /* I - Keyword buffer */ * Range check input... */ - DEBUG_printf(("pwgFormatSize(keyword=%p, keysize=" CUPS_LLFMT - ", prefix=\"%s\", name=\"%s\", width=%d, length=%d, " - "units=\"%s\")", keyword, CUPS_LLCAST keysize, prefix, name, - width, length, units)); + DEBUG_printf(("pwgFormatSize(keyword=%p, keysize=" CUPS_LLFMT ", prefix=\"%s\", name=\"%s\", width=%d, length=%d, units=\"%s\")", (void *)keyword, CUPS_LLCAST keysize, prefix, name, width, length, units)); if (keyword) *keyword = '\0'; diff --git a/cups/request.c b/cups/request.c index 881bffd5b..1ab0cc3c5 100644 --- a/cups/request.c +++ b/cups/request.c @@ -53,10 +53,7 @@ cupsDoFileRequest(http_t *http, /* I - Connection to server or @code CUPS_HT int infile; /* Input file */ - DEBUG_printf(("cupsDoFileRequest(http=%p, request=%p(%s), resource=\"%s\", " - "filename=\"%s\")", http, request, - request ? ippOpString(request->request.op.operation_id) : "?", - resource, filename)); + DEBUG_printf(("cupsDoFileRequest(http=%p, request=%p(%s), resource=\"%s\", filename=\"%s\")", (void *)http, (void *)request, request ? ippOpString(request->request.op.operation_id) : "?", resource, filename)); if (filename) { @@ -117,10 +114,7 @@ cupsDoIORequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP char buffer[32768]; /* Output buffer */ - DEBUG_printf(("cupsDoIORequest(http=%p, request=%p(%s), resource=\"%s\", " - "infile=%d, outfile=%d)", http, request, - request ? ippOpString(request->request.op.operation_id) : "?", - resource, infile, outfile)); + DEBUG_printf(("cupsDoIORequest(http=%p, request=%p(%s), resource=\"%s\", infile=%d, outfile=%d)", (void *)http, (void *)request, request ? ippOpString(request->request.op.operation_id) : "?", resource, infile, outfile)); /* * Range check input... @@ -304,10 +298,7 @@ cupsDoRequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP_ ipp_t *request, /* I - IPP request */ const char *resource) /* I - HTTP resource for POST */ { - DEBUG_printf(("cupsDoRequest(http=%p, request=%p(%s), resource=\"%s\")", - http, request, - request ? ippOpString(request->request.op.operation_id) : "?", - resource)); + DEBUG_printf(("cupsDoRequest(http=%p, request=%p(%s), resource=\"%s\")", (void *)http, (void *)request, request ? ippOpString(request->request.op.operation_id) : "?", resource)); return (cupsDoIORequest(http, request, resource, -1, -1)); } @@ -333,7 +324,7 @@ cupsGetResponse(http_t *http, /* I - Connection to server or @code CUPS_HTTP ipp_t *response = NULL; /* IPP response */ - DEBUG_printf(("cupsGetResponse(http=%p, resource=\"%s\")", http, resource)); + DEBUG_printf(("cupsGetResponse(http=%p, resource=\"%s\")", (void *)http, resource)); DEBUG_printf(("1cupsGetResponse: http->state=%d", http ? http->state : HTTP_STATE_ERROR)); /* @@ -557,8 +548,7 @@ cupsReadResponseData( * Get the default connection as needed... */ - DEBUG_printf(("cupsReadResponseData(http=%p, buffer=%p, " - "length=" CUPS_LLFMT ")", http, buffer, CUPS_LLCAST length)); + DEBUG_printf(("cupsReadResponseData(http=%p, buffer=%p, length=" CUPS_LLFMT ")", (void *)http, (void *)buffer, CUPS_LLCAST length)); if (!http) { @@ -610,10 +600,7 @@ cupsSendRequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP http_status_t expect; /* Expect: header to use */ - DEBUG_printf(("cupsSendRequest(http=%p, request=%p(%s), resource=\"%s\", " - "length=" CUPS_LLFMT ")", http, request, - request ? ippOpString(request->request.op.operation_id) : "?", - resource, CUPS_LLCAST length)); + DEBUG_printf(("cupsSendRequest(http=%p, request=%p(%s), resource=\"%s\", length=" CUPS_LLFMT ")", (void *)http, (void *)request, request ? ippOpString(request->request.op.operation_id) : "?", resource, CUPS_LLCAST length)); /* * Range check input... @@ -920,8 +907,7 @@ cupsWriteRequestData( * Get the default connection as needed... */ - DEBUG_printf(("cupsWriteRequestData(http=%p, buffer=%p, " - "length=" CUPS_LLFMT ")", http, buffer, CUPS_LLCAST length)); + DEBUG_printf(("cupsWriteRequestData(http=%p, buffer=%p, length=" CUPS_LLFMT ")", (void *)http, (void *)buffer, CUPS_LLCAST length)); if (!http) { diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c index 9f270578b..a14b843aa 100644 --- a/cups/tls-darwin.c +++ b/cups/tls-darwin.c @@ -187,7 +187,7 @@ cleanup: cups_file_t *fp; /* Seed/info file */ - DEBUG_printf(("cupsMakeServerCredentials(path=\"%s\", common_name=\"%s\", num_alt_names=%d, alt_names=%p, expiration_date=%d)", path, common_name, num_alt_names, alt_names, (int)expiration_date)); + DEBUG_printf(("cupsMakeServerCredentials(path=\"%s\", common_name=\"%s\", num_alt_names=%d, alt_names=%p, expiration_date=%d)", path, common_name, num_alt_names, (void *)alt_names, (int)expiration_date)); (void)num_alt_names; (void)alt_names; @@ -364,7 +364,7 @@ httpCopyCredentials( int i; /* Looping var */ - DEBUG_printf(("httpCopyCredentials(http=%p, credentials=%p)", http, credentials)); + DEBUG_printf(("httpCopyCredentials(http=%p, credentials=%p)", (void *)http, (void *)credentials)); if (credentials) *credentials = NULL; @@ -639,7 +639,7 @@ httpCredentialsString( SecCertificateRef secCert; /* Certificate reference */ - DEBUG_printf(("httpCredentialsString(credentials=%p, buffer=%p, bufsize=" CUPS_LLFMT ")", credentials, buffer, CUPS_LLCAST bufsize)); + DEBUG_printf(("httpCredentialsString(credentials=%p, buffer=%p, bufsize=" CUPS_LLFMT ")", (void *)credentials, (void *)buffer, CUPS_LLCAST bufsize)); if (!buffer) return (0); @@ -722,7 +722,7 @@ httpLoadCredentials( CFArrayRef list = NULL; /* Keychain list */ - DEBUG_printf(("httpLoadCredentials(path=\"%s\", credentials=%p, common_name=\"%s\")", path, credentials, common_name)); + DEBUG_printf(("httpLoadCredentials(path=\"%s\", credentials=%p, common_name=\"%s\")", path, (void *)credentials, common_name)); if (!credentials) return (-1); @@ -825,7 +825,7 @@ httpSaveCredentials( CFArrayRef list = NULL; /* Keychain list */ - DEBUG_printf(("httpSaveCredentials(path=\"%s\", credentials=%p, common_name=\"%s\")", path, credentials, common_name)); + DEBUG_printf(("httpSaveCredentials(path=\"%s\", credentials=%p, common_name=\"%s\")", path, (void *)credentials, common_name)); if (!credentials) goto cleanup; @@ -1007,7 +1007,7 @@ _httpTLSStart(http_t *http) /* I - HTTP connection */ http_credential_t *credential; /* Credential data */ - DEBUG_printf(("3_httpTLSStart(http=%p)", http)); + DEBUG_printf(("3_httpTLSStart(http=%p)", (void *)http)); if (tls_options < 0) { @@ -1310,7 +1310,7 @@ _httpTLSStart(http_t *http) /* I - HTTP connection */ DEBUG_printf(("4_httpTLSStart: SSLSetCertificate, error=%d", (int)error)); } - DEBUG_printf(("4_httpTLSStart: tls_credentials=%p", http->tls_credentials)); + DEBUG_printf(("4_httpTLSStart: tls_credentials=%p", (void *)http->tls_credentials)); /* * Let the server know which hostname/domain we are trying to connect to @@ -1532,7 +1532,7 @@ _httpTLSWrite(http_t *http, /* I - HTTP connection */ size_t processed; /* Number of bytes processed */ - DEBUG_printf(("2_httpTLSWrite(http=%p, buf=%p, len=%d)", http, buf, len)); + DEBUG_printf(("2_httpTLSWrite(http=%p, buf=%p, len=%d)", (void *)http, (void *)buf, len)); error = SSLWrite(http->tls, buf, (size_t)len, &processed); @@ -1764,7 +1764,7 @@ http_cdsa_set_credentials(http_t *http) /* I - HTTP connection */ /* TLS credentials */ - DEBUG_printf(("7http_tls_set_credentials(%p)", http)); + DEBUG_printf(("7http_tls_set_credentials(%p)", (void *)http)); /* * Prefer connection specific credentials... diff --git a/cups/transcode.c b/cups/transcode.c index 11d4f7f7c..e0342ecdb 100644 --- a/cups/transcode.c +++ b/cups/transcode.c @@ -90,8 +90,7 @@ cupsCharsetToUTF8( * Check for valid arguments... */ - DEBUG_printf(("2cupsCharsetToUTF8(dest=%p, src=\"%s\", maxout=%d, encoding=%d)", - dest, src, maxout, encoding)); + DEBUG_printf(("2cupsCharsetToUTF8(dest=%p, src=\"%s\", maxout=%d, encoding=%d)", (void *)dest, src, maxout, encoding)); if (!dest || !src || maxout < 1) { @@ -354,8 +353,7 @@ cupsUTF8ToUTF32( * Check for valid arguments and clear output... */ - DEBUG_printf(("2cupsUTF8ToUTF32(dest=%p, src=\"%s\", maxout=%d)", dest, - src, maxout)); + DEBUG_printf(("2cupsUTF8ToUTF32(dest=%p, src=\"%s\", maxout=%d)", (void *)dest, src, maxout)); if (dest) *dest = 0; @@ -575,8 +573,7 @@ cupsUTF32ToUTF8( * Check for valid arguments and clear output... */ - DEBUG_printf(("2cupsUTF32ToUTF8(dest=%p, src=%p, maxout=%d)", dest, src, - maxout)); + DEBUG_printf(("2cupsUTF32ToUTF8(dest=%p, src=%p, maxout=%d)", (void *)dest, (void *)src, maxout)); if (dest) *dest = '\0'; diff --git a/cups/usersys.c b/cups/usersys.c index 9b3c219b7..7c4c189b1 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -1265,7 +1265,7 @@ cups_set_ssl_options( cc->ssl_options = options; - DEBUG_printf(("4cups_set_ssl_options(cc=%p, value=\"%s\") options=%x", cc, value, options)); + DEBUG_printf(("4cups_set_ssl_options(cc=%p, value=\"%s\") options=%x", (void *)cc, value, options)); } #endif /* HAVE_SSL */ diff --git a/cups/util.c b/cups/util.c index 48b5bfa55..42cf176eb 100644 --- a/cups/util.c +++ b/cups/util.c @@ -167,9 +167,7 @@ cupsCreateJob( int job_id = 0; /* job-id value */ - DEBUG_printf(("cupsCreateJob(http=%p, name=\"%s\", title=\"%s\", " - "num_options=%d, options=%p)", - http, name, title, num_options, options)); + DEBUG_printf(("cupsCreateJob(http=%p, name=\"%s\", title=\"%s\", num_options=%d, options=%p)", (void *)http, name, title, num_options, (void *)options)); /* * Range check input... @@ -711,9 +709,7 @@ cupsPrintFile(const char *name, /* I - Destination name */ int num_options,/* I - Number of options */ cups_option_t *options) /* I - Options */ { - DEBUG_printf(("cupsPrintFile(name=\"%s\", filename=\"%s\", " - "title=\"%s\", num_options=%d, options=%p)", - name, filename, title, num_options, options)); + DEBUG_printf(("cupsPrintFile(name=\"%s\", filename=\"%s\", title=\"%s\", num_options=%d, options=%p)", name, filename, title, num_options, (void *)options)); return (cupsPrintFiles2(CUPS_HTTP_DEFAULT, name, 1, &filename, title, num_options, options)); @@ -736,9 +732,7 @@ cupsPrintFile2( int num_options, /* I - Number of options */ cups_option_t *options) /* I - Options */ { - DEBUG_printf(("cupsPrintFile2(http=%p, name=\"%s\", filename=\"%s\", " - "title=\"%s\", num_options=%d, options=%p)", - http, name, filename, title, num_options, options)); + DEBUG_printf(("cupsPrintFile2(http=%p, name=\"%s\", filename=\"%s\", title=\"%s\", num_options=%d, options=%p)", (void *)http, name, filename, title, num_options, (void *)options)); return (cupsPrintFiles2(http, name, 1, &filename, title, num_options, options)); @@ -759,9 +753,7 @@ cupsPrintFiles( int num_options, /* I - Number of options */ cups_option_t *options) /* I - Options */ { - DEBUG_printf(("cupsPrintFiles(name=\"%s\", num_files=%d, " - "files=%p, title=\"%s\", num_options=%d, options=%p)", - name, num_files, files, title, num_options, options)); + DEBUG_printf(("cupsPrintFiles(name=\"%s\", num_files=%d, files=%p, title=\"%s\", num_options=%d, options=%p)", name, num_files, (void *)files, title, num_options, (void *)options)); /* * Print the file(s)... @@ -802,9 +794,7 @@ cupsPrintFiles2( char *cancel_message; /* Error message to preserve */ - DEBUG_printf(("cupsPrintFiles2(http=%p, name=\"%s\", num_files=%d, " - "files=%p, title=\"%s\", num_options=%d, options=%p)", - http, name, num_files, files, title, num_options, options)); + DEBUG_printf(("cupsPrintFiles2(http=%p, name=\"%s\", num_files=%d, files=%p, title=\"%s\", num_options=%d, options=%p)", (void *)http, name, num_files, (void *)files, title, num_options, (void *)options)); /* * Range check input... diff --git a/filter/error.c b/filter/error.c index 39cd10391..96be93d11 100644 --- a/filter/error.c +++ b/filter/error.c @@ -209,7 +209,7 @@ get_error_buffer(void) buf = calloc(1, sizeof(_cups_raster_error_t)); pthread_setspecific(raster_key, buf); - DEBUG_printf(("4get_error_buffer: buf=%p", buf)); + DEBUG_printf(("4get_error_buffer: buf=%p", (void *)buf)); } /* diff --git a/filter/raster.c b/filter/raster.c index 302f72cd5..e41358270 100644 --- a/filter/raster.c +++ b/filter/raster.c @@ -530,7 +530,7 @@ cupsRasterReadHeader2( * Get the raster header... */ - DEBUG_printf(("cupsRasterReadHeader2(r=%p, h=%p)", r, h)); + DEBUG_printf(("cupsRasterReadHeader2(r=%p, h=%p)", (void *)r, (void *)h)); if (!cups_raster_read_header(r)) { @@ -570,7 +570,7 @@ cupsRasterReadPixels(cups_raster_t *r, /* I - Raster stream */ unsigned count; /* Repetition count */ - DEBUG_printf(("cupsRasterReadPixels(r=%p, p=%p, len=%u)", r, p, len)); + DEBUG_printf(("cupsRasterReadPixels(r=%p, p=%p, len=%u)", (void *)r, (void *)p, len)); if (r == NULL || r->mode != CUPS_RASTER_READ || r->remaining == 0 || r->header.cupsBytesPerLine == 0) @@ -1010,8 +1010,7 @@ cupsRasterWritePixels(cups_raster_t *r, /* I - Raster stream */ unsigned remaining; /* Bytes remaining */ - DEBUG_printf(("cupsRasterWritePixels(r=%p, p=%p, len=%u), remaining=%u\n", - r, p, len, r->remaining)); + DEBUG_printf(("cupsRasterWritePixels(r=%p, p=%p, len=%u), remaining=%u", (void *)r, (void *)p, len, r->remaining)); if (r == NULL || r->mode == CUPS_RASTER_READ || r->remaining == 0) return (0); @@ -1197,7 +1196,7 @@ cups_raster_read_header( size_t len; /* Length for read/swap */ - DEBUG_printf(("3cups_raster_read_header(r=%p), r->mode=%d", r, r ? r->mode : 0)); + DEBUG_printf(("3cups_raster_read_header(r=%p), r->mode=%d", (void *)r, r ? r->mode : 0)); if (r == NULL || r->mode != CUPS_RASTER_READ) return (0); @@ -1279,7 +1278,7 @@ cups_raster_io(cups_raster_t *r, /* I - Raster stream */ total; /* Total bytes read/written */ - DEBUG_printf(("5cups_raster_io(r=%p, buf=%p, bytes=" CUPS_LLFMT ")", r, buf, CUPS_LLCAST bytes)); + DEBUG_printf(("5cups_raster_io(r=%p, buf=%p, bytes=" CUPS_LLFMT ")", (void *)r, (void *)buf, CUPS_LLCAST bytes)); for (total = 0; total < (ssize_t)bytes; total += count, buf += count) { @@ -1322,7 +1321,7 @@ cups_raster_read(cups_raster_t *r, /* I - Raster stream */ total; /* Total bytes read */ - DEBUG_printf(("5cups_raster_read(r=%p, buf=%p, bytes=" CUPS_LLFMT ")\n", r, buf, CUPS_LLCAST bytes)); + DEBUG_printf(("5cups_raster_read(r=%p, buf=%p, bytes=" CUPS_LLFMT ")", (void *)r, (void *)buf, CUPS_LLCAST bytes)); if (!r->compressed) return (cups_raster_io(r, buf, bytes)); @@ -1366,7 +1365,7 @@ cups_raster_read(cups_raster_t *r, /* I - Raster stream */ { count = (ssize_t)bytes - total; - DEBUG_printf(("6cups_raster_read: count=" CUPS_LLFMT ", remaining=" CUPS_LLFMT ", buf=%p, bufptr=%p, bufend=%p", CUPS_LLCAST count, CUPS_LLCAST remaining, buf, r->bufptr, r->bufend)); + DEBUG_printf(("6cups_raster_read: count=" CUPS_LLFMT ", remaining=" CUPS_LLFMT ", buf=%p, bufptr=%p, bufend=%p", CUPS_LLCAST count, CUPS_LLCAST remaining, (void *)buf, (void *)r->bufptr, (void *)r->bufend)); if (remaining == 0) { @@ -1616,7 +1615,7 @@ cups_raster_write( count; /* Count */ - DEBUG_printf(("3cups_raster_write(r=%p, pixels=%p)\n", r, pixels)); + DEBUG_printf(("3cups_raster_write(r=%p, pixels=%p)", (void *)r, (void *)pixels)); /* * Allocate a write buffer as needed... -- 2.39.2