diff options
| author | Harald Hoyer <harald@redhat.com> | 2013-04-18 08:06:55 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2013-04-18 08:06:55 +0200 |
| commit | aea275c43194b6ac519ef907b62c5c995050fde0 (patch) | |
| tree | 3f5251590bea05909ba2296f6da15858d79272cb /src/shared | |
| parent | fc6e6d245ee3989c222a2a8cc82a33475f9922f3 (diff) | |
rename CMP_F_TYPE to F_TYPE_CMP
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/macro.h | 2 | ||||
| -rw-r--r-- | src/shared/util.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/macro.h b/src/shared/macro.h index f91f7de769..08b40fd2b8 100644 --- a/src/shared/macro.h +++ b/src/shared/macro.h @@ -272,7 +272,7 @@ do { \ * signed int in the kernel and these negative numbers are extended to * long, which cannot be simply compared to the magic constants anymore. */ -#define CMP_F_TYPE(f, c) \ +#define F_TYPE_CMP(f, c) \ __extension__ ({ \ __SWORD_TYPE _f = (f); \ const __SWORD_TYPE _c = (c); \ diff --git a/src/shared/util.c b/src/shared/util.c index 2a8046922b..e8431839b0 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -2780,8 +2780,8 @@ int rm_rf_children_dangerous(int fd, bool only_dirs, bool honour_sticky, struct static int is_temporary_fs(struct statfs *s) { assert(s); return - CMP_F_TYPE(s->f_type, TMPFS_MAGIC) || - CMP_F_TYPE(s->f_type, RAMFS_MAGIC); + F_TYPE_CMP(s->f_type, TMPFS_MAGIC) || + F_TYPE_CMP(s->f_type, RAMFS_MAGIC); } int rm_rf_children(int fd, bool only_dirs, bool honour_sticky, struct stat *root_dev) { |