X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetwork.c;h=fcacd38a2d42aec864897aeb305f6bfd536f80e2;hb=d4294a503a61cd526575f9a0381d929df081c58a;hp=0a03d72efa7085775243852986e61a76200030a6;hpb=0b7cd83a5e6bac068ea83a88a5ddcfb07c09fbec;p=collectd.git diff --git a/src/network.c b/src/network.c index 0a03d72e..fcacd38a 100644 --- 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: " - "buffer_len = %zu", + "buffer_len = %" PRIsz, 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: " - "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; } @@ -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: " - "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; } @@ -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: " - "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; } @@ -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, " - "but buffer has only %zu bytes left.", + "but buffer has only %" PRIsz " bytes left.", 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: " - "Output buffer holds %zu bytes, " + "Output buffer holds %" PRIsz " bytes, " "which is too small to hold the received " - "%zu byte string.", + "%" PRIsz " byte string.", output_len, payload_size); return -1; } @@ -2447,7 +2447,7 @@ static void network_send_buffer_encrypted(sockent_t *se, /* {{{ */ assert(buffer_size <= sizeof(buffer)); DEBUG("network plugin: network_send_buffer_encrypted: " - "buffer_size = %zu;", + "buffer_size = %" PRIsz ";", buffer_size); pea.head.length = htons( @@ -2498,7 +2498,8 @@ static void network_send_buffer_encrypted(sockent_t *se, /* {{{ */ 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 @@ -2617,10 +2618,10 @@ static int network_write(const data_set_t *ds, const value_list_t *vl, pthread_mutex_lock(&send_buffer_lock); - status = - add_to_buffer(send_buffer_ptr, network_config_packet_size - - (send_buffer_fill + BUFF_SIG_SIZE), - &send_buffer_vl, ds, vl); + status = add_to_buffer(send_buffer_ptr, + network_config_packet_size - + (send_buffer_fill + BUFF_SIG_SIZE), + &send_buffer_vl, ds, vl); if (status >= 0) { /* status == bytes added to the buffer */ send_buffer_fill += status; @@ -2631,10 +2632,10 @@ static int network_write(const data_set_t *ds, const value_list_t *vl, } else { flush_buffer(); - status = - add_to_buffer(send_buffer_ptr, network_config_packet_size - - (send_buffer_fill + BUFF_SIG_SIZE), - &send_buffer_vl, ds, vl); + status = add_to_buffer(send_buffer_ptr, + network_config_packet_size - + (send_buffer_fill + BUFF_SIG_SIZE), + &send_buffer_vl, ds, vl); if (status >= 0) { send_buffer_fill += status;