Skip to content

Commit 52e4317

Browse files
meatorBiswa96
authored andcommitted
Fix missing whitespace in patches
Such patches may be technically invalid. These errors also mess with 'git patch-id', which is undesirable.
1 parent 0c4d799 commit 52e4317

4 files changed

Lines changed: 15 additions & 15 deletions

patches/adb/0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ index 7f926266..235a21be 100644
4949
+ usbdevfs_urb *urb_in;
5050
+ usbdevfs_urb *urb_out;
5151
#pragma clang diagnostic pop
52-
52+
5353
bool urb_in_busy = false;
5454
@@ -303,7 +303,7 @@ static int usb_bulk_write(usb_handle* h, const void* data, int len) {
5555
std::unique_lock<std::mutex> lock(h->mutex);

patches/core/0009-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -505,23 +505,23 @@ index dbaeb93..0cc119c 100644
505505
@@ -24,7 +23,9 @@
506506
#include <string_view>
507507
#include <vector>
508-
508+
509509
-__BEGIN_DECLS
510510
+#ifdef __cplusplus
511511
+extern "C" {
512512
+#endif
513-
513+
514514
static constexpr const char* CGROUPV2_HIERARCHY_NAME = "cgroup2";
515515
[[deprecated]] static constexpr const char* CGROUPV2_CONTROLLER_NAME = "cgroup2";
516516
@@ -40,7 +41,9 @@ bool SetTaskProfiles(pid_t tid, const std::vector<std::string>& profiles,
517517
bool SetProcessProfiles(uid_t uid, pid_t pid, const std::vector<std::string>& profiles);
518518
bool SetUserProfiles(uid_t uid, const std::vector<std::string>& profiles);
519-
519+
520520
-__END_DECLS
521521
+#ifdef __cplusplus
522522
+}
523523
+#endif
524-
524+
525525
bool SetTaskProfiles(pid_t tid, std::initializer_list<std::string_view> profiles,
526526
bool use_fd_cache = false);
527527
@@ -49,7 +52,9 @@ bool SetTaskProfiles(int tid, std::span<const std::string_view> profiles,
@@ -880,12 +880,12 @@ index 16207e6..9a12458 100644
880880
@@ -20,7 +20,9 @@
881881
#include <keymaster/android_keymaster_messages.h>
882882
#include <trusty_keymaster/ipc/keymaster_ipc.h>
883-
883+
884884
-__BEGIN_DECLS
885885
+#ifdef __cplusplus
886886
+extern "C" {
887887
+#endif
888-
888+
889889
const uint32_t TRUSTY_KEYMASTER_RECV_BUF_SIZE = 2 * 4096;
890890
const uint32_t TRUSTY_KEYMASTER_SEND_BUF_SIZE =
891891
@@ -35,6 +37,8 @@ keymaster_error_t translate_error(int err);

patches/core/0011-core-include-missing-headers.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ index 7cb8a6b..070c8b0 100644
2727
@@ -15,6 +15,8 @@
2828
//
2929
#pragma once
30-
30+
3131
+#include <stdint.h>
3232
+
3333
#include <string>
34-
34+
3535
#include "android-base/unique_fd.h"
3636
--
3737
2.40.1

patches/libbase/0002-remove-glibc-internal-headers-cdefs.h.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ index b47494b..c29845e 100644
1414
+++ b/include/android-base/endian.h
1515
@@ -19,7 +19,7 @@
1616
/* A cross-platform equivalent of bionic's <sys/endian.h>. */
17-
17+
1818
/* For __BIONIC__ and __GLIBC__ */
1919
-#include <sys/cdefs.h>
2020
+#include <cfloat>
21-
21+
2222
#if defined(__BIONIC__)
23-
23+
2424
diff --git a/include/android-base/properties.h b/include/android-base/properties.h
2525
index 021f466..53b8ea1 100644
2626
--- a/include/android-base/properties.h
2727
+++ b/include/android-base/properties.h
2828
@@ -16,7 +16,6 @@
29-
29+
3030
#pragma once
31-
31+
3232
-#include <sys/cdefs.h>
33-
33+
3434
#include <chrono>
3535
#include <limits>

0 commit comments

Comments
 (0)