diff options
| author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2014-10-20 13:47:09 +0300 |
|---|---|---|
| committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2014-10-20 13:47:09 +0300 |
| commit | dd183c2c8000d42073d19fefc2740dc50bafd287 (patch) | |
| tree | d7033e3951cc78b870a716dd4105eedb0be39651 | |
| parent | a167204782941dae63a3318a9c26bde040c7b049 (diff) | |
mkfs.ubifs: start using common code
Several commonly used macros are now defined in 'common.h', let's start using
them in mkfs.ubifs, instead of duplicating them.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
| -rw-r--r-- | mkfs.ubifs/defs.h | 15 | ||||
| -rw-r--r-- | mkfs.ubifs/mkfs.ubifs.c | 1 | ||||
| -rw-r--r-- | mkfs.ubifs/mkfs.ubifs.h | 4 |
3 files changed, 4 insertions, 16 deletions
diff --git a/mkfs.ubifs/defs.h b/mkfs.ubifs/defs.h index 06cf9e5..1fa3316 100644 --- a/mkfs.ubifs/defs.h +++ b/mkfs.ubifs/defs.h @@ -29,21 +29,6 @@ #define le32_to_cpu(x) (t32((x))) #define le64_to_cpu(x) (t64((x))) -#define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1) -#define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) - -#define min_t(t,x,y) ({ \ - typeof((x)) _x = (x); \ - typeof((y)) _y = (y); \ - (_x < _y) ? _x : _y; \ -}) - -#define max_t(t,x,y) ({ \ - typeof((x)) _x = (x); \ - typeof((y)) _y = (y); \ - (_x > _y) ? _x : _y; \ -}) - #define unlikely(x) (x) #define ubifs_assert(x) ({}) diff --git a/mkfs.ubifs/mkfs.ubifs.c b/mkfs.ubifs/mkfs.ubifs.c index 200c8a5..ca17e2b 100644 --- a/mkfs.ubifs/mkfs.ubifs.c +++ b/mkfs.ubifs/mkfs.ubifs.c @@ -21,7 +21,6 @@ */ #define _XOPEN_SOURCE 500 /* For realpath() */ -#define PROGRAM_NAME "mkfs.ubifs" #include "mkfs.ubifs.h" #include <crc32.h> diff --git a/mkfs.ubifs/mkfs.ubifs.h b/mkfs.ubifs/mkfs.ubifs.h index 6030c48..3edb79d 100644 --- a/mkfs.ubifs/mkfs.ubifs.h +++ b/mkfs.ubifs/mkfs.ubifs.h @@ -46,6 +46,10 @@ #include <uuid/uuid.h> #include <sys/file.h> +/* common.h requires the PROGRAM_NAME macro */ +#define PROGRAM_NAME "mkfs.ubifs" +#include "common.h" + #include "libubi.h" #include "defs.h" #include "crc16.h" |