diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-12-19 22:08:42 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-12-19 22:08:42 -0500 |
| commit | c79427a9921787abab8f0d6e0c621dc974d98453 (patch) | |
| tree | 1c7c6a8e83c33c3206e675f9d161f1c1afc9ef17 /src/common/compat.c | |
| parent | dd2ae32bc181efdc134c25359bc67d073c48a1d0 (diff) | |
| parent | a62038f01db0df22f864623e6d82d69b447c1414 (diff) | |
| download | tor-c79427a9921787abab8f0d6e0c621dc974d98453.tar.gz tor-c79427a9921787abab8f0d6e0c621dc974d98453.zip | |
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/common/compat.c')
| -rw-r--r-- | src/common/compat.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index d442294e83..f280f7dd92 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -155,6 +155,7 @@ tor_mmap_file(const char *filename) return NULL; } + /* XXXX why not just do fstat here? */ size = filesize = (size_t) lseek(fd, 0, SEEK_END); lseek(fd, 0, SEEK_SET); /* ensure page alignment */ @@ -328,7 +329,7 @@ tor_vsnprintf(char *str, size_t size, const char *format, va_list args) int r; if (size == 0) return -1; /* no place for the NUL */ - if (size > SSIZE_T_MAX-16) + if (size > SIZE_T_CEILING) return -1; #ifdef MS_WINDOWS r = _vsnprintf(str, size, format, args); @@ -589,7 +590,7 @@ tor_fix_source_file(const char *fname) * unaligned memory access. */ uint16_t -get_uint16(const char *cp) +get_uint16(const void *cp) { uint16_t v; memcpy(&v,cp,2); @@ -601,7 +602,7 @@ get_uint16(const char *cp) * unaligned memory access. */ uint32_t -get_uint32(const char *cp) +get_uint32(const void *cp) { uint32_t v; memcpy(&v,cp,4); @@ -613,7 +614,7 @@ get_uint32(const char *cp) * unaligned memory access. */ uint64_t -get_uint64(const char *cp) +get_uint64(const void *cp) { uint64_t v; memcpy(&v,cp,8); @@ -625,7 +626,7 @@ get_uint64(const char *cp) * *(uint16_t*)(cp) = v, but will not cause segfaults on platforms that forbid * unaligned memory access. */ void -set_uint16(char *cp, uint16_t v) +set_uint16(void *cp, uint16_t v) { memcpy(cp,&v,2); } @@ -634,7 +635,7 @@ set_uint16(char *cp, uint16_t v) * *(uint32_t*)(cp) = v, but will not cause segfaults on platforms that forbid * unaligned memory access. */ void -set_uint32(char *cp, uint32_t v) +set_uint32(void *cp, uint32_t v) { memcpy(cp,&v,4); } @@ -643,7 +644,7 @@ set_uint32(char *cp, uint32_t v) * *(uint64_t*)(cp) = v, but will not cause segfaults on platforms that forbid * unaligned memory access. */ void -set_uint64(char *cp, uint64_t v) +set_uint64(void *cp, uint64_t v) { memcpy(cp,&v,8); } |