Minor code changes across all sources

native/jni/magiskpolicy/magiskpolicy.cpp

@@ -8,7 +8,7 @@
 #include <vector>
 #include <string>
 
-#include <magisk.h>
+#include <logging.h>
 #include <utils.h>
 #include <flags.h>
 

native/jni/magiskpolicy/magiskpolicy.h

@@ -1,17 +1,14 @@
 /* magiskpolicy.h - Public API for policy patching
  */
 
-#ifndef _MAGISKPOLICY_H
-#define _MAGISKPOLICY_H
+#pragma once
 
 #include <stdlib.h>
 #include <selinux.h>
 
 #define ALL NULL
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+__BEGIN_DECLS
 
 // policydb functions
 int load_policydb(const char *file);
@@ -41,8 +38,4 @@ int sepol_exists(const char *source);
 // Built in rules
 void sepol_magisk_rules();
 
-#ifdef __cplusplus
-};
-#endif
-
-#endif
+__END_DECLS

native/jni/magiskpolicy/rules.cpp

@@ -1,8 +1,8 @@
-#include <magisk.h>
+#include <logging.h>
+#include <flags.h>
 
 #include "magiskpolicy.h"
 #include "sepolicy.h"
-#include "flags.h"
 
 static void allowSuClient(const char *target) {
 	if (!sepol_exists(target))

native/jni/magiskpolicy/sepolicy.h

@@ -1,14 +1,11 @@
 /* sepolicy.h - Header for magiskpolicy non-public APIs
  */
 
-#ifndef _SEPOLICY_H
-#define _SEPOLICY_H
+#pragma once
 
 #include <sepol/policydb/policydb.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+__BEGIN_DECLS
 
 // Global policydb
 extern policydb_t *policydb;
@@ -36,8 +33,4 @@ int add_rule(const char *s, const char *t, const char *c, const char *p, int eff
 int add_xperm_rule(const char *s, const char *t, const char *c, const char *range, int effect, int n);
 int add_type_rule(const char *s, const char *t, const char *c, const char *d, int effect);
 
-#ifdef __cplusplus
-};
-#endif
-
-#endif
+__END_DECLS