summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <tschwinge@gnu.org>2006-03-14 23:27:50 +0000
committerThomas Schwinge <tschwinge@gnu.org>2006-03-14 23:27:50 +0000
commitd8aadb4381fb4d49c70a943d40b78ef84685e96a (patch)
treed898f28166157576d37d3800446c47a5b346456a
parent1c4b66f7981ec2a77e11fdc94eb5613d32ac1ec4 (diff)
2006-03-15 Thomas Schwinge <tschwinge@gnu.org>
* mkfs.c (parse_opt): Move UP's functionality into UP_INT in order to fix invalid lvalues.
-rw-r--r--ufs-utils/ChangeLog5
-rw-r--r--ufs-utils/mkfs.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/ufs-utils/ChangeLog b/ufs-utils/ChangeLog
index f65e9ce1..24b373c0 100644
--- a/ufs-utils/ChangeLog
+++ b/ufs-utils/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-15 Thomas Schwinge <tschwinge@gnu.org>
+
+ * mkfs.c (parse_opt): Move UP's functionality into UP_INT in order to
+ fix invalid lvalues.
+
2002-06-08 Roland McGrath <roland@frob.com>
* mkfs.c (iput): Use %Ld format for ino_t values.
diff --git a/ufs-utils/mkfs.c b/ufs-utils/mkfs.c
index f423f003..aef3ea92 100644
--- a/ufs-utils/mkfs.c
+++ b/ufs-utils/mkfs.c
@@ -33,7 +33,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)mkfs.c 8.3 (Berkeley) 2/3/94";*/
-static char *rcsid = "$Id: mkfs.c,v 1.21 2002/06/11 21:43:19 roland Exp $";
+static char *rcsid = "$Id: mkfs.c,v 1.22 2006/03/14 23:27:50 tschwinge Exp $";
#endif /* not lint */
#include <unistd.h>
@@ -279,10 +279,8 @@ main (int argc, char **argv)
case 'N': Nflag = 1; break;
case 'O': Oflag = 1; break;
- /* Mark &VAR as being a uparam, and return a lvalue for VAR. */
-#define UP(var) (amarks_add (&uparams, &var), var)
- /* Record an integer uparam into VAR. */
-#define UP_INT(var) { int _i = atoi (arg); UP (var) = _i; }
+/* Mark &VAR as being a uparam, and set VAR. */
+#define UP_INT(var) { amarks_add (&uparams, &var); var = atoi (arg); }
case 'a': UP_INT (maxcontig); break;
case 'b': UP_INT (bsize); break;