From 925bd672b370e3904d9a44c765238d01acb79aad Mon Sep 17 00:00:00 2001 From: lukem Date: Thu, 2 Jun 2005 00:13:10 +0000 Subject: [PATCH] Ensure that "setcache " doesn't use random data for "byte2" ("setcache save" DTRT). Found by gcc -Wuninitialized. Appease other -Wuninitialized warnings. --- sbin/scsictl/scsictl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sbin/scsictl/scsictl.c b/sbin/scsictl/scsictl.c index 3e5ecbdc5dad..eb2dbba7607c 100644 --- a/sbin/scsictl/scsictl.c +++ b/sbin/scsictl/scsictl.c @@ -1,4 +1,4 @@ -/* $NetBSD: scsictl.c,v 1.27 2005/02/21 00:29:08 thorpej Exp $ */ +/* $NetBSD: scsictl.c,v 1.28 2005/06/02 00:13:10 lukem Exp $ */ /*- * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ #include #ifndef lint -__RCSID("$NetBSD: scsictl.c,v 1.27 2005/02/21 00:29:08 thorpej Exp $"); +__RCSID("$NetBSD: scsictl.c,v 1.28 2005/06/02 00:13:10 lukem Exp $"); #endif @@ -253,6 +253,8 @@ device_defects(int argc, char *argv[]) errx(1, "unable to allocate defect list"); memset(data, 0, dlen); memset(&cmd, 0, sizeof(cmd)); + defects = 0; + pfunc = NULL; /* determine which defect list(s) to read. */ for (i = 0; i < argc; i++) { @@ -883,6 +885,8 @@ device_setcache(int argc, char *argv[]) if (argc > 2 || argc == 0) usage(); + flags = 0; + byte2 = 0; if (strcmp(argv[0], "none") == 0) flags = CACHING_RCD; else if (strcmp(argv[0], "r") == 0)