svn commit: trunk/busybox/coreutils

[aldot at busybox.net]

Author: aldot
Date: 2007-04-10 12:30:50 -0700 (Tue, 10 Apr 2007)
New Revision: 18389

Log:
- use enum for the OPs as suggested by vda. No obj-code changes.


Modified:
   trunk/busybox/coreutils/dd.c


Changeset:
Modified: trunk/busybox/coreutils/dd.c
===================================================================
--- trunk/busybox/coreutils/dd.c	2007-04-10 19:00:08 UTC (rev 18388)
+++ trunk/busybox/coreutils/dd.c	2007-04-10 19:30:50 UTC (rev 18389)
@@ -85,19 +85,22 @@
 #endif
 		NULL
 	};
-#define OP_bs		0 + 1
-#define OP_count	OP_bs + 1
-#define OP_seek		OP_count + 1
-#define OP_skip		OP_seek + 1
-#define OP_if		OP_skip + 1
-#define OP_of		OP_if + 1
-#define OP_ibs		OP_of + ENABLE_FEATURE_DD_IBS_OBS
-#define OP_obs		OP_ibs + ENABLE_FEATURE_DD_IBS_OBS
-#define OP_conv		OP_obs + ENABLE_FEATURE_DD_IBS_OBS
-#define OP_conv_notrunc	OP_conv + ENABLE_FEATURE_DD_IBS_OBS
-#define OP_conv_sync	OP_conv_notrunc + ENABLE_FEATURE_DD_IBS_OBS
-#define OP_conv_noerror	OP_conv_sync + ENABLE_FEATURE_DD_IBS_OBS
-
+	enum {
+		OP_bs = 1,
+		OP_count,
+		OP_seek,
+		OP_skip,
+		OP_if,
+		OP_of,
+USE_FEATURE_DD_IBS_OBS(
+		OP_ibs,
+		OP_obs,
+		OP_conv,
+		OP_conv_notrunc,
+		OP_conv_sync,
+		OP_conv_noerror,
+)
+	};
 	int flags = trunc_flag;
 	size_t oc = 0, ibs = 512, obs = 512;
 	ssize_t n, w;
@@ -117,7 +120,8 @@
 	}
 
 	for (n = 1; n < argc; n++) {
-		smalluint key_len, what;
+		smalluint key_len;
+		smalluint what;
 		char *key;
 		char *arg = argv[n];