CVS commit: src

[matthew green]

Module Name:    src
Committed By:   mrg
Date:           Tue Jun 21 09:36:46 UTC 2011

Modified Files:
        src/sbin/fsck_lfs: lfs.c
        src/usr.sbin/acpitools/aml: aml_parse.c

Log Message:
avoid code that looks like this:
        x = x = y;
since GCC 4.5 complains about it having sequence point issues.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_parse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sbin/fsck_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.33 src/sbin/fsck_lfs/lfs.c:1.34
--- src/sbin/fsck_lfs/lfs.c:1.33	Sun Feb 21 16:24:21 2010
+++ src/sbin/fsck_lfs/lfs.c	Tue Jun 21 09:36:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.33 2010/02/21 16:24:21 mlelstv Exp $ */
+/* $NetBSD: lfs.c,v 1.34 2011/06/21 09:36:46 mrg Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -1020,8 +1020,7 @@
 						    lastblock,
 						    (bpp ? &bp : NULL))))
 				return (error);
-			ip->i_ffs1_size = ip->i_ffs1_size =
-			    (lastblock + 1) * fs->lfs_bsize;
+			ip->i_ffs1_size = (lastblock + 1) * fs->lfs_bsize;
 			ip->i_flag |= IN_CHANGE | IN_UPDATE;
 			if (bpp)
 				(void) VOP_BWRITE(bp);

Index: src/usr.sbin/acpitools/aml/aml_parse.c
diff -u src/usr.sbin/acpitools/aml/aml_parse.c:1.2 src/usr.sbin/acpitools/aml/aml_parse.c:1.3
--- src/usr.sbin/acpitools/aml/aml_parse.c:1.2	Mon May 30 01:15:30 2011
+++ src/usr.sbin/acpitools/aml/aml_parse.c	Tue Jun 21 09:36:46 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: aml_parse.c,v 1.2 2011/05/30 01:15:30 dyoung Exp $	*/
+/*	$NetBSD: aml_parse.c,v 1.3 2011/06/21 09:36:46 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1999 Doug Rabson
@@ -30,7 +30,7 @@
  *	$FreeBSD: src/usr.sbin/acpi/amldb/aml/aml_parse.c,v 1.7 2001/10/23 14:54:15 takawata Exp $
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: aml_parse.c,v 1.2 2011/05/30 01:15:30 dyoung Exp $");
+__RCSID("$NetBSD: aml_parse.c,v 1.3 2011/06/21 09:36:46 mrg Exp $");
 
 #include <sys/param.h>
 
@@ -798,7 +798,7 @@
 	aml_print_namestring(name = aml_parse_namestring(env));
 	fieldtemplate.type = aml_t_field;
 	flags = aml_parse_bytedata(env);
-	fieldtemplate.flags = fieldtemplate.flags = flags;
+	fieldtemplate.flags = flags;
 
 	*copy = *env;
 	env->dp = copy->end = start + pkglength;