diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-02-22 12:42:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-02-22 12:42:31 -0500 |
| commit | d35b8dc5827762cd9cbee90f57ef370f477539fb (patch) | |
| tree | d2159aa694d4fde110ae43b21ed1bd5e97fc32db /src/tools | |
| parent | 1dfbec482c50dabd2359d74848a13cbc03c4f9ea (diff) | |
| download | tor-d35b8dc5827762cd9cbee90f57ef370f477539fb.tar.gz tor-d35b8dc5827762cd9cbee90f57ef370f477539fb.zip | |
Make expand_filename into a tor_strdup() alias on windows.
On Windows, we don't have a notion of ~ meaning "our homedir", so we
were deliberately using an #ifdef to avoid calling expand_filename()
in multiple places. This is silly: The right place to turn a function
into a no-op on a single platform is in the function itself, not in
every single call-site.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tor-checkkey.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/tools/tor-checkkey.c b/src/tools/tor-checkkey.c index 30c223a7a1..e15cc46df9 100644 --- a/src/tools/tor-checkkey.c +++ b/src/tools/tor-checkkey.c @@ -47,11 +47,7 @@ int main(int c, char **v) fname_idx = 1; } -#ifdef MS_WINDOWS - fname = tor_strdup(v[fname_idx]); -#else fname = expand_filename(v[fname_idx]); -#endif str = read_file_to_str(fname, 0, NULL); tor_free(fname); if (!str) { |