From 0850b0cc3cd9d21b48692b898749ea92fac6f2d1 Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 19 Dec 2013 23:00:50 +0000 Subject: [PATCH] long_ad is a mix of struct and union, so use memset to initialise in the one place it is used. --- usr.sbin/makefs/udf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.sbin/makefs/udf.c b/usr.sbin/makefs/udf.c index a647636891f5..de05fc1f4967 100644 --- a/usr.sbin/makefs/udf.c +++ b/usr.sbin/makefs/udf.c @@ -1,4 +1,4 @@ -/* $NetBSD: udf.c,v 1.15 2013/12/19 22:10:03 christos Exp $ */ +/* $NetBSD: udf.c,v 1.16 2013/12/19 23:00:50 joerg Exp $ */ /* * Copyright (c) 2006, 2008, 2013 Reinoud Zandijk @@ -30,7 +30,7 @@ #endif #include -__RCSID("$NetBSD: udf.c,v 1.15 2013/12/19 22:10:03 christos Exp $"); +__RCSID("$NetBSD: udf.c,v 1.16 2013/12/19 23:00:50 joerg Exp $"); #include #include @@ -842,7 +842,7 @@ udf_estimate_walk(fsinfo_t *fsopts, fsnode *root, char *dir, struct udf_stats *stats) { struct fileid_desc *fid; - struct long_ad dummy_ref = { 0 }; + struct long_ad dummy_ref; fsnode *cur; fsinode *fnode; size_t pathlen = strlen(dir); @@ -881,6 +881,7 @@ udf_estimate_walk(fsinfo_t *fsopts, case S_IFLNK: case S_IFREG: /* create dummy FID to see how long name will become */ + memset(&dummy_ref, 0, sizeof(dummy_ref)); udf_create_fid(ddoff, fid, cur->name, 0, &dummy_ref); nentries++;