Module Name: src
Committed By: christos
Date: Mon Mar 24 19:57:47 UTC 2014
Modified Files:
src/sys/arch/next68k/next68k: disksubr.c
Log Message:
fix memset bugs
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/next68k/next68k/disksubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/next68k/next68k/disksubr.c
diff -u src/sys/arch/next68k/next68k/disksubr.c:1.25 src/sys/arch/next68k/next68k/disksubr.c:1.26
--- src/sys/arch/next68k/next68k/disksubr.c:1.25 Mon Mar 16 19:11:13 2009
+++ src/sys/arch/next68k/next68k/disksubr.c Mon Mar 24 15:57:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.25 2009/03/16 23:11:13 dsl Exp $ */
+/* $NetBSD: disksubr.c,v 1.26 2014/03/24 19:57:47 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.25 2009/03/16 23:11:13 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.26 2014/03/24 19:57:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -171,7 +171,7 @@ build_nextstep_label(struct next68k_disk
unsigned short *checksum;
- memset (ondisk, 0, sizeof (ondisk));
+ memset (ondisk, 0, sizeof (*ondisk));
ondisk->cd_version = NEXT68K_LABEL_CD_V3;
/* ondisk->cd_label_blkno = 0; */
@@ -272,7 +272,7 @@ build_nextstep_label(struct next68k_disk
p->cp_minfree = 5; /* set some default */
p->cp_cpg = lp->d_partitions[nbp].p_cpg;
} else {
- memset (p, 0, sizeof(p));
+ memset (p, 0, sizeof(*p);
p->cp_size = -1;
p->cp_offset = -1;
p->cp_bsize = -1;