aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-05-22 16:59:57 -0700
committerSteve Kondik <steve@cyngn.com>2016-05-22 17:00:05 -0700
commit17dcbb7493b46334f3df6adf3a4313b18cc2000b (patch)
tree1ea13500e24c9dcd93ea245b32bfceb2ef945244
parent71ddd1fa5de0d97f57509172e20d5a1b7c081965 (diff)
downloadandroid_external_toybox-17dcbb7493b46334f3df6adf3a4313b18cc2000b.tar.gz
android_external_toybox-17dcbb7493b46334f3df6adf3a4313b18cc2000b.tar.bz2
android_external_toybox-17dcbb7493b46334f3df6adf3a4313b18cc2000b.zip
Revert "toybox: Fix build of static executable"
* Fixed upstream. This reverts commit 7d5136d998baaad4a27e45f9fb99b45bac2c9bb8. Change-Id: Iadef67dd23c6e100b2d9b6b44b485772bafb0cd2
-rw-r--r--toys/android/getprop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/toys/android/getprop.c b/toys/android/getprop.c
index cd2c238a..efb1e447 100644
--- a/toys/android/getprop.c
+++ b/toys/android/getprop.c
@@ -54,7 +54,7 @@ static void add_property(char *name, char *value, void *unused)
}
// Needed to supress extraneous "Loaded property_contexts from" message
-int selinux_log_callback_quiet(int type, const char *fmt, ...) {
+int selinux_log_callback(int type, const char *fmt, ...) {
va_list ap;
if (type == SELINUX_INFO) return 0;
@@ -69,7 +69,7 @@ void getprop_main(void)
if (toys.optflags & FLAG_Z) {
union selinux_callback cb;
- cb.func_log = selinux_log_callback_quiet;
+ cb.func_log = selinux_log_callback;
selinux_set_callback(SELINUX_CB_LOG, cb);
TT.handle = selinux_android_prop_context_handle();
if (!TT.handle) error_exit("unable to get selinux property context handle");