summaryrefslogtreecommitdiff
path: root/src/common/util.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-11-02 11:56:02 -0500
committerNick Mathewson <nickm@torproject.org>2014-11-02 11:56:02 -0500
commitbbd8d071675c278571c804fd0a71b51e7dfa8d7e (patch)
treeb2e13b638657ae8827ffb72c9b9f42cb97126f4b /src/common/util.c
parentded33cb2c73151e2f02a8a1d520b54e4f1c14072 (diff)
downloadtor-bbd8d071675c278571c804fd0a71b51e7dfa8d7e.tar.gz
tor-bbd8d071675c278571c804fd0a71b51e7dfa8d7e.zip
Apply new calloc coccinelle patch
Diffstat (limited to 'src/common/util.c')
-rw-r--r--src/common/util.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/util.c b/src/common/util.c
index 3d81f2b530..77102837db 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -3465,8 +3465,8 @@ format_win_cmdline_argument(const char *arg)
smartlist_add(arg_chars, (void*)&backslash);
/* Allocate space for argument, quotes (if needed), and terminator */
- formatted_arg = tor_calloc(sizeof(char),
- (smartlist_len(arg_chars) + (need_quotes ? 2 : 0) + 1));
+ formatted_arg = tor_calloc((smartlist_len(arg_chars) + (need_quotes ? 2 : 0) + 1),
+ sizeof(char));
/* Add leading quote */
i=0;
@@ -5104,7 +5104,7 @@ tor_check_port_forwarding(const char *filename,
for each smartlist element (one for "-p" and one for the
ports), and one for the final NULL. */
args_n = 1 + 2*smartlist_len(ports_to_forward) + 1;
- argv = tor_calloc(sizeof(char *), args_n);
+ argv = tor_calloc(args_n, sizeof(char *));
argv[argv_index++] = filename;
SMARTLIST_FOREACH_BEGIN(ports_to_forward, const char *, port) {