[tor-commits] [tor/master] config: Give warn_about_relative_paths() const args

[teor at torproject.org]

commit 4666ca73a1af2d60398f2a08d9110f42a6a37e1b
Author: teor <teor at torproject.org>
Date:   Wed Oct 30 16:26:37 2019 +1000

    config: Give warn_about_relative_paths() const args
    
    Also gives make_path_absolute() const args.
    
    Obviously correct fixes to already reviewed code.
---
 src/app/config/config.c | 4 ++--
 src/lib/fs/path.c       | 2 +-
 src/lib/fs/path.h       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 14376e56a..9b75f96a8 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -3303,7 +3303,7 @@ options_validate(const or_options_t *old_options, or_options_t *options,
  */
 static int
 warn_if_option_path_is_relative(const char *option,
-                                char *filepath)
+                                const char *filepath)
 {
   if (filepath && path_is_relative(filepath)) {
     char *abs_path = make_path_absolute(filepath);
@@ -3321,7 +3321,7 @@ warn_if_option_path_is_relative(const char *option,
  * Return 1 if there were relative paths; 0 otherwise.
  */
 static int
-warn_about_relative_paths(or_options_t *options)
+warn_about_relative_paths(const or_options_t *options)
 {
   tor_assert(options);
   int n = 0;
diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c
index 1b4bc74e9..9f297d98e 100644
--- a/src/lib/fs/path.c
+++ b/src/lib/fs/path.c
@@ -258,7 +258,7 @@ alloc_getcwd(void)
  * Return a newly allocated string, which may be a duplicate of <b>fname</b>.
  */
 char *
-make_path_absolute(char *fname)
+make_path_absolute(const char *fname)
 {
 #ifdef _WIN32
   char *absfname_malloced = _fullpath(NULL, fname, 1);
diff --git a/src/lib/fs/path.h b/src/lib/fs/path.h
index 28a1838b8..0c2a57494 100644
--- a/src/lib/fs/path.h
+++ b/src/lib/fs/path.h
@@ -25,6 +25,6 @@ char *expand_filename(const char *filename);
 int path_is_relative(const char *filename);
 void clean_fname_for_stat(char *name);
 int get_parent_directory(char *fname);
-char *make_path_absolute(char *fname);
+char *make_path_absolute(const char *fname);
 
 #endif /* !defined(TOR_PATH_H) */