Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 17 Oct 2016 18:52:25 +0000 (UTC)
From:      Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r307527 - in stable/11/sys/boot: fdt uboot/lib
Message-ID:  <201610171852.u9HIqPt2077370@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: gonzo
Date: Mon Oct 17 18:52:25 2016
New Revision: 307527
URL: https://svnweb.freebsd.org/changeset/base/307527

Log:
  MFC r302465:
  
  Remove extra 0x before %p format strings introduced by r296182

Modified:
  stable/11/sys/boot/fdt/fdt_loader_cmd.c
  stable/11/sys/boot/uboot/lib/elf_freebsd.c
  stable/11/sys/boot/uboot/lib/glue.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/boot/fdt/fdt_loader_cmd.c
==============================================================================
--- stable/11/sys/boot/fdt/fdt_loader_cmd.c	Mon Oct 17 18:14:31 2016	(r307526)
+++ stable/11/sys/boot/fdt/fdt_loader_cmd.c	Mon Oct 17 18:52:25 2016	(r307527)
@@ -421,7 +421,7 @@ fdt_setup_fdtp()
 	/* If we were given the address of a valid blob in memory, use it. */
 	if (fdt_to_load != NULL) {
 		if (fdt_load_dtb_addr(fdt_to_load) == 0) {
-			printf("Using DTB from memory address 0x%p.\n",
+			printf("Using DTB from memory address %p.\n",
 			    fdt_to_load);
 			return (0);
 		}

Modified: stable/11/sys/boot/uboot/lib/elf_freebsd.c
==============================================================================
--- stable/11/sys/boot/uboot/lib/elf_freebsd.c	Mon Oct 17 18:14:31 2016	(r307526)
+++ stable/11/sys/boot/uboot/lib/elf_freebsd.c	Mon Oct 17 18:52:25 2016	(r307527)
@@ -85,7 +85,7 @@ __elfN(uboot_exec)(struct preloaded_file
 		return (error);
 
 	entry = (void *)e->e_entry;
-	printf("Kernel entry at 0x%p...\n", entry);
+	printf("Kernel entry at %p...\n", entry);
 
 	dev_cleanup();
 	printf("Kernel args: %s\n", fp->f_args);

Modified: stable/11/sys/boot/uboot/lib/glue.c
==============================================================================
--- stable/11/sys/boot/uboot/lib/glue.c	Mon Oct 17 18:14:31 2016	(r307526)
+++ stable/11/sys/boot/uboot/lib/glue.c	Mon Oct 17 18:52:25 2016	(r307527)
@@ -469,7 +469,7 @@ ub_dump_di(int handle)
 	int i;
 
 	printf("device info (%d):\n", handle);
-	printf("  cookie\t= 0x%p\n", di->cookie);
+	printf("  cookie\t= %p\n", di->cookie);
 	printf("  type\t\t= 0x%08x\n", di->type);
 
 	if (di->type == DEV_TYP_NET) {

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