improve: cleanup headers and code (#324)

This commit removes unused headers and resolves some variable typing issues, or notes to the next people that might run static analyzers in them.

Author: Keyaku

.gitignore

@@ -1,4 +1,5 @@
 .clangd
+.clang-format
 .gradle
 .idea
 .vscode

loader/src/common/daemon.c

@@ -1,11 +1,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include <sys/socket.h>
+#include <string.h>
+#include <errno.h>
 
 #include <linux/un.h>
+#include <sys/socket.h>
 
 #include "logging.h"
+#include "misc.h"
 #include "socket_utils.h"
 
 #include "daemon.h"
@@ -20,7 +23,7 @@ int rezygiskd_connect(uint8_t retry) {
     .sun_path = { 0 }
   };
 
-  /* 
+  /*
     INFO: Application must assume that sun_path can hold _POSIX_PATH_MAX characters.
 
     Sources:

loader/src/common/elf_util.c

@@ -1,11 +1,12 @@
 #include <stdlib.h>
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <string.h>
+
 #include <fcntl.h>
+#include <sys/auxv.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
-#include <sys/auxv.h>
 
 #include <unistd.h>
 
@@ -736,7 +737,7 @@ ElfW(Addr) getSymbOffset(ElfImg *img, const char *name, unsigned char *sym_type)
          This function is based on AOSP's (Android Open Source Project) code, and resolves the
            indirect symbol, leading to the correct, most appropriate for the hardware, symbol.
 
-    SOURCES: 
+    SOURCES:
      - https://android.googlesource.com/platform/bionic/+/refs/tags/android-16.0.0_r1/linker/linker.cpp#2594
      - https://android.googlesource.com/platform/bionic/+/tags/android-16.0.0_r1/libc/bionic/bionic_call_ifunc_resolver.cpp#41
 */

loader/src/common/misc.c

@@ -1,4 +1,5 @@
 #include <stdio.h>
+
 #include <sys/utsname.h>
 
 #include "logging.h"

loader/src/common/socket_utils.c

@@ -1,8 +1,9 @@
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
-#include <sys/socket.h>
 
 #include <unistd.h>
+#include <sys/socket.h>
 
 #include "logging.h"
 

loader/src/include/daemon.h

@@ -5,8 +5,6 @@
 
 #include <unistd.h>
 
-#include "misc.h"
-
 enum rezygiskd_actions {
   ZygoteInjected,
   GetProcessFlags,
@@ -73,4 +71,4 @@ bool rezygiskd_update_mns(enum mount_namespace_state nms_state, char *buf, size_
 
 bool rezygiskd_remove_module(size_t index);
 
-#endif /* DAEMON_H */
+#endif /* DAEMON_H */

loader/src/include/elf_util.h

@@ -1,11 +1,8 @@
 #ifndef ELF_UTIL_H
 #define ELF_UTIL_H
 
-#include <stdbool.h>
-#include <string.h>
 #include <link.h>
 #include <sys/types.h>
-#include <pthread.h>
 
 #define SHT_GNU_HASH 0x6ffffff6
 

loader/src/include/logging.h

@@ -1,11 +1,11 @@
 #ifndef LOGGING_H
 #define LOGGING_H
 
-#include <android/log.h>
-
 #include <errno.h>
 #include <string.h>
 
+#include <android/log.h>
+
 #include "misc.h"
 
 #ifndef LOG_TAG
@@ -26,4 +26,4 @@
 #define LOGF(...) __android_log_print(ANDROID_LOG_FATAL, LOG_TAG, __VA_ARGS__)
 #define PLOGE(fmt, args...) LOGE(fmt " failed with %d: %s", ##args, errno, strerror(errno))
 
-#endif /* LOGGING_H */
+#endif /* LOGGING_H */

loader/src/include/socket_utils.h

@@ -3,6 +3,8 @@
 
 #include <stdint.h>
 
+#include <sys/types.h>
+
 ssize_t write_loop(int fd, const void *buf, size_t count);
 
 ssize_t read_loop_offset(int fd, void *buf, size_t len, off_t off);
@@ -12,7 +14,7 @@ ssize_t read_loop(int fd, void *buf, size_t len);
 int read_fd(int fd);
 
 ssize_t write_string(int fd, const char *str);
-  
+
 char *read_string(int fd);
 
 #define write_func_def(type)              \
@@ -30,4 +32,4 @@ read_func_def(uint32_t);
 write_func_def(size_t);
 read_func_def(size_t);
 
-#endif /* SOCKET_UTILS_H */
+#endif /* SOCKET_UTILS_H */

loader/src/injector/art_method.h

@@ -2,8 +2,8 @@
 #define ART_METHOD_H
 
 #include <stdbool.h>
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <jni.h>