From 69830afc1601542662d2bc7b9c1ba5eec348c7d7 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Thu, 14 Oct 2004 02:49:48 +0000 Subject: [PATCH] and another one svn:r2484 --- src/common/util.h | 2 +- src/or/routerparse.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/util.h b/src/common/util.h index b94fd8fa50..5961ca33e4 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -208,7 +208,7 @@ file_status_t file_status(const char *filename); int check_private_dir(const char *dirname, int create); int write_str_to_file(const char *fname, const char *str, int bin); char *read_file_to_str(const char *filename, int bin); -int parse_line_from_file(char *line, int maxlen, FILE *f, char **key_out, char **value_out); +int parse_line_from_file(char *line, size_t maxlen, FILE *f, char **key_out, char **value_out); char *expand_filename(const char *filename); int replace_file(const char *from, const char *to); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 9ccc7300a8..b58950a68f 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -939,8 +939,7 @@ router_parse_exit_policy_from_string(const char *s) const char *cp; char *tmp; struct exit_policy_t *r; - size_t len; - int idx; + size_t len, idx; /* *s might not end with \n, so we need to extend it with one. */ len = strlen(s);