Module Name: src Committed By: christos Date: Tue Nov 21 16:31:37 UTC 2017
Modified Files: src/sbin/raidctl: rf_configure.c Log Message: Avoid needless pointer calisthenics: &foo[0] -> foo To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sbin/raidctl/rf_configure.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/raidctl/rf_configure.c diff -u src/sbin/raidctl/rf_configure.c:1.30 src/sbin/raidctl/rf_configure.c:1.31 --- src/sbin/raidctl/rf_configure.c:1.30 Tue Nov 21 11:19:31 2017 +++ src/sbin/raidctl/rf_configure.c Tue Nov 21 11:31:37 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: rf_configure.c,v 1.30 2017/11/21 16:19:31 kre Exp $ */ +/* $NetBSD: rf_configure.c,v 1.31 2017/11/21 16:31:37 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -49,7 +49,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: rf_configure.c,v 1.30 2017/11/21 16:19:31 kre Exp $"); +__RCSID("$NetBSD: rf_configure.c,v 1.31 2017/11/21 16:31:37 christos Exp $"); #endif @@ -190,7 +190,7 @@ rf_MakeConfig(char *configname, RF_Confi cp = rf_find_non_white(buf, 0); if (!strncmp(cp, "START", sizeof("START") - 1)) break; - (void) strlcpy(&cfgPtr->debugVars[c][0], cp, + (void) strlcpy(cfgPtr->debugVars[c], cp, sizeof(cfgPtr->debugVars[c])); } } @@ -257,7 +257,7 @@ rf_MakeConfig(char *configname, RF_Confi b = buf; } - strlcpy(&cfgPtr->devnames[r][c][0], b, + strlcpy(cfgPtr->devnames[r][c], b, sizeof(cfgPtr->devnames[r][c])); } } @@ -284,7 +284,7 @@ rf_MakeConfig(char *configname, RF_Confi b = buf; } - strlcpy(&cfgPtr->spare_names[r][0], b, + strlcpy(cfgPtr->spare_names[r], b, sizeof(cfgPtr->spare_names[r])); }