diff options
Diffstat (limited to 'meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch')
-rw-r--r-- | meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch | 122 |
1 files changed, 0 insertions, 122 deletions
diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch b/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch deleted file mode 100644 index ed3e0a9e9..000000000 --- a/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch +++ /dev/null | |||
@@ -1,122 +0,0 @@ | |||
1 | From f76d2142905f0e5bd830d5d576c235af1171c6ac Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 13 Jul 2017 23:23:31 -0700 | ||
4 | Subject: [PATCH 2/5] Replace __uint32_t with uint32_t | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | common/content_inode.h | 4 ++-- | ||
9 | doc/xfsdump.html | 8 ++++---- | ||
10 | inventory/inv_oref.h | 2 +- | ||
11 | inventory/inv_priv.h | 4 ++-- | ||
12 | inventory/inventory.h | 2 +- | ||
13 | 5 files changed, 10 insertions(+), 10 deletions(-) | ||
14 | |||
15 | diff --git a/common/content_inode.h b/common/content_inode.h | ||
16 | index a69a9a0..6936e05 100644 | ||
17 | --- a/common/content_inode.h | ||
18 | +++ b/common/content_inode.h | ||
19 | @@ -191,10 +191,10 @@ typedef struct bstat bstat_t; | ||
20 | * and using two 16bit values to hold new 32bit projid was choosen | ||
21 | * to retain compatibility with "old" filesystems). | ||
22 | */ | ||
23 | -static inline __uint32_t | ||
24 | +static inline uint32_t | ||
25 | bstat_projid(struct bstat *bs) | ||
26 | { | ||
27 | - return (__uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo; | ||
28 | + return (uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo; | ||
29 | } | ||
30 | |||
31 | |||
32 | diff --git a/doc/xfsdump.html b/doc/xfsdump.html | ||
33 | index 9c6722e..f85128f 100644 | ||
34 | --- a/doc/xfsdump.html | ||
35 | +++ b/doc/xfsdump.html | ||
36 | @@ -1935,7 +1935,7 @@ The files are constructed like so: | ||
37 | <pre> | ||
38 | typedef struct invt_counter { | ||
39 | INVT_COUNTER_FIELDS | ||
40 | - __uint32_t ic_vernum;/* on disk version number for posterity */\ | ||
41 | + uint32_t ic_vernum;/* on disk version number for posterity */\ | ||
42 | u_int ic_curnum;/* number of sessions/invindices recorded \ | ||
43 | so far */ \ | ||
44 | u_int ic_maxnum;/* maximum number of sessions/inv_indices \ | ||
45 | @@ -1975,7 +1975,7 @@ typedef struct invt_fstab { | ||
46 | <pre> | ||
47 | typedef struct invt_counter { | ||
48 | INVT_COUNTER_FIELDS | ||
49 | - __uint32_t ic_vernum;/* on disk version number for posterity */\ | ||
50 | + uint32_t ic_vernum;/* on disk version number for posterity */\ | ||
51 | u_int ic_curnum;/* number of sessions/invindices recorded \ | ||
52 | so far */ \ | ||
53 | u_int ic_maxnum;/* maximum number of sessions/inv_indices \ | ||
54 | @@ -2012,7 +2012,7 @@ typedef struct invt_entry { | ||
55 | <pre> | ||
56 | typedef struct invt_sescounter { | ||
57 | INVT_COUNTER_FIELDS | ||
58 | - __uint32_t ic_vernum;/* on disk version number for posterity */\ | ||
59 | + uint32_t ic_vernum;/* on disk version number for posterity */\ | ||
60 | u_int ic_curnum;/* number of sessions/invindices recorded \ | ||
61 | so far */ \ | ||
62 | u_int ic_maxnum;/* maximum number of sessions/inv_indices \ | ||
63 | @@ -2034,7 +2034,7 @@ typedef struct invt_seshdr { | ||
64 | off64_t sh_streams_off; /* offset to start of the set of | ||
65 | stream hdrs */ | ||
66 | time_t sh_time; /* time of the dump */ | ||
67 | - __uint32_t sh_flag; /* for misc flags */ | ||
68 | + uint32_t sh_flag; /* for misc flags */ | ||
69 | u_char sh_level; /* dump level */ | ||
70 | u_char sh_pruned; /* pruned by invutil flag */ | ||
71 | char sh_padding[22]; | ||
72 | diff --git a/inventory/inv_oref.h b/inventory/inv_oref.h | ||
73 | index e16684d..38303a4 100644 | ||
74 | --- a/inventory/inv_oref.h | ||
75 | +++ b/inventory/inv_oref.h | ||
76 | @@ -46,7 +46,7 @@ | ||
77 | |||
78 | |||
79 | |||
80 | -typedef __uint32_t invt_objtype_t; | ||
81 | +typedef uint32_t invt_objtype_t; | ||
82 | |||
83 | #define INVT_LOCKED 0x0001 | ||
84 | |||
85 | diff --git a/inventory/inv_priv.h b/inventory/inv_priv.h | ||
86 | index 1690271..364ffbc 100644 | ||
87 | --- a/inventory/inv_priv.h | ||
88 | +++ b/inventory/inv_priv.h | ||
89 | @@ -120,7 +120,7 @@ typedef struct invt_seshdr { | ||
90 | off64_t sh_streams_off; /* offset to start of the set of | ||
91 | stream hdrs */ | ||
92 | time32_t sh_time; /* time of the dump */ | ||
93 | - __uint32_t sh_flag; /* for misc flags */ | ||
94 | + uint32_t sh_flag; /* for misc flags */ | ||
95 | u_char sh_level; /* dump level */ | ||
96 | u_char sh_pruned; /* pruned by invutil flag */ | ||
97 | char sh_padding[22]; | ||
98 | @@ -184,7 +184,7 @@ typedef struct invt_entry { | ||
99 | |||
100 | /* Cheap Inheritance, and an attempt to avoid a nested type */ | ||
101 | #define INVT_COUNTER_FIELDS \ | ||
102 | - __uint32_t ic_vernum;/* on disk version number for posterity */\ | ||
103 | + uint32_t ic_vernum;/* on disk version number for posterity */\ | ||
104 | uint ic_curnum;/* number of sessions/invindices recorded \ | ||
105 | so far */ \ | ||
106 | uint ic_maxnum;/* maximum number of sessions/inv_indices \ | ||
107 | diff --git a/inventory/inventory.h b/inventory/inventory.h | ||
108 | index 134b9ba..c1d7403 100644 | ||
109 | --- a/inventory/inventory.h | ||
110 | +++ b/inventory/inventory.h | ||
111 | @@ -43,7 +43,7 @@ | ||
112 | /* length of labels, mntpts, etc */ | ||
113 | #define INV_STRLEN GLOBAL_HDR_STRING_SZ | ||
114 | |||
115 | -typedef __uint32_t inv_version_t; | ||
116 | +typedef uint32_t inv_version_t; | ||
117 | |||
118 | /* This is the general inventory version. | ||
119 | */ | ||
120 | -- | ||
121 | 2.13.2 | ||
122 | |||