@@ -20,6 +20,8 @@
* Zoltan Sogor
*/
+#define PROGRAM_NAME "compr"
+
#include <stdlib.h>
#include <stdio.h>
#include <stdint.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) ({})
@@ -44,6 +44,8 @@
* for more information about what the device table is.
*/
+#define PROGRAM_NAME "devtable"
+
#include "mkfs.ubifs.h"
#include "hashtable/hashtable.h"
#include "hashtable/hashtable_itr.h"
@@ -20,6 +20,8 @@
* Artem Bityutskiy
*/
+#define PROGRAM_NAME "lpt"
+
#include "mkfs.ubifs.h"
/**
@@ -51,6 +51,7 @@
#include "crc16.h"
#include "ubifs-media.h"
#include "ubifs.h"
+#include "common.h"
#include "key.h"
#include "lpt.h"
#include "compr.h"
These macros have been moved to include/common.h. This patch removes duplicate macros from mkfs.ubifs/def.h and include these macros from common.h As each file which include common.h must define a PROGRAM_NAME, this patch also adds PROGRAM_NAME for every c file in mkfs.ubifs/ Signed-off-by: hujianyang <hujianyang@huawei.com> --- mkfs.ubifs/compr.c | 2 ++ mkfs.ubifs/defs.h | 15 --------------- mkfs.ubifs/devtable.c | 2 ++ mkfs.ubifs/lpt.c | 2 ++ mkfs.ubifs/mkfs.ubifs.h | 1 + 5 files changed, 7 insertions(+), 15 deletions(-)