[gentoo-commits] gentoo-projects commit in portage-utils: qmerge.c qcheck.c

[gentoo-commits] gentoo-projects commit in portage-utils: qmerge.c qcheck.c

[Mike Frysinger (vapier)]

vapier      11/12/19 04:23:18

  Modified:             qmerge.c qcheck.c
  Log:
  add braces to fix -Wempty-body gcc warnings

Revision  Changes    Path
1.114                portage-utils/qmerge.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?rev=1.114&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?rev=1.114&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?r1=1.113&r2=1.114

Index: qmerge.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- qmerge.c	18 Dec 2011 20:41:54 -0000	1.113
+++ qmerge.c	19 Dec 2011 04:23:18 -0000	1.114
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.113 2011/12/18 20:41:54 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.114 2011/12/19 04:23:18 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2010 Mike Frysinger  - <vapier@gentoo.org>
@@ -65,7 +65,7 @@
 	COMMON_OPTS_HELP
 };
 
-static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.113 2011/12/18 20:41:54 vapier Exp $";
+static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.114 2011/12/19 04:23:18 vapier Exp $";
 #define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, lookup_applet_idx("qmerge"))
 
 char search_pkgs = 0;
@@ -591,8 +591,9 @@
 			/* Do the actual data copy */
 			if (copy_file_fd(fd_srcf, fd_dstf)) {
 				warnp("could not write %s", cpath);
-				if (ftruncate(fd_dstf, 0))
+				if (ftruncate(fd_dstf, 0)) {
 					/* don't care */;
+				}
 				close(fd_srcf);
 				close(fd_dstf);
 				continue;



1.55                 portage-utils/qcheck.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qcheck.c?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qcheck.c?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qcheck.c?r1=1.54&r2=1.55

Index: qcheck.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qcheck.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- qcheck.c	18 Dec 2011 20:21:15 -0000	1.54
+++ qcheck.c	19 Dec 2011 04:23:18 -0000	1.55
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2011 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcheck.c,v 1.54 2011/12/18 20:21:15 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcheck.c,v 1.55 2011/12/19 04:23:18 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2011 Mike Frysinger  - <vapier@gentoo.org>
@@ -34,7 +34,7 @@
 	"Undo prelink when calculating checksums",
 	COMMON_OPTS_HELP
 };
-static const char qcheck_rcsid[] = "$Id: qcheck.c,v 1.54 2011/12/18 20:21:15 vapier Exp $";
+static const char qcheck_rcsid[] = "$Id: qcheck.c,v 1.55 2011/12/19 04:23:18 vapier Exp $";
 #define qcheck_usage(ret) usage(ret, QCHECK_FLAGS, qcheck_long_opts, qcheck_opts_help, lookup_applet_idx("qcheck"))
 
 #define qcprintf(fmt, args...) if (!state->bad_only) printf(_(fmt), ## args)
@@ -232,10 +232,12 @@
 	fclose(fp);
 
 	if (state->qc_update) {
-		if (fchown(fd, cst.st_uid, cst.st_gid))
+		if (fchown(fd, cst.st_uid, cst.st_gid)) {
 			/* meh */;
-		if (fchmod(fd, cst.st_mode))
+		}
+		if (fchmod(fd, cst.st_mode)) {
 			/* meh */;
+		}
 		fclose(fpx);
 		if (renameat(pkg_ctx->fd, "CONTENTS~", pkg_ctx->fd, "CONTENTS"))
 			unlinkat(pkg_ctx->fd, "CONTENTS~", 0);