Re: [PATCH] diff: "S_IFREG | 0644" to "(S_IFREG | 0644)" to avoid warning
From: René Scharfe <hidden>
Date: 2016-06-15 22:49:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
Am 04.10.2010 11:21, schrieb Ævar Arnfjörð Bjarmason:
- unsigned mode = canon_mode(S_IFREG | 0644); + unsigned mode = canon_mode((S_IFREG | 0644));
That doesn't look pretty. How about something like the following instead? It untangles the ?-:-chain in canon_mode and allows passing of an argument with side effects. All the S_ISxxx macros get a single variable as parameter. Does it fix the issue on NetBSD? --- cache.h | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/cache.h b/cache.h
index 2ef2fa3..3d5ed51 100644
--- a/cache.h
+++ b/cache.h@@ -277,9 +277,16 @@ static inline int ce_to_dtype(const struct cache_entry *ce) else return DT_UNKNOWN; } -#define canon_mode(mode) \ - (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \ - S_ISLNK(mode) ? S_IFLNK : S_ISDIR(mode) ? S_IFDIR : S_IFGITLINK) +static inline unsigned int canon_mode(unsigned int mode) +{ + if (S_ISREG(mode)) + return S_IFREG | ce_permissions(mode); + if (S_ISLNK(mode)) + return S_IFLNK; + if (S_ISDIR(mode)) + return S_IFDIR; + return S_IFGITLINK; +} #define flexible_size(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7) #define cache_entry_size(len) flexible_size(cache_entry,len)
--
1.7.3