From c51cf05646a11c65daf65c1123c77efb068f4f7b Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Thu, 15 Aug 2013 23:13:48 -0400 Subject: Rename F_TYPE_CMP() to F_TYPE_EQUAL() --- src/shared/macro.h | 2 +- src/shared/util.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/shared') diff --git a/src/shared/macro.h b/src/shared/macro.h index 969329d152..0d3ff1cda5 100644 --- a/src/shared/macro.h +++ b/src/shared/macro.h @@ -273,7 +273,7 @@ do { \ * the const magic to the type, otherwise the compiler warns about * signed/unsigned comparison, because the magic can be 32 bit unsigned. */ -#define F_TYPE_CMP(a, b) (a == (typeof(a)) b) +#define F_TYPE_EQUAL(a, b) (a == (typeof(a)) b) /* Returns the number of chars needed to format variables of the diff --git a/src/shared/util.c b/src/shared/util.c index f23dd92a6b..ca9c2eb9d1 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -2830,8 +2830,8 @@ int rm_rf_children_dangerous(int fd, bool only_dirs, bool honour_sticky, struct _pure_ static int is_temporary_fs(struct statfs *s) { assert(s); return - F_TYPE_CMP(s->f_type, TMPFS_MAGIC) || - F_TYPE_CMP(s->f_type, RAMFS_MAGIC); + F_TYPE_EQUAL(s->f_type, TMPFS_MAGIC) || + F_TYPE_EQUAL(s->f_type, RAMFS_MAGIC); } int rm_rf_children(int fd, bool only_dirs, bool honour_sticky, struct stat *root_dev) { -- cgit v1.2.3-54-g00ecf