nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed signature for check_nickname_list to remove warnings on free.

Browse Source
This commit is contained in:
Kevin Butler 2013-08-31 05:12:36 +01:00
parent 0513643317
commit bb69bf8882
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/config.c
View File

@ -521,7 +521,7 @@ static int options_transition_affects_workers(
const or_options_t *old_options, const or_options_t *new_options); const or_options_t *old_options, const or_options_t *new_options);
static int options_transition_affects_descriptor( static int options_transition_affects_descriptor(
const or_options_t *old_options, const or_options_t *new_options); const or_options_t *old_options, const or_options_t *new_options);
static int check_nickname_list(const char **lst, const char *name, char **msg); static int check_nickname_list(char **lst, const char *name, char **msg);
static int parse_client_transport_line(const char *line, int validate_only); static int parse_client_transport_line(const char *line, int validate_only);
@ -3090,7 +3090,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
"You should also make sure you aren't listing this bridge's " "You should also make sure you aren't listing this bridge's "
"fingerprint in any other MyFamily."); "fingerprint in any other MyFamily.");
} }
if (check_nickname_list((const char **)&options->MyFamily, "MyFamily", msg)) if (check_nickname_list((char **)&options->MyFamily, "MyFamily", msg))
return -1; return -1;
for (cl = options->NodeFamilies; cl; cl = cl->next) { for (cl = options->NodeFamilies; cl; cl = cl->next) {
routerset_t *rs = routerset_new(); routerset_t *rs = routerset_new();
@ -3626,7 +3626,7 @@ get_default_conf_file(int defaults_file)
* Warn and return -1 on failure. * Warn and return -1 on failure.
*/ */
static int static int
check_nickname_list(const char **lst, const char *name, char **msg) check_nickname_list(char **lst, const char *name, char **msg)
{ {
int r = 0; int r = 0;
smartlist_t *sl; smartlist_t *sl;
@ -3639,7 +3639,7 @@ check_nickname_list(const char **lst, const char *name, char **msg)
smartlist_split_string(sl, *lst, ",", smartlist_split_string(sl, *lst, ",",
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK|SPLIT_STRIP_SPACE, 0); SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK|SPLIT_STRIP_SPACE, 0);
SMARTLIST_FOREACH(sl, const char *, s, SMARTLIST_FOREACH(sl, char *, s,
{ {
if (!is_legal_nickname_or_hexdigest(s)) { if (!is_legal_nickname_or_hexdigest(s)) {
// check if first char is dollar // check if first char is dollar
@ -3670,7 +3670,7 @@ check_nickname_list(const char **lst, const char *name, char **msg)
// Replace the caller's nickname list with a fixed one // Replace the caller's nickname list with a fixed one
if (changes && r == 0) { if (changes && r == 0) {
const char *newNicknames = smartlist_join_strings(sl, ", ", 0, NULL); char *newNicknames = smartlist_join_strings(sl, ", ", 0, NULL);
tor_free(*lst); tor_free(*lst);
*lst = newNicknames; *lst = newNicknames;
} }