diff options
Diffstat (limited to 'content')
-rw-r--r-- | content/fetchers/data.c | 7 | ||||
-rw-r--r-- | content/fetchers/file.c | 21 | ||||
-rw-r--r-- | content/fetchers/resource.c | 20 | ||||
-rw-r--r-- | content/llcache.c | 13 |
4 files changed, 37 insertions, 24 deletions
diff --git a/content/fetchers/data.c b/content/fetchers/data.c index 00494ccc7..6c18911e2 100644 --- a/content/fetchers/data.c +++ b/content/fetchers/data.c @@ -263,7 +263,8 @@ static void fetch_data_poll(lwc_string *scheme) char header[64]; fetch_set_http_code(c->parent_fetch, 200); - LOG("setting data: MIME type to %s, length to %zd", c->mimetype, c->datalen); + LOG("setting data: MIME type to %s, length to %" PRIsizet, + c->mimetype, c->datalen); /* Any callback can result in the fetch being aborted. * Therefore, we _must_ check for this after _every_ * call to fetch_data_send_callback(). @@ -277,8 +278,8 @@ static void fetch_data_poll(lwc_string *scheme) if (c->aborted == false) { snprintf(header, sizeof header, - "Content-Length: %"SSIZET_FMT, - c->datalen); + "Content-Length: %" PRIsizet, + c->datalen); msg.type = FETCH_HEADER; msg.data.header_or_data.buf = (const uint8_t *) header; diff --git a/content/fetchers/file.c b/content/fetchers/file.c index d42e92a5b..c2f8bed2f 100644 --- a/content/fetchers/file.c +++ b/content/fetchers/file.c @@ -313,18 +313,21 @@ static void fetch_file_process_plain(struct fetch_file_context *ctx, /* content type */ if (fetch_file_send_header(ctx, "Content-Type: %s", - guit->fetch->filetype(ctx->path))) + guit->fetch->filetype(ctx->path))) { goto fetch_file_process_aborted; + } /* content length */ - if (fetch_file_send_header(ctx, "Content-Length: %"SSIZET_FMT, fdstat->st_size)) + if (fetch_file_send_header(ctx, "Content-Length: %" PRIsizet, + fdstat->st_size)) { goto fetch_file_process_aborted; + } /* create etag */ if (fetch_file_send_header(ctx, "ETag: \"%10" PRId64 "\"", - (int64_t) fdstat->st_mtime)) + (int64_t) fdstat->st_mtime)) { goto fetch_file_process_aborted; - + } msg.type = FETCH_DATA; msg.data.header_or_data.buf = (const uint8_t *) buf; @@ -393,17 +396,21 @@ fetch_file_process_aborted: /* content type */ if (fetch_file_send_header(ctx, "Content-Type: %s", - guit->fetch->filetype(ctx->path))) + guit->fetch->filetype(ctx->path))) { goto fetch_file_process_aborted; + } /* content length */ - if (fetch_file_send_header(ctx, "Content-Length: %"SSIZET_FMT, fdstat->st_size)) + if (fetch_file_send_header(ctx, "Content-Length: %" PRIsizet, + fdstat->st_size)) { goto fetch_file_process_aborted; + } /* create etag */ if (fetch_file_send_header(ctx, "ETag: \"%10" PRId64 "\"", - (int64_t) fdstat->st_mtime)) + (int64_t) fdstat->st_mtime)) { goto fetch_file_process_aborted; + } /* main data loop */ while (tot_read < fdstat->st_size) { diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c index 6472dc506..7a55b54ed 100644 --- a/content/fetchers/resource.c +++ b/content/fetchers/resource.c @@ -16,7 +16,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* resource: URL handling. Based on the data fetcher by Rob Kendrick */ +/** + * \file + * resource scheme URL handling. Based on the data fetcher by Rob Kendrick + */ #include <sys/types.h> #include <sys/stat.h> @@ -187,20 +190,21 @@ static bool fetch_resource_data_handler(struct fetch_resource_context *ctx) /* content type */ if (fetch_resource_send_header(ctx, "Content-Type: %s", - guit->fetch->filetype(lwc_string_data(ctx->entry->path)))) + guit->fetch->filetype(lwc_string_data(ctx->entry->path)))) { goto fetch_resource_data_aborted; + } /* content length */ - if (fetch_resource_send_header(ctx, - "Content-Length: %"SSIZET_FMT, - ctx->entry->data_len)) + if (fetch_resource_send_header(ctx, "Content-Length: %" PRIsizet, + ctx->entry->data_len)) { goto fetch_resource_data_aborted; + } /* create etag */ - if (fetch_resource_send_header(ctx, - "ETag: \"%10" PRId64 "\"", - (int64_t) DIRECT_ETAG_VALUE)) + if (fetch_resource_send_header(ctx, "ETag: \"%10" PRId64 "\"", + (int64_t) DIRECT_ETAG_VALUE)) { goto fetch_resource_data_aborted; + } msg.type = FETCH_DATA; diff --git a/content/llcache.c b/content/llcache.c index 9745734f4..6e8b4017f 100644 --- a/content/llcache.c +++ b/content/llcache.c @@ -1239,7 +1239,7 @@ llcache_serialise_metadata(llcache_object *object, datasize -= use; /* object size */ - use = snprintf(op, datasize, "%zu", object->source_len); + use = snprintf(op, datasize, "%" PRIsizet, object->source_len); if (use < 0) { goto operror; } @@ -1274,7 +1274,7 @@ llcache_serialise_metadata(llcache_object *object, datasize -= use; /* number of headers */ - use = snprintf(op, datasize, "%zu", object->num_headers); + use = snprintf(op, datasize, "%" PRIsizet, object->num_headers); if (use < 0) { goto operror; } @@ -1386,7 +1386,8 @@ llcache_process_metadata(llcache_object *object) * by simply skipping caching of this object. */ - LOG("Got metadata for %s instead of %s", nsurl_access(metadataurl), nsurl_access(object->url)); + LOG("Got metadata for %s instead of %s", + nsurl_access(metadataurl), nsurl_access(object->url)); nsurl_unref(metadataurl); @@ -1402,7 +1403,7 @@ llcache_process_metadata(llcache_object *object) ln += lnsize + 1; lnsize = strlen(ln); - if ((lnsize < 1) || (sscanf(ln, "%zu", &source_length) != 1)) { + if ((lnsize < 1) || (sscanf(ln, "%" PRIsizet, &source_length) != 1)) { res = NSERROR_INVALID; goto format_error; } @@ -1443,7 +1444,7 @@ llcache_process_metadata(llcache_object *object) ln += lnsize + 1; lnsize = strlen(ln); - if ((lnsize < 1) || (sscanf(ln, "%zu", &num_headers) != 1)) { + if ((lnsize < 1) || (sscanf(ln, "%" PRIsizet, &num_headers) != 1)) { res = NSERROR_INVALID; goto format_error; } @@ -2461,7 +2462,7 @@ static void llcache_persist_slowcheck(void *p) total_bandwidth = (llcache->total_written * 1000) / llcache->total_elapsed; if (total_bandwidth < llcache->minimum_bandwidth) { - LOG("Current bandwidth %"PRIu64" less than minimum %zd", + LOG("Current bandwidth %" PRIu64 " less than minimum %" PRIsizet, total_bandwidth, llcache->minimum_bandwidth); guit->llcache->finalise(); } |