Use duid_format() instead of rolling one locally.

ok jsing@ tb@

diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index e616cce..0d79973 100644 (file)
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.389 2017/12/21 07:29:15 tb Exp $ */
+/* $OpenBSD: softraid.c,v 1.390 2018/02/07 06:16:08 krw Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -1532,13 +1532,8 @@ sr_map_root(void)
                                        memcpy(rootduid, sbm->sbm_root_duid,
                                            sizeof(rootduid));
                                        DNPRINTF(SR_D_MISC, "%s: root duid "
-                                           "mapped to %02x%02x%02x%02x"
-                                           "%02x%02x%02x%02x\n",
-                                           DEVNAME(sc), rootduid[0],
-                                           rootduid[1], rootduid[2],
-                                           rootduid[3], rootduid[4],
-                                           rootduid[5], rootduid[6],
-                                           rootduid[7]);
+                                           "mapped to %s\n", DEVNAME(sc),
+                                           duid_format(rootduid));
                                        return;
                                }
                        }
@@ -3760,11 +3755,8 @@ sr_ioctl_installboot(struct sr_softc *sc, struct sr_discipline *sd,
        sbm->sbm_bootblk_size = bbs;
        sbm->sbm_bootldr_size = bls;
 
-       DNPRINTF(SR_D_IOCTL, "sr_ioctl_installboot: root duid is "
-           "%02x%02x%02x%02x%02x%02x%02x%02x\n", sbm->sbm_root_duid[0],
-           sbm->sbm_root_duid[1], sbm->sbm_root_duid[2], sbm->sbm_root_duid[3],
-           sbm->sbm_root_duid[4], sbm->sbm_root_duid[5], sbm->sbm_root_duid[6],
-           sbm->sbm_root_duid[7]);
+       DNPRINTF(SR_D_IOCTL, "sr_ioctl_installboot: root duid is %s\n",
+           duid_format(sbm->sbm_root_duid));
 
        /* Save boot block and boot loader to each chunk. */
        for (i = 0; i < sd->sd_meta->ssdi.ssd_chunk_no; i++) {