diff options
| author |   krw <krw@openbsd.org> | 2003-04-06 15:28:25 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2003-04-06 15:28:25 +0000 |
| commit | bf3a687057b8d27ba557c320d9f5e41f4973d355 (patch) | |
| tree | efa6fc2302492cbbc6614cc12f9489df0b8bdb3c /sys/dev | |
| parent | strcat->strlcat, ho@ ok (diff) | |
| download | wireguard-openbsd-bf3a687057b8d27ba557c320d9f5e41f4973d355.tar.xz wireguard-openbsd-bf3a687057b8d27ba557c320d9f5e41f4973d355.zip | |
Some easy strcpy elimination.
a) strcpy -> strncpy for copies into disklabel fields d_packname and
d_typename.
b) '16' -> 'sizeof d_packname' or 'sizeof d_typename' in existing
strncpy's.
ok millert@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ata/wd.c | 8 | ||||
| -rw-r--r-- | sys/dev/isa/fd.c | 6 | ||||
| -rw-r--r-- | sys/dev/isa/mcd.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index 49eb0199795..f5c52ef6845 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wd.c,v 1.27 2003/02/21 20:10:33 grange Exp $ */ +/* $OpenBSD: wd.c,v 1.28 2003/04/06 15:28:25 krw Exp $ */ /* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */ /* @@ -864,13 +864,13 @@ wdgetdefaultlabel(wd, lp) lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors; if (wd->drvp->ata_vers == -1) { lp->d_type = DTYPE_ST506; - strncpy(lp->d_typename, "ST506/MFM/RLL", 16); + strncpy(lp->d_typename, "ST506/MFM/RLL", sizeof lp->d_typename); } else { lp->d_type = DTYPE_ESDI; - strncpy(lp->d_typename, "ESDI/IDE disk", 16); + strncpy(lp->d_typename, "ESDI/IDE disk", sizeof lp->d_typename); } /* XXX - user viscopy() like sd.c */ - strncpy(lp->d_packname, wd->sc_params.atap_model, 16); + strncpy(lp->d_packname, wd->sc_params.atap_model, sizeof lp->d_packname); lp->d_secperunit = wd->sc_capacity; lp->d_rpm = 3600; lp->d_interleave = 1; diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index 3b371f21324..039e11cdc77 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.45 2002/05/24 13:31:10 art Exp $ */ +/* $OpenBSD: fd.c,v 1.46 2003/04/06 15:28:25 krw Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -987,9 +987,9 @@ fdioctl(dev, cmd, addr, flag, p) lp->d_nsectors = fd->sc_type->sectrac; lp->d_ncylinders = fd->sc_type->tracks; - strncpy(lp->d_typename, "floppy disk", 16); + strncpy(lp->d_typename, "floppy disk", sizeof lp->d_typename); lp->d_type = DTYPE_FLOPPY; - strncpy(lp->d_packname, "fictitious", 16); + strncpy(lp->d_packname, "fictitious", sizeof lp->d_packname); lp->d_secperunit = fd->sc_type->size; lp->d_rpm = 300; lp->d_interleave = 1; diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c index 898dafba85c..e8f3a57205a 100644 --- a/sys/dev/isa/mcd.c +++ b/sys/dev/isa/mcd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcd.c,v 1.31 2002/05/24 13:31:11 art Exp $ */ +/* $OpenBSD: mcd.c,v 1.32 2003/04/06 15:28:25 krw Exp $ */ /* $NetBSD: mcd.c,v 1.60 1998/01/14 12:14:41 drochner Exp $ */ /* @@ -738,9 +738,9 @@ mcdgetdisklabel(dev, sc, lp, clp, spoofonly) /* as long as it's not 0 - readdisklabel divides by it */ } - strncpy(lp->d_typename, "Mitsumi CD-ROM", 16); + strncpy(lp->d_typename, "Mitsumi CD-ROM", sizeof lp->d_typename); lp->d_type = DTYPE_SCSI; /* XXX */ - strncpy(lp->d_packname, "fictitious", 16); + strncpy(lp->d_packname, "fictitious", sizeof lp->d_packname); lp->d_secperunit = sc->disksize; lp->d_rpm = 300; lp->d_interleave = 1; |