nvmutil: rename x_i_close to close_on_eintr

that's what it does. waits for eintr to stop firing

Signed-off-by: Leah Rowe <leah@libreboot.org>

5 files changed, 13 insertions, 13 deletions

diff --git a/util/nvmutil/include/common.h b/util/nvmutil/include/common.h
index ae805548..e5bad238 100644
--- a/util/nvmutil/include/common.h
+++ b/util/nvmutil/include/common.h
@@ -423,7 +423,7 @@ const char *getnvmprogname(void);
 char *new_tmpfile(int *fd, int local, const char *path);
 int x_i_mkstemp(char *template);
 char *x_c_tmpdir(void);
-int x_i_close(int fd);
+int close_on_eintr(int fd);
 int fsync_on_eintr(int fd);
 
 /* asserts */
diff --git a/util/nvmutil/lib/file.c b/util/nvmutil/lib/file.c
index 338f3837..e3e1ccfe 100644
--- a/util/nvmutil/lib/file.c
+++ b/util/nvmutil/lib/file.c
@@ -150,7 +150,7 @@ fsync_dir(const char *path)
 	if (fsync_on_eintr(dirfd) == -1)
 		goto err_fsync_dir;
 
-	if (x_i_close(dirfd) == -1)
+	if (close_on_eintr(dirfd) == -1)
 		goto err_fsync_dir;
 
 	if (dirbuf != NULL)
@@ -170,7 +170,7 @@ err_fsync_dir:
 		free(dirbuf);
 
 	if (dirfd > -1)
-		x_i_close(dirfd);
+		close_on_eintr(dirfd);
 
 	errno = saved_errno;
 
@@ -367,7 +367,7 @@ err_new_tmpfile:
 		free(dest);
 
 	if (fd_tmp > -1)
-		x_i_close(fd_tmp);
+		close_on_eintr(fd_tmp);
 
 	return NULL;
 }
@@ -901,7 +901,7 @@ try_err(int loop_err, int errval)
 }
 
 int
-x_i_close(int fd)
+close_on_eintr(int fd)
 {
 	int r;
 	int saved_errno = errno;
diff --git a/util/nvmutil/lib/io.c b/util/nvmutil/lib/io.c
index e2db01f4..06fd038f 100644
--- a/util/nvmutil/lib/io.c
+++ b/util/nvmutil/lib/io.c
@@ -246,12 +246,12 @@ write_to_gbe_bin(void)
 
 	saved_errno = errno;
 
-	if (x_i_close(f->tmp_fd) == -1) {
+	if (close_on_eintr(f->tmp_fd) == -1) {
 		fprintf(stderr, "FAIL: %s: close\n", f->tname);
 		f->io_err_gbe_bin = 1;
 	}
 
-	if (x_i_close(f->gbe_fd) == -1) {
+	if (close_on_eintr(f->gbe_fd) == -1) {
 		fprintf(stderr, "FAIL: %s: close\n", f->fname);
 		f->io_err_gbe_bin = 1;
 	}
@@ -487,7 +487,7 @@ gbe_mv(void)
 	if (fsync_on_eintr(dest_fd) == -1)
 		goto ret_gbe_mv;
 
-	if (x_i_close(dest_fd) == -1)
+	if (close_on_eintr(dest_fd) == -1)
 		goto ret_gbe_mv;
 
 	if (rename(dest_tmp, f->fname) == -1)
@@ -504,7 +504,7 @@ gbe_mv(void)
 ret_gbe_mv:
 
 	if (f->gbe_fd > -1) {
-		if (x_i_close(f->gbe_fd) < 0)
+		if (close_on_eintr(f->gbe_fd) < 0)
 			rval = -1;
 		if (fsync_dir(f->fname) < 0) {
 			f->io_err_gbe_bin = 1;
@@ -514,7 +514,7 @@ ret_gbe_mv:
 	}
 
 	if (f->tmp_fd > -1) {
-		if (x_i_close(f->tmp_fd) < 0)
+		if (close_on_eintr(f->tmp_fd) < 0)
 			rval = -1;
 
 		f->tmp_fd = -1;
diff --git a/util/nvmutil/lib/num.c b/util/nvmutil/lib/num.c
index 1ee8505d..0442b86c 100644
--- a/util/nvmutil/lib/num.c
+++ b/util/nvmutil/lib/num.c
@@ -80,7 +80,7 @@ rlong(void)
 	    sizeof(unsigned long), 0, IO_READ, LOOP_EAGAIN,
 	    LOOP_EINTR, MAX_ZERO_RW_RETRY, OFF_ERR);
 
-	if (x_i_close(fd) < 0)
+	if (close_on_eintr(fd) < 0)
 		err(errno, "Can't close randomness fd");
 
 	if (nr != sizeof(unsigned long))
diff --git a/util/nvmutil/lib/state.c b/util/nvmutil/lib/state.c
index 55d2deea..946b8919 100644
--- a/util/nvmutil/lib/state.c
+++ b/util/nvmutil/lib/state.c
@@ -260,13 +260,13 @@ exit_cleanup(void)
 		f = &x->f;
 
 		if (f->gbe_fd > -1) {
-			if (x_i_close(f->gbe_fd) == -1)
+			if (close_on_eintr(f->gbe_fd) == -1)
 				close_err = 1;
 			f->gbe_fd = -1;
 		}
 
 		if (f->tmp_fd > -1) {
-			if (x_i_close(f->tmp_fd) == -1)
+			if (close_on_eintr(f->tmp_fd) == -1)
 				close_err = 1;
 		}