1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From fac76bb5a8d1b03db9aa68c3bd72999ce76b8ca5 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sat, 21 Jan 2023 17:41:15 -0800
Subject: [PATCH] Avoid unnecessary VLA
---
cmd/zpool/zpool_vdev.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/cmd/zpool/zpool_vdev.c b/cmd/zpool/zpool_vdev.c
index fbd4b81df..a45ab7af5 100644
--- a/cmd/zpool/zpool_vdev.c
+++ b/cmd/zpool/zpool_vdev.c
@@ -910,8 +910,7 @@ check_replication(nvlist_t *config, nvlist_t *newroot)
static int
zero_label(const char *path)
{
- const int size = 4096;
- char buf[size];
+ char buf[4096];
int err, fd;
if ((fd = open(path, O_WRONLY|O_EXCL)) < 0) {
@@ -920,20 +919,20 @@ zero_label(const char *path)
return (-1);
}
- memset(buf, 0, size);
- err = write(fd, buf, size);
+ memset(buf, 0, sizeof (buf));
+ err = write(fd, buf, sizeof (buf));
(void) fdatasync(fd);
(void) close(fd);
if (err == -1) {
- (void) fprintf(stderr, gettext("cannot zero first %d bytes "
- "of '%s': %s\n"), size, path, strerror(errno));
+ (void) fprintf(stderr, gettext("cannot zero first %zu bytes "
+ "of '%s': %s\n"), sizeof (buf), path, strerror(errno));
return (-1);
}
- if (err != size) {
- (void) fprintf(stderr, gettext("could only zero %d/%d bytes "
- "of '%s'\n"), err, size, path);
+ if (err != sizeof (buf)) {
+ (void) fprintf(stderr, gettext("could only zero %d/%zu bytes "
+ "of '%s'\n"), err, sizeof (buf), path);
return (-1);
}
--
2.37.3
|
