Module Name: src
Committed By: reinoud
Date: Mon Aug 5 16:44:58 UTC 2013
Modified Files:
src/sbin/newfs_udf: udf_create.c udf_write.c
Log Message:
Fix memset() arguments to use the right type for sizeof() and streamline its
use of sizeof() to allways use the right type.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sbin/newfs_udf/udf_create.c
cvs rdiff -u -r1.3 -r1.4 src/sbin/newfs_udf/udf_write.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs_udf/udf_create.c
diff -u src/sbin/newfs_udf/udf_create.c:1.18 src/sbin/newfs_udf/udf_create.c:1.19
--- src/sbin/newfs_udf/udf_create.c:1.18 Mon Aug 5 14:11:30 2013
+++ src/sbin/newfs_udf/udf_create.c Mon Aug 5 16:44:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_create.c,v 1.18 2013/08/05 14:11:30 reinoud Exp $ */
+/* $NetBSD: udf_create.c,v 1.19 2013/08/05 16:44:58 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: udf_create.c,v 1.18 2013/08/05 14:11:30 reinoud Exp $");
+__RCSID("$NetBSD: udf_create.c,v 1.19 2013/08/05 16:44:58 reinoud Exp $");
#endif /* not lint */
#include <stdio.h>
@@ -1550,7 +1550,7 @@ udf_create_fid(uint32_t diroff, struct f
uint32_t endfid;
uint32_t fidsize, lb_rest;
- memset(fid, 0, sizeof(struct fileid_desc *));
+ memset(fid, 0, sizeof(*fid));
udf_inittag(&fid->tag, TAGID_FID, udf_rw32(ref->loc.lb_num));
fid->file_version_num = udf_rw16(1); /* UDF 2.3.4.1 */
fid->file_char = file_char;
@@ -1993,7 +1993,7 @@ udf_append_meta_mapping_to_efe(struct ex
max_len = (max_len / layout.meta_blockingnr) * layout.meta_blockingnr;
max_len = max_len * context.sector_size;
- memset(&mapping, 0, sizeof(struct short_ad));
+ memset(&mapping, 0, sizeof(mapping));
while (len) {
part_len = MIN(len, max_len);
mapping.lb_num = udf_rw32(lb_num);
@@ -2227,7 +2227,7 @@ udf_create_VAT(union dscrptr **vat_dscr)
assert((layout.rootdir < 2) && (layout.fsd < 2));
- memset(&dataloc, 0, sizeof(struct long_ad));
+ memset(&dataloc, 0, sizeof(dataloc));
dataloc.len = udf_rw32(context.vat_size);
dataloc.loc.part_num = udf_rw16(context.data_part);
dataloc.loc.lb_num = udf_rw32(layout.vat);
Index: src/sbin/newfs_udf/udf_write.c
diff -u src/sbin/newfs_udf/udf_write.c:1.3 src/sbin/newfs_udf/udf_write.c:1.4
--- src/sbin/newfs_udf/udf_write.c:1.3 Mon Aug 5 14:11:30 2013
+++ src/sbin/newfs_udf/udf_write.c Mon Aug 5 16:44:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_write.c,v 1.3 2013/08/05 14:11:30 reinoud Exp $ */
+/* $NetBSD: udf_write.c,v 1.4 2013/08/05 16:44:58 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: udf_write.c,v 1.3 2013/08/05 14:11:30 reinoud Exp $");
+__RCSID("$NetBSD: udf_write.c,v 1.4 2013/08/05 16:44:58 reinoud Exp $");
#endif /* not lint */
#define _EXPOSE_MMC
@@ -127,7 +127,7 @@ udf_write_dscr_virt(union dscrptr *dscr,
void
udf_metadata_alloc(int nblk, struct long_ad *pos)
{
- memset(pos, 0, sizeof(struct long_ad));
+ memset(pos, 0, sizeof(*pos));
pos->len = udf_rw32(nblk * context.sector_size);
pos->loc.lb_num = udf_rw32(context.metadata_alloc_pos);
pos->loc.part_num = udf_rw16(context.metadata_part);
@@ -144,7 +144,7 @@ udf_metadata_alloc(int nblk, struct long
void
udf_data_alloc(int nblk, struct long_ad *pos)
{
- memset(pos, 0, sizeof(struct long_ad));
+ memset(pos, 0, sizeof(*pos));
pos->len = udf_rw32(nblk * context.sector_size);
pos->loc.lb_num = udf_rw32(context.data_alloc_pos);
pos->loc.part_num = udf_rw16(context.data_part);
