diff options
author | Julius Bünger <buenger@mytum.de> | 2019-02-21 21:54:18 +0100 |
---|---|---|
committer | Julius Bünger <buenger@mytum.de> | 2019-02-21 21:54:18 +0100 |
commit | 2911b37b421f9d8faf69e223cc0fa05db656ab3c (patch) | |
tree | c3507907e04345ce500d2b56c11395aa60033c59 /src/rps/gnunet-service-rps.c | |
parent | 6a69e4041f80f9d94be417236139a9c511199142 (diff) | |
download | gnunet-2911b37b421f9d8faf69e223cc0fa05db656ab3c.tar.gz gnunet-2911b37b421f9d8faf69e223cc0fa05db656ab3c.zip |
RPS: Use stp(n)cpy instead of strncat in loop
Diffstat (limited to 'src/rps/gnunet-service-rps.c')
-rw-r--r-- | src/rps/gnunet-service-rps.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c index 849bc4c63..6f7e350a6 100644 --- a/src/rps/gnunet-service-rps.c +++ b/src/rps/gnunet-service-rps.c | |||
@@ -2930,6 +2930,7 @@ destroy_sub (struct Sub *sub) | |||
2930 | #ifdef TO_FILE | 2930 | #ifdef TO_FILE |
2931 | char push_recv_str[1536] = ""; /* 256 * 6 (1 whitespace, 1 comma, up to 4 chars) */ | 2931 | char push_recv_str[1536] = ""; /* 256 * 6 (1 whitespace, 1 comma, up to 4 chars) */ |
2932 | char pull_delays_str[1536] = ""; /* 256 * 6 (1 whitespace, 1 comma, up to 4 chars) */ | 2932 | char pull_delays_str[1536] = ""; /* 256 * 6 (1 whitespace, 1 comma, up to 4 chars) */ |
2933 | char *recv_str_iter; | ||
2933 | #endif /* TO_FILE */ | 2934 | #endif /* TO_FILE */ |
2934 | GNUNET_assert (NULL != sub); | 2935 | GNUNET_assert (NULL != sub); |
2935 | GNUNET_assert (NULL != sub->do_round_task); | 2936 | GNUNET_assert (NULL != sub->do_round_task); |
@@ -2958,22 +2959,21 @@ destroy_sub (struct Sub *sub) | |||
2958 | sub->file_name_observed_log = NULL; | 2959 | sub->file_name_observed_log = NULL; |
2959 | 2960 | ||
2960 | /* Write push frequencies to disk */ | 2961 | /* Write push frequencies to disk */ |
2962 | recv_str_iter = push_recv_str; | ||
2961 | for (uint32_t i = 0; i < 256; i++) | 2963 | for (uint32_t i = 0; i < 256; i++) |
2962 | { | 2964 | { |
2963 | char push_recv_str_tmp[8]; | 2965 | char push_recv_str_tmp[8]; |
2964 | 2966 | ||
2965 | GNUNET_snprintf (push_recv_str_tmp, | 2967 | GNUNET_snprintf (push_recv_str_tmp, |
2966 | sizeof (push_recv_str_tmp), | 2968 | sizeof (push_recv_str_tmp), |
2967 | "%" PRIu32 "\n", | 2969 | "%" PRIu32 "\n", |
2968 | sub->push_recv[i]); | 2970 | sub->push_recv[i]); |
2969 | // FIXME: better use stpcpy! | 2971 | recv_str_iter = stpncpy (recv_str_iter, |
2970 | (void) strncat (push_recv_str, | 2972 | push_recv_str_tmp, |
2971 | push_recv_str_tmp, | 2973 | 6); |
2972 | 1535 - strnlen (push_recv_str, 1536)); | 2974 | } |
2973 | } | 2975 | (void) stpcpy (recv_str_iter, |
2974 | (void) strncat (push_recv_str, | 2976 | "\n"); |
2975 | "\n", | ||
2976 | 1535 - strnlen (push_recv_str, 1536)); | ||
2977 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2977 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2978 | "Writing push stats to disk\n"); | 2978 | "Writing push stats to disk\n"); |
2979 | to_file_w_len (sub->file_name_push_recv, 1535, push_recv_str); | 2979 | to_file_w_len (sub->file_name_push_recv, 1535, push_recv_str); |
@@ -2981,6 +2981,7 @@ destroy_sub (struct Sub *sub) | |||
2981 | sub->file_name_push_recv = NULL; | 2981 | sub->file_name_push_recv = NULL; |
2982 | 2982 | ||
2983 | /* Write pull delays to disk */ | 2983 | /* Write pull delays to disk */ |
2984 | recv_str_iter = pull_delays_str; | ||
2984 | for (uint32_t i = 0; i < 256; i++) | 2985 | for (uint32_t i = 0; i < 256; i++) |
2985 | { | 2986 | { |
2986 | char pull_delays_str_tmp[8]; | 2987 | char pull_delays_str_tmp[8]; |
@@ -2989,14 +2990,12 @@ destroy_sub (struct Sub *sub) | |||
2989 | sizeof (pull_delays_str_tmp), | 2990 | sizeof (pull_delays_str_tmp), |
2990 | "%" PRIu32 "\n", | 2991 | "%" PRIu32 "\n", |
2991 | sub->pull_delays[i]); | 2992 | sub->pull_delays[i]); |
2992 | // FIXME: better use stpcpy! | 2993 | recv_str_iter = stpncpy (recv_str_iter, |
2993 | (void) strncat (pull_delays_str, | 2994 | pull_delays_str_tmp, |
2994 | pull_delays_str_tmp, | 2995 | 6); |
2995 | 1535 - strnlen (pull_delays_str, 1536)); | 2996 | } |
2996 | } | 2997 | (void) stpcpy (recv_str_iter, |
2997 | (void) strncat (pull_delays_str, | 2998 | "\n"); |
2998 | "\n", | ||
2999 | 1535 - strnlen (pull_delays_str, 1536)); | ||
3000 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Writing pull delays to disk\n"); | 2999 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Writing pull delays to disk\n"); |
3001 | to_file_w_len (sub->file_name_pull_delays, 1535, pull_delays_str); | 3000 | to_file_w_len (sub->file_name_pull_delays, 1535, pull_delays_str); |
3002 | GNUNET_free (sub->file_name_pull_delays); | 3001 | GNUNET_free (sub->file_name_pull_delays); |