summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2018-03-02 09:49:35 -0500
committerAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2018-03-02 09:51:53 -0500
commit45d3b5fa4cd1ee2bdcbefcf5a33073b301733e46 (patch)
treeda41e6854cf800d294de52f5d3e6d91f5d5c6d08
parent54e25ab124b4ebb50f1577483ac5c08f67e8b114 (diff)
downloadtor-bug25398.tar.xz
tor-bug25398.zip
Remove uncompilable tor_mmap_file fallback. #25398bug25398
-rw-r--r--changes/bug253982
-rw-r--r--src/common/compat.c36
2 files changed, 4 insertions, 34 deletions
diff --git a/changes/bug25398 b/changes/bug25398
new file mode 100644
index 000000000..5f3fd7f5e
--- /dev/null
+++ b/changes/bug25398
@@ -0,0 +1,2 @@
+ o Minor bugfixes (portability):
+ - Remove uncompilable tor_mmap_file fallback. Fixes bug 25398.
diff --git a/src/common/compat.c b/src/common/compat.c
index e8916c8d1..9457b8289 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -417,40 +417,8 @@ tor_munmap_file(tor_mmap_t *handle)
return 0;
}
#else
-tor_mmap_t *
-tor_mmap_file(const char *filename)
-{
- struct stat st;
- char *res = read_file_to_str(filename, RFTS_BIN|RFTS_IGNORE_MISSING, &st);
- tor_mmap_t *handle;
- if (! res)
- return NULL;
- handle = tor_malloc_zero(sizeof(tor_mmap_t));
- handle->data = res;
- handle->size = st.st_size;
- return handle;
-}
-
-/** Unmap the file mapped with tor_mmap_file(), and return 0 for success
- * or -1 for failure.
- */
-
-int
-tor_munmap_file(tor_mmap_t *handle)
-{
- char *d = NULL;
- if (handle == NULL)
- return 0;
-
- d = (char*)handle->data;
- tor_free(d);
- memwipe(handle, 0, sizeof(tor_mmap_t));
- tor_free(handle);
-
- /* Can't fail in this mmap()/munmap()-free case */
- return 0;
-}
-#endif /* defined(COMPAT_HAS_MMAN_AND_PAGESIZE) || ... || ... */
+#error "cannot implement tor_mmap_file"
+#endif /* defined(HAVE_MMAP) || ... || ... */
/** Replacement for snprintf. Differs from platform snprintf in two
* ways: First, always NUL-terminates its output. Second, always