projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace zu with PRIu64 and llu with new macro, PRIsz, which will make it easier to...
[collectd.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index
375da84
..
9b8ef53
100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-753,7
+753,7
@@
static int parse_part_values(void **ret_buffer, size_t *ret_buffer_len,
if (buffer_len < 15) {
NOTICE("network plugin: packet is too short: "
if (buffer_len < 15) {
NOTICE("network plugin: packet is too short: "
- "buffer_len = %
zu"
,
+ "buffer_len = %
" PRIsz
,
buffer_len);
return -1;
}
buffer_len);
return -1;
}
@@
-777,8
+777,8
@@
static int parse_part_values(void **ret_buffer, size_t *ret_buffer_len,
if (buffer_len < exp_size) {
WARNING("network plugin: parse_part_values: "
"Packet too short: "
if (buffer_len < exp_size) {
WARNING("network plugin: parse_part_values: "
"Packet too short: "
- "Chunk of size %
zu
expected, "
- "but buffer has only %
zu
bytes left.",
+ "Chunk of size %
" PRIsz "
expected, "
+ "but buffer has only %
" PRIsz "
bytes left.",
exp_size, buffer_len);
return -1;
}
exp_size, buffer_len);
return -1;
}
@@
-857,8
+857,8
@@
static int parse_part_number(void **ret_buffer, size_t *ret_buffer_len,
if (buffer_len < exp_size) {
WARNING("network plugin: parse_part_number: "
"Packet too short: "
if (buffer_len < exp_size) {
WARNING("network plugin: parse_part_number: "
"Packet too short: "
- "Chunk of size %
zu
expected, "
- "but buffer has only %
zu
bytes left.",
+ "Chunk of size %
" PRIsz "
expected, "
+ "but buffer has only %
" PRIsz "
bytes left.",
exp_size, buffer_len);
return -1;
}
exp_size, buffer_len);
return -1;
}
@@
-898,8
+898,8
@@
static int parse_part_string(void **ret_buffer, size_t *ret_buffer_len,
if (buffer_len < header_size) {
WARNING("network plugin: parse_part_string: "
"Packet too short: "
if (buffer_len < header_size) {
WARNING("network plugin: parse_part_string: "
"Packet too short: "
- "Chunk of at least size %
zu
expected, "
- "but buffer has only %
zu
bytes left.",
+ "Chunk of at least size %
" PRIsz "
expected, "
+ "but buffer has only %
" PRIsz "
bytes left.",
header_size, buffer_len);
return -1;
}
header_size, buffer_len);
return -1;
}
@@
-918,7
+918,7
@@
static int parse_part_string(void **ret_buffer, size_t *ret_buffer_len,
WARNING("network plugin: parse_part_string: "
"Packet too big: "
"Chunk of size %" PRIu16 " received, "
WARNING("network plugin: parse_part_string: "
"Packet too big: "
"Chunk of size %" PRIu16 " received, "
- "but buffer has only %
zu
bytes left.",
+ "but buffer has only %
" PRIsz "
bytes left.",
pkg_length, buffer_len);
return -1;
}
pkg_length, buffer_len);
return -1;
}
@@
-939,9
+939,9
@@
static int parse_part_string(void **ret_buffer, size_t *ret_buffer_len,
if (output_len < payload_size) {
WARNING("network plugin: parse_part_string: "
"Buffer too small: "
if (output_len < payload_size) {
WARNING("network plugin: parse_part_string: "
"Buffer too small: "
- "Output buffer holds %
zu
bytes, "
+ "Output buffer holds %
" PRIsz "
bytes, "
"which is too small to hold the received "
"which is too small to hold the received "
- "%
zu
byte string.",
+ "%
" PRIsz "
byte string.",
output_len, payload_size);
return -1;
}
output_len, payload_size);
return -1;
}
@@
-1230,9
+1230,9
@@
static int parse_part_encr_aes256(sockent_t *se, /* {{{ */
part_size - buffer_offset,
/* in = */ NULL, /* in len = */ 0);
if (err != 0) {
part_size - buffer_offset,
/* in = */ NULL, /* in len = */ 0);
if (err != 0) {
- sfree(pea.username);
ERROR("network plugin: gcry_cipher_decrypt returned: %s. Username: %s",
gcry_strerror(err), pea.username);
ERROR("network plugin: gcry_cipher_decrypt returned: %s. Username: %s",
gcry_strerror(err), pea.username);
+ sfree(pea.username);
return -1;
}
return -1;
}
@@
-1254,8
+1254,6
@@
static int parse_part_encr_aes256(sockent_t *se, /* {{{ */
parse_packet(se, buffer + buffer_offset, payload_len, flags | PP_ENCRYPTED,
pea.username);
parse_packet(se, buffer + buffer_offset, payload_len, flags | PP_ENCRYPTED,
pea.username);
- /* XXX: Free pea.username?!? */
-
/* Update return values */
*ret_buffer = buffer + part_size;
*ret_buffer_len = buffer_len - part_size;
/* Update return values */
*ret_buffer = buffer + part_size;
*ret_buffer_len = buffer_len - part_size;
@@
-2482,7
+2480,7
@@
static void network_send_buffer_encrypted(sockent_t *se, /* {{{ */
assert(buffer_size <= sizeof(buffer));
DEBUG("network plugin: network_send_buffer_encrypted: "
assert(buffer_size <= sizeof(buffer));
DEBUG("network plugin: network_send_buffer_encrypted: "
- "buffer_size = %
zu
;",
+ "buffer_size = %
" PRIsz "
;",
buffer_size);
pea.head.length = htons(
buffer_size);
pea.head.length = htons(
@@
-2533,7
+2531,8
@@
static void network_send_buffer_encrypted(sockent_t *se, /* {{{ */
static void network_send_buffer(char *buffer, size_t buffer_len) /* {{{ */
{
static void network_send_buffer(char *buffer, size_t buffer_len) /* {{{ */
{
- DEBUG("network plugin: network_send_buffer: buffer_len = %zu", buffer_len);
+ DEBUG("network plugin: network_send_buffer: buffer_len = %" PRIsz,
+ buffer_len);
for (sockent_t *se = sending_sockets; se != NULL; se = se->next) {
#if HAVE_GCRYPT_H
for (sockent_t *se = sending_sockets; se != NULL; se = se->next) {
#if HAVE_GCRYPT_H