From b0a144fd5406d20d7a027ada31c0dbcaa8c93893 Mon Sep 17 00:00:00 2001
From: Andrew Wood <ivarch657@gmail.com>
Date: Mon, 25 Sep 2023 21:14:30 +0100
Subject: [PATCH] Move variable declarations into the blocks in which they are
 used, to avoid compilation warnings on MacOS, as per patch from Benoit
 Pierre.

---
 src/pv/watchpid.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pv/watchpid.c b/src/pv/watchpid.c
index f042f86..2e3c02c 100644
--- a/src/pv/watchpid.c
+++ b/src/pv/watchpid.c
@@ -214,7 +214,6 @@ int pv_watchfd_changed(pvwatchfd_t info)
 off_t pv_watchfd_position(pvwatchfd_t info)
 {
 	off_t position;
-	unsigned long long pos_long;
 #ifdef __APPLE__
 	struct vnode_fdinfowithpath vnodeInfo = { };
 	int32_t proc_fd = (int32_t) info->watch_fd;
@@ -228,6 +227,7 @@ off_t pv_watchfd_position(pvwatchfd_t info)
 
 	position = (off_t) vnodeInfo.pfi.fi_offset;
 #else
+	unsigned long long pos_long;
 	FILE *fptr;
 
 	if (pv_watchfd_changed(info))
@@ -238,8 +238,9 @@ off_t pv_watchfd_position(pvwatchfd_t info)
 		return -1;
 	pos_long = -1;
 	position = -1;
-	if (1 == fscanf(fptr, "pos: %llu", &pos_long))
+	if (1 == fscanf(fptr, "pos: %llu", &pos_long)) {
 		position = (off_t) pos_long;
+	}
 	fclose(fptr);
 #endif
 
@@ -281,7 +282,6 @@ int pv_watchpid_scanfds(pvstate_t state, pvstate_t pristine,
 			unsigned int watch_pid, int *array_length_ptr,
 			pvwatchfd_t * info_array_ptr, pvstate_t * state_array_ptr, int *fd_to_idx)
 {
-	char fd_dir[512] = { 0, };
 	int array_length = 0;
 	struct pvwatchfd_s *info_array = NULL;
 	struct pvstate_s *state_array = NULL;
@@ -295,9 +295,11 @@ int pv_watchpid_scanfds(pvstate_t state, pvstate_t pristine,
 		return -1;
 	}
 #else
+	char fd_dir[512];
 	DIR *dptr;
 	struct dirent *d;
 
+	memset(fd_dir, 0, sizeof(fd_dir));
 	(void) pv_snprintf(fd_dir, sizeof(fd_dir), "/proc/%u/fd", watch_pid);
 
 	dptr = opendir(fd_dir);