Small native code reorganization

native/jni/utils/cpio.cpp

@@ -4,9 +4,9 @@
 #include <stdlib.h>
 #include <algorithm>
 
-#include <utils.h>
-#include <logging.h>
-#include <cpio.h>
+#include <utils.hpp>
+#include <logging.hpp>
+#include <cpio.hpp>
 
 using namespace std;
 

native/jni/utils/file.cpp

@@ -7,8 +7,8 @@
 #include <string.h>
 #include <libgen.h>
 
-#include <utils.h>
-#include <selinux.h>
+#include <utils.hpp>
+#include <selinux.hpp>
 
 using namespace std;
 

native/jni/utils/files.hpp

@@ -6,7 +6,7 @@
 #include <functional>
 #include <string_view>
 
-#include "xwrap.h"
+#include "xwrap.hpp"
 
 #define do_align(p, a)  (((p) + (a) - 1) / (a) * (a))
 #define align_off(p, a) (do_align(p, a) - (p))

native/jni/utils/include/blocking_queue.hpp

@@ -2,7 +2,7 @@
 
 #include <pthread.h>
 #include <deque>
-#include <misc.h>
+#include <../misc.hpp>
 
 template<typename T>
 class blocking_queue {

native/jni/utils/include/cpio.hpp

@@ -6,7 +6,7 @@
 #include <map>
 #include <string_view>
 
-#include <stream.h>
+#include <stream.hpp>
 
 struct cpio_newc_header;
 

native/jni/utils/include/stream.hpp

@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <memory>
 
-#include "../files.h"
+#include "../files.hpp"
 
 class stream {
 public:

native/jni/utils/include/utils.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include "../missing.h"
-#include "../xwrap.h"
-#include "../files.h"
-#include "../misc.h"

native/jni/utils/include/utils.hpp

@@ -0,0 +1,6 @@
+#pragma once
+
+#include "../missing.hpp"
+#include "../xwrap.hpp"
+#include "../files.hpp"
+#include "../misc.hpp"

native/jni/utils/logging.cpp

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <android/log.h>
 
-#include <logging.h>
+#include <logging.hpp>
 #include <flags.h>
 
 int nop_log(const char *fmt, va_list ap) {

native/jni/utils/misc.cpp

@@ -14,8 +14,8 @@
 #include <syscall.h>
 #include <random>
 
-#include <logging.h>
-#include <utils.h>
+#include <logging.hpp>
+#include <utils.hpp>
 
 int fork_dont_care() {
 	int pid = xfork();

native/jni/utils/missing.cpp

@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <mntent.h>
 
-#include "missing.h"
+#include "missing.hpp"
 
 /* Original source: https://opensource.apple.com/source/cvs/cvs-19/cvs/lib/getline.c
  * License: GPL 2 or later

native/jni/utils/selinux.cpp

@@ -6,9 +6,9 @@
 #include <syscall.h>
 #include <string_view>
 
-#include <magisk.h>
-#include <utils.h>
-#include <selinux.h>
+#include <magisk.hpp>
+#include <utils.hpp>
+#include <selinux.hpp>
 
 using namespace std::literals;
 

native/jni/utils/stream.cpp

@@ -1,6 +1,6 @@
-#include <utils.h>
-#include <logging.h>
-#include <stream.h>
+#include <utils.hpp>
+#include <logging.hpp>
+#include <stream.hpp>
 
 static int strm_read(void *v, char *buf, int len) {
 	auto strm = reinterpret_cast<stream *>(v);

native/jni/utils/xwrap.cpp

@@ -10,8 +10,8 @@
 #include <sys/mman.h>
 #include <sys/sendfile.h>
 
-#include <logging.h>
-#include <utils.h>
+#include <logging.hpp>
+#include <utils.hpp>
 
 FILE *xfopen(const char *pathname, const char *mode) {
 	FILE *fp = fopen(pathname, mode);