diff options
| author | christos <christos@NetBSD.org> | 2016-05-02 19:18:29 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2016-05-02 19:18:29 +0000 |
| commit | d591b4e8741370bd42e79d22ed4da3f966edb669 (patch) | |
| tree | 569fca075f4a14393f3a043c914a43f8ba82b500 /sys/dev/ata | |
| parent | 0da5af96a0e50d94b3caf3b0f7da1563aeb673af (diff) | |
move scsipi_strvis -> libkern:strnvisx()
change the prototype to match userland
fix sizes of strings passed to it
Diffstat (limited to 'sys/dev/ata')
| -rw-r--r-- | sys/dev/ata/ld_ataraid.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/ata/ld_ataraid.c b/sys/dev/ata/ld_ataraid.c index a2fff4c6b82..afed62ae8f0 100644 --- a/sys/dev/ata/ld_ataraid.c +++ b/sys/dev/ata/ld_ataraid.c @@ -1,4 +1,4 @@ -/* $NetBSD: ld_ataraid.c,v 1.40 2015/04/13 16:33:24 riastradh Exp $ */ +/* $NetBSD: ld_ataraid.c,v 1.41 2016/05/02 19:18:29 christos Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.40 2015/04/13 16:33:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.41 2016/05/02 19:18:29 christos Exp $"); #include "bio.h" @@ -698,12 +698,12 @@ ld_ataraid_biodisk(struct ld_ataraid_softc *sc, struct bioc_disk *bd) strlcpy(bd->bd_procdev, device_xname(adi->adi_dev), sizeof(bd->bd_procdev)); - scsipi_strvis(serial, sizeof(serial), wd->sc_params.atap_serial, - sizeof(wd->sc_params.atap_serial)); - scsipi_strvis(model, sizeof(model), wd->sc_params.atap_model, - sizeof(wd->sc_params.atap_model)); - scsipi_strvis(rev, sizeof(rev), wd->sc_params.atap_revision, - sizeof(wd->sc_params.atap_revision)); + strnvisx(serial, sizeof(serial), wd->sc_params.atap_serial, + sizeof(wd->sc_params.atap_serial), VIS_TRIM|VIS_SAFE|VIS_OCTAL); + strnvisx(model, sizeof(model), wd->sc_params.atap_model, + sizeof(wd->sc_params.atap_model), VIS_TRIM|VIS_SAFE|VIS_OCTAL); + strnvisx(rev, sizeof(rev), wd->sc_params.atap_revision, + sizeof(wd->sc_params.atap_revision), VIS_TRIM|VIS_SAFE|VIS_OCTAL); snprintf(bd->bd_vendor, sizeof(bd->bd_vendor), "%s %s", model, rev); strlcpy(bd->bd_serial, serial, sizeof(bd->bd_serial)); |
