logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0009-Avoid-unnecessary-VLA.patch (1524B)

    

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