clean up code

5ec1cff · Jul 18, 2024 · 493c79b · 493c79b
1 parent 4bbf952
commit 493c79b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 270 deletions.
diff --git a/module/src/main/cpp/binder/include/kernel/binder.h b/module/src/main/cpp/binder/include/kernel/binder.h
@@ -10,7 +10,9 @@
 #include <linux/types.h>
 #include <linux/ioctl.h>
 
+#ifndef B_PACK_CHARS
 #define B_PACK_CHARS(c1, c2, c3, c4) ((((c1) << 24)) | (((c2) << 16)) | (((c3) << 8)) | (c4))
+#endif
 #define B_TYPE_LARGE 0x85
 enum {
     BINDER_TYPE_BINDER = B_PACK_CHARS('s', 'b', '*', B_TYPE_LARGE),

diff --git a/module/src/main/cpp/binder/stub_binder.cpp b/module/src/main/cpp/binder/stub_binder.cpp
@@ -27,7 +27,7 @@ namespace android {
 #endif
     BBinder::BBinder() {}
 
-    const String16& BBinder::getInterfaceDescriptor() const { return {}; }
+    const String16 &BBinder::getInterfaceDescriptor() const { __builtin_unreachable(); }
     bool BBinder::isBinderAlive() const { return false; }
     status_t BBinder::pingBinder() { return 0; }
     status_t BBinder::dump(int fd, const Vector<String16>& args) { return 0; }
@@ -152,7 +152,7 @@ namespace android {
 
     // IServiceManager.h
     const String16 &IServiceManager::getInterfaceDescriptor() const {
-        return {};
+        __builtin_unreachable();
     }
 
     IServiceManager::IServiceManager() {}

diff --git a/module/src/main/cpp/binder_interceptor.cpp b/module/src/main/cpp/binder_interceptor.cpp
@@ -19,11 +19,8 @@
 #include "lsplt.hpp"
 #include "elf_util.h"
 
-#include "hook_util/hook_helper.hpp"
-
 using namespace SandHook;
 using namespace android;
-using namespace hook_helper::literals;
 
 class BinderInterceptor : public BBinder {
     enum {
@@ -349,6 +346,6 @@ bool hookBinder() {
 }
 
 extern "C" [[gnu::visibility("default")]] [[gnu::used]] bool entry(void *handle) {
-    LOGI("my handle %p", handle);
+    LOGI("injected, my handle %p", handle);
     return hookBinder();
 }
diff --git a/module/src/main/cpp/hook_util/hook_helper.hpp b/module/src/main/cpp/hook_util/hook_helper.hpp
diff --git a/module/src/main/cpp/hook_util/type_traits.hpp b/module/src/main/cpp/hook_util/type_traits.hpp
diff --git a/module/src/main/cpp/zygisk/main.cpp b/module/src/main/cpp/zygisk/main.cpp
@@ -190,5 +190,4 @@ static void companion_handler(int fd) {
 
 // Register our module class and the companion handler function
 REGISTER_ZYGISK_MODULE(TrickyStore)
-
-REGISTER_ZYGISK_COMPANION(companion_handler)
+REGISTER_ZYGISK_COMPANION(companion_handler)