Author: smh
Date: Mon Jan 25 10:55:52 2016
New Revision: 294721
URL: https://svnweb.freebsd.org/changeset/base/294721

Log:
  MFC r293461:
  
  Remove hidden "Not ufs" printfs from boot code
  
  Sponsored by: Multiplay

Modified:
  stable/10/sys/boot/common/ufsread.c
  stable/10/sys/boot/efi/boot1/boot1.c
  stable/10/sys/boot/powerpc/boot1.chrp/boot1.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/common/ufsread.c
==============================================================================
--- stable/10/sys/boot/common/ufsread.c Mon Jan 25 10:50:11 2016        
(r294720)
+++ stable/10/sys/boot/common/ufsread.c Mon Jan 25 10:55:52 2016        
(r294721)
@@ -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: stable/10/sys/boot/efi/boot1/boot1.c
==============================================================================
--- stable/10/sys/boot/efi/boot1/boot1.c        Mon Jan 25 10:50:11 2016        
(r294720)
+++ stable/10/sys/boot/efi/boot1/boot1.c        Mon Jan 25 10:55:52 2016        
(r294721)
@@ -249,7 +249,6 @@ fsstat(ufs_ino_t inode)
                                break;
                }
                if (sblock_try[n] == -1) {
-                       printf("Not ufs\n");
                        return -1;
                }
                dsk_meta++;

Modified: stable/10/sys/boot/powerpc/boot1.chrp/boot1.c
==============================================================================
--- stable/10/sys/boot/powerpc/boot1.chrp/boot1.c       Mon Jan 25 10:50:11 
2016        (r294720)
+++ stable/10/sys/boot/powerpc/boot1.chrp/boot1.c       Mon Jan 25 10:55:52 
2016        (r294721)
@@ -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);
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to