cache.h: realign and use (1 << x) form for CE_* constants
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Nov 27, 2010 at 13:22 UTC
2977ffbbe134e0fe9bc8aa3643e2d40111643c23
1 file changed
+12
-13
cache.h
+12
-13
@@ -170,26 +170,25 @@ struct cache_entry {
170
*
171
* In-memory only flags
172
*/
173
-#define CE_UPDATE (0x10000)
174
-#define CE_REMOVE (0x20000)
175
-#define CE_UPTODATE (0x40000)
176
-#define CE_ADDED (0x80000)
173
+#define CE_UPDATE (1 << 16)
174
+#define CE_REMOVE (1 << 17)
175
+#define CE_UPTODATE (1 << 18)
176
+#define CE_ADDED (1 << 19)
177
178
-#define CE_HASHED (0x100000)
179
-#define CE_UNHASHED (0x200000)
180
-#define CE_CONFLICTED (0x800000)
178
+#define CE_HASHED (1 << 20)
179
+#define CE_UNHASHED (1 << 21)
180
+#define CE_WT_REMOVE (1 << 22) /* remove in work directory */
181
+#define CE_CONFLICTED (1 << 23)
182
182
-#define CE_WT_REMOVE (0x400000) /* remove in work directory */
183
-
184
-#define CE_UNPACKED (0x1000000)
183
+#define CE_UNPACKED (1 << 24)
184
185
/*
186
* Extended on-disk flags
187
*/
189
-#define CE_INTENT_TO_ADD 0x20000000
190
-#define CE_SKIP_WORKTREE 0x40000000
188
+#define CE_INTENT_TO_ADD (1 << 29)
189
+#define CE_SKIP_WORKTREE (1 << 30)
190
/* CE_EXTENDED2 is for future extension */
192
-#define CE_EXTENDED2 0x80000000
191
+#define CE_EXTENDED2 (1 << 31)
192
193
#define CE_EXTENDED_FLAGS (CE_INTENT_TO_ADD | CE_SKIP_WORKTREE)
194