summaryrefslogtreecommitdiff
path: root/sigchainlib/sigchain.cc
diff options
context:
space:
mode:
author Dave Allison <dallison@google.com> 2014-07-10 01:54:57 +0000
committer Dave Allison <dallison@google.com> 2014-07-10 01:54:57 +0000
commit3d14eb620716e92c21c4d2c2d11a95be53319791 (patch)
treeaadce4d6bb70e549b74b537c6f75617cf533576a /sigchainlib/sigchain.cc
parent34e826ccc80dc1cf7c4c045de6b7f8360d504ccf (diff)
Revert "Add implicit null and stack checks for x86"
It breaks cross compilation with x86_64. This reverts commit 34e826ccc80dc1cf7c4c045de6b7f8360d504ccf. Change-Id: I34ba07821fc0a022fda33a7ae21850957bbec5e7
Diffstat (limited to 'sigchainlib/sigchain.cc')
-rw-r--r--sigchainlib/sigchain.cc16
1 files changed, 0 insertions, 16 deletions
diff --git a/sigchainlib/sigchain.cc b/sigchainlib/sigchain.cc
index 73cc9eb282..26e7d319cd 100644
--- a/sigchainlib/sigchain.cc
+++ b/sigchainlib/sigchain.cc
@@ -14,13 +14,7 @@
* limitations under the License.
*/
-#ifdef HAVE_ANDROID_OS
#include <android/log.h>
-#else
-#include <stdarg.h>
-#include <iostream>
-#endif
-
#include <dlfcn.h>
#include <signal.h>
#include <stdio.h>
@@ -73,11 +67,7 @@ static void log(const char* format, ...) {
va_list ap;
va_start(ap, format);
vsnprintf(buf, sizeof(buf), format, ap);
-#ifdef HAVE_ANDROID_OS
__android_log_write(ANDROID_LOG_ERROR, "libsigchain", buf);
-#else
- std::cout << buf << "\n";
-#endif
va_end(ap);
}
@@ -119,16 +109,10 @@ void InvokeUserSignalHandler(int sig, siginfo_t* info, void* context) {
if ((action.sa_flags & SA_SIGINFO) == 0) {
if (action.sa_handler != NULL) {
action.sa_handler(sig);
- } else {
- signal(sig, SIG_DFL);
- raise(sig);
}
} else {
if (action.sa_sigaction != NULL) {
action.sa_sigaction(sig, info, context);
- } else {
- signal(sig, SIG_DFL);
- raise(sig);
}
}
}