nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix more warnings from openbsd_malloc

Browse Source 
Apparently, (void)writev is not enough to suppress the "you are
ignoring the return value!" warnings on Linux.  Instead, remove the
whole warning/error logic when compiling openbsd_malloc for Tor: we
can't use it.
This commit is contained in:
Nick Mathewson 2012-08-17 13:49:52 -04:00
parent 6a33c33a12
commit 4c8fcba86c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/OpenBSD_malloc_Linux.c
View File

@ -450,6 +450,7 @@ extern char *__progname;
static void static void
wrterror(const char *p) wrterror(const char *p)
{ {
#ifndef BUILDING_FOR_TOR
const char *q = " error: "; const char *q = " error: ";
struct iovec iov[5]; struct iovec iov[5];
@ -463,8 +464,10 @@ wrterror(const char *p)
iov[3].iov_len = strlen(p); iov[3].iov_len = strlen(p);
iov[4].iov_base = (char*)"\n"; iov[4].iov_base = (char*)"\n";
iov[4].iov_len = 1; iov[4].iov_len = 1;
(void) writev(STDERR_FILENO, iov, 5); writev(STDERR_FILENO, iov, 5);
#else
(void)p;
#endif
suicide = 1; suicide = 1;
#ifdef MALLOC_STATS #ifdef MALLOC_STATS
if (malloc_stats) if (malloc_stats)
@ -478,14 +481,17 @@ wrterror(const char *p)
static void static void
wrtwarning(const char *p) wrtwarning(const char *p)
{ {
#ifndef BUILDING_FOR_TOR
const char *q = " warning: "; const char *q = " warning: ";
struct iovec iov[5]; struct iovec iov[5];
#endif
if (malloc_abort) if (malloc_abort)
wrterror(p); wrterror(p);
else if (malloc_silent) else if (malloc_silent)
return; return;
#ifndef BUILDING_FOR_TOR
iov[0].iov_base = __progname; iov[0].iov_base = __progname;
iov[0].iov_len = strlen(__progname); iov[0].iov_len = strlen(__progname);
iov[1].iov_base = (char*)malloc_func; iov[1].iov_base = (char*)malloc_func;
@ -498,6 +504,9 @@ wrtwarning(const char *p)
iov[4].iov_len = 1; iov[4].iov_len = 1;
(void) writev(STDERR_FILENO, iov, 5); (void) writev(STDERR_FILENO, iov, 5);
#else
(void)p;
#endif
} }
#ifdef MALLOC_STATS #ifdef MALLOC_STATS