Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 9 Jan 2016 03:30:33 +0000 (UTC)
From:      Steven Hartland <smh@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r293461 - in head/sys/boot: common efi/boot1 powerpc/boot1.chrp
Message-ID:  <201601090330.u093UXYt096900@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: smh
Date: Sat Jan  9 03:30:33 2016
New Revision: 293461
URL: https://svnweb.freebsd.org/changeset/base/293461

Log:
  Remove hidden "Not ufs" printfs from boot code
  
  Remove the printf("Not ufs\n") from the boot code which was hidden by the
  local printf implementations, allowing these to have that code removed too.
  
  MFC after:	2 weeks
  X-MFC-With:	r293268
  Sponsored by:	Multiplay

Modified:
  head/sys/boot/common/ufsread.c
  head/sys/boot/efi/boot1/boot1.c
  head/sys/boot/powerpc/boot1.chrp/boot1.c

Modified: head/sys/boot/common/ufsread.c
==============================================================================
--- head/sys/boot/common/ufsread.c	Sat Jan  9 03:20:01 2016	(r293460)
+++ head/sys/boot/common/ufsread.c	Sat Jan  9 03:30:33 2016	(r293461)
@@ -211,7 +211,6 @@ fsread(ufs_ino_t inode, void *buf, size_
 				break;
 		}
 		if (sblock_try[n] == -1) {
-			printf("Not ufs\n");
 			return -1;
 		}
 		dsk_meta++;

Modified: head/sys/boot/efi/boot1/boot1.c
==============================================================================
--- head/sys/boot/efi/boot1/boot1.c	Sat Jan  9 03:20:01 2016	(r293460)
+++ head/sys/boot/efi/boot1/boot1.c	Sat Jan  9 03:30:33 2016	(r293461)
@@ -198,7 +198,6 @@ fsstat(ufs_ino_t inode)
 				break;
 		}
 		if (sblock_try[n] == -1) {
-			printf("Not ufs\n");
 			return -1;
 		}
 		dsk_meta++;

Modified: head/sys/boot/powerpc/boot1.chrp/boot1.c
==============================================================================
--- head/sys/boot/powerpc/boot1.chrp/boot1.c	Sat Jan  9 03:20:01 2016	(r293460)
+++ head/sys/boot/powerpc/boot1.chrp/boot1.c	Sat Jan  9 03:30:33 2016	(r293461)
@@ -564,10 +564,6 @@ printf(const char *fmt, ...)
 	va_list ap;
 	int ret;
 
-	/* Don't annoy the user as we probe for partitions */
-	if (strcmp(fmt,"Not ufs\n") == 0)
-		return 0;
-
 	va_start(ap, fmt);
 	ret = vprintf(fmt, ap);
 	va_end(ap);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601090330.u093UXYt096900>