fix for format string signess
Costa Tsaousis (ktsaou) committed
Jun 17, 2016 at 01:53 UTC
2baf07ed793086779db1701ab891116b57033250
3 files changed
+20
-20
src/unit_test.c
+1
-1
@@ -760,7 +760,7 @@ int unit_test(long delay, long shift)
760
761
unsigned long oincrement = increment;
762
increment = increment * st->update_every * 1000000 / delay;
763
- fprintf(stderr, "\n\nORIGINAL INCREMENT: %lu, INCREMENT %lu, DELAY %lu, SHIFT %lu\n", oincrement * 10, increment * 10, delay, shift);
763
+ fprintf(stderr, "\n\nORIGINAL INCREMENT: %lu, INCREMENT %ld, DELAY %ld, SHIFT %ld\n", oincrement * 10, increment * 10, delay, shift);
764
765
int ret = 0;
766
storage_number sn;
src/web_buffer.c
+3
-3
@@ -29,7 +29,7 @@ static inline void buffer_overflow_init(BUFFER *b)
29
static inline void _buffer_overflow_check(BUFFER *b, const char *file, const char *function, const unsigned long line)
30
{
31
if(b->len > b->size) {
32
- error("BUFFER: length %ld is above size %ld, at line %lu, at function %s() of file '%s'.", b->len, b->size, line, function, file);
32
+ error("BUFFER: length %zu is above size %zu, at line %lu, at function %s() of file '%s'.", b->len, b->size, line, function, file);
33
b->len = b->size;
34
}
35
@@ -93,7 +93,7 @@ void buffer_strcat(BUFFER *wb, const char *txt)
93
buffer_overflow_check(wb);
94
95
if(*txt) {
96
- debug(D_WEB_BUFFER, "strcat(): increasing web_buffer at position %ld, size = %ld\n", wb->len, wb->size);
96
+ debug(D_WEB_BUFFER, "strcat(): increasing web_buffer at position %zu, size = %zu\n", wb->len, wb->size);
97
len = strlen(txt);
98
buffer_increase(wb, len);
99
buffer_strcat(wb, txt);
@@ -160,7 +160,7 @@ void buffer_sprintf(BUFFER *wb, const char *fmt, ...)
160
// if it does.
161
buffer_overflow_check(wb);
162
163
- debug(D_WEB_BUFFER, "web_buffer_sprintf(): increasing web_buffer at position %ld, size = %ld\n", wb->len, wb->size);
163
+ debug(D_WEB_BUFFER, "web_buffer_sprintf(): increasing web_buffer at position %zu, size = %zu\n", wb->len, wb->size);
164
buffer_need_bytes(wb, len + WEB_DATA_LENGTH_INCREASE_STEP);
165
166
va_start(args, fmt);
src/web_client.c
+16
-16
@@ -404,14 +404,14 @@ int mysendfile(struct web_client *w, char *filename)
404
405
// check if the file is owned by expected user
406
if(stat.st_uid != web_files_uid()) {
407
- error("%llu: File '%s' is owned by user %d (expected user %d). Access Denied.", w->id, webfilename, stat.st_uid, web_files_uid());
407
+ error("%llu: File '%s' is owned by user %u (expected user %u). Access Denied.", w->id, webfilename, stat.st_uid, web_files_uid());
408
buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", webfilename);
409
return 403;
410
}
411
412
// check if the file is owned by expected group
413
if(stat.st_gid != web_files_gid()) {
414
- error("%llu: File '%s' is owned by group %d (expected group %d). Access Denied.", w->id, webfilename, stat.st_gid, web_files_gid());
414
+ error("%llu: File '%s' is owned by group %u (expected group %u). Access Denied.", w->id, webfilename, stat.st_gid, web_files_gid());
415
buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", webfilename);
416
return 403;
417
}
@@ -813,7 +813,7 @@ int web_client_api_v1_badge(struct web_client *w, char *url) {
813
units = st->units;
814
}
815
816
- debug(D_WEB_CLIENT, "%llu: API command 'badge.svg' for chart '%s', dimensions '%s', after '%lld', before '%lld', points '%d', group '%u', options '0x%08x'"
816
+ debug(D_WEB_CLIENT, "%llu: API command 'badge.svg' for chart '%s', dimensions '%s', after '%lld', before '%lld', points '%d', group '%d', options '0x%08x'"
817
, w->id
818
, chart
819
, (dimensions)?buffer_tostring(dimensions):""
@@ -968,7 +968,7 @@ int web_client_api_request_v1_data(struct web_client *w, char *url)
968
long long after = (after_str && *after_str) ?atol(after_str):0;
969
int points = (points_str && *points_str)?atoi(points_str):0;
970
971
- debug(D_WEB_CLIENT, "%llu: API command 'data' for chart '%s', dimensions '%s', after '%lld', before '%lld', points '%d', group '%u', format '%u', options '0x%08x'"
971
+ debug(D_WEB_CLIENT, "%llu: API command 'data' for chart '%s', dimensions '%s', after '%lld', before '%lld', points '%d', group '%d', format '%u', options '0x%08x'"
972
, w->id
973
, chart
974
, (dimensions)?buffer_tostring(dimensions):""
@@ -994,7 +994,7 @@ int web_client_api_request_v1_data(struct web_client *w, char *url)
994
);
995
996
buffer_sprintf(w->response.data,
997
- "%s({version:'%s',reqId:'%s',status:'ok',sig:'%lu',table:",
997
+ "%s({version:'%s',reqId:'%s',status:'ok',sig:'%ld',table:",
998
responseHandler, google_version, google_reqId, st->last_updated.tv_sec);
999
}
1000
else if(format == DATASOURCE_JSONP) {
@@ -1449,11 +1449,11 @@ int web_client_api_old_data_request(struct web_client *w, char *url, int datasou
1449
1450
if(datasource_type == DATASOURCE_DATATABLE_JSONP) {
1451
buffer_sprintf(w->response.data,
1452
- "%s({version:'%s',reqId:'%s',status:'ok',sig:'%lu',table:",
1452
+ "%s({version:'%s',reqId:'%s',status:'ok',sig:'%ld',table:",
1453
google_responseHandler, google_version, google_reqId, st->last_updated.tv_sec);
1454
}
1455
1456
- debug(D_WEB_CLIENT_ACCESS, "%llu: Sending RRD data '%s' (id %s, %d lines, %d group, %d group_method, %lu after, %lu before).",
1456
+ debug(D_WEB_CLIENT_ACCESS, "%llu: Sending RRD data '%s' (id %s, %d lines, %d group, %d group_method, %ld after, %ld before).",
1457
w->id, st->name, st->id, lines, group_count, group_method, after, before);
1458
1459
time_t timestamp_in_data = rrd_stats_json(datasource_type, st, w->response.data, lines, group_count, group_method, (unsigned long)after, (unsigned long)before, nonzero);
@@ -1758,11 +1758,11 @@ void web_client_process(struct web_client *w) {
1758
if(w->response.data->len > TOO_BIG_REQUEST) {
1759
strcpy(w->last_url, "too big request");
1760
1761
- debug(D_WEB_CLIENT_ACCESS, "%llu: Received request is too big (%zd bytes).", w->id, w->response.data->len);
1761
+ debug(D_WEB_CLIENT_ACCESS, "%llu: Received request is too big (%zu bytes).", w->id, w->response.data->len);
1762
1763
code = 400;
1764
buffer_flush(w->response.data);
1765
- buffer_sprintf(w->response.data, "Received request is too big (%zd bytes).\r\n", w->response.data->len);
1765
+ buffer_sprintf(w->response.data, "Received request is too big (%zu bytes).\r\n", w->response.data->len);
1766
}
1767
else {
1768
// wait for more data
@@ -2032,7 +2032,7 @@ void web_client_process(struct web_client *w) {
2032
// if we know the content length, put it
2033
if(!w->response.zoutput && (w->response.data->len || w->response.rlen))
2034
buffer_sprintf(w->response.header_output,
2035
- "Content-Length: %ld\r\n"
2035
+ "Content-Length: %zu\r\n"
2036
, w->response.data->len? w->response.data->len: w->response.rlen
2037
);
2038
else if(!w->response.zoutput)
@@ -2190,7 +2190,7 @@ ssize_t web_client_send_deflate(struct web_client *w)
2190
// when using compression,
2191
// w->response.sent is the amount of bytes passed through compression
2192
2193
- debug(D_DEFLATE, "%llu: web_client_send_deflate(): w->response.data->len = %zu, w->response.sent = %zu, w->response.zhave = %zu, w->response.zsent = %zu, w->response.zstream.avail_in = %d, w->response.zstream.avail_out = %d, w->response.zstream.total_in = %lu, w->response.zstream.total_out = %lu.",
2193
+ debug(D_DEFLATE, "%llu: web_client_send_deflate(): w->response.data->len = %zu, w->response.sent = %zu, w->response.zhave = %zu, w->response.zsent = %zu, w->response.zstream.avail_in = %u, w->response.zstream.avail_out = %u, w->response.zstream.total_in = %lu, w->response.zstream.total_out = %lu.",
2194
w->id, w->response.data->len, w->response.sent, w->response.zhave, w->response.zsent, w->response.zstream.avail_in, w->response.zstream.avail_out, w->response.zstream.total_in, w->response.zstream.total_out);
2195
2196
if(w->response.data->len - w->response.sent == 0 && w->response.zstream.avail_in == 0 && w->response.zhave == w->response.zsent && w->response.zstream.avail_out != 0) {
@@ -2212,7 +2212,7 @@ ssize_t web_client_send_deflate(struct web_client *w)
2212
}
2213
2214
if(unlikely(!w->keepalive)) {
2215
- debug(D_WEB_CLIENT, "%llu: Closing (keep-alive is not enabled). %ld bytes sent.", w->id, w->response.sent);
2215
+ debug(D_WEB_CLIENT, "%llu: Closing (keep-alive is not enabled). %zu bytes sent.", w->id, w->response.sent);
2216
WEB_CLIENT_IS_DEAD(w);
2217
return t;
2218
}
@@ -2283,7 +2283,7 @@ ssize_t web_client_send_deflate(struct web_client *w)
2283
w->stats_sent_bytes += len;
2284
w->response.zsent += len;
2285
len += t;
2286
- debug(D_WEB_CLIENT, "%llu: Sent %zu bytes.", w->id, len);
2286
+ debug(D_WEB_CLIENT, "%llu: Sent %zd bytes.", w->id, len);
2287
}
2288
else if(len == 0) {
2289
debug(D_WEB_CLIENT, "%llu: Did not send any bytes to the client (zhave = %zu, zsent = %zu, need to send = %zu).",
@@ -2324,7 +2324,7 @@ ssize_t web_client_send(struct web_client *w) {
2324
}
2325
2326
if(unlikely(!w->keepalive)) {
2327
- debug(D_WEB_CLIENT, "%llu: Closing (keep-alive is not enabled). %ld bytes sent.", w->id, w->response.sent);
2327
+ debug(D_WEB_CLIENT, "%llu: Closing (keep-alive is not enabled). %zu bytes sent.", w->id, w->response.sent);
2328
WEB_CLIENT_IS_DEAD(w);
2329
return 0;
2330
}
@@ -2338,7 +2338,7 @@ ssize_t web_client_send(struct web_client *w) {
2338
if(likely(bytes > 0)) {
2339
w->stats_sent_bytes += bytes;
2340
w->response.sent += bytes;
2341
- debug(D_WEB_CLIENT, "%llu: Sent %zu bytes.", w->id, bytes);
2341
+ debug(D_WEB_CLIENT, "%llu: Sent %zd bytes.", w->id, bytes);
2342
}
2343
else if(likely(bytes == 0)) {
2344
debug(D_WEB_CLIENT, "%llu: Did not send any bytes to the client.", w->id);
@@ -2373,7 +2373,7 @@ ssize_t web_client_receive(struct web_client *w)
2373
w->response.data->len += bytes;
2374
w->response.data->buffer[w->response.data->len] = '\0';
2375
2376
- debug(D_WEB_CLIENT, "%llu: Received %zu bytes.", w->id, bytes);
2376
+ debug(D_WEB_CLIENT, "%llu: Received %zd bytes.", w->id, bytes);
2377
debug(D_WEB_DATA, "%llu: Received data: '%s'.", w->id, &w->response.data->buffer[old]);
2378
2379
if(w->mode == WEB_CLIENT_MODE_FILECOPY) {