bfstd: Fix declaration order to match the right standard headers

1 files changed, 74 insertions, 74 deletions

diff --git a/src/bfstd.c b/src/bfstd.c
index 437e9c9..bc31288 100644
--- a/src/bfstd.c
+++ b/src/bfstd.c
@@ -82,20 +82,6 @@ size_t xbaseoff(const char *path) {
 	return i;
 }
 
-void close_quietly(int fd) {
-	int error = errno;
-	xclose(fd);
-	errno = error;
-}
-
-int xclose(int fd) {
-	int ret = close(fd);
-	if (ret != 0) {
-		assert(errno != EBADF);
-	}
-	return ret;
-}
-
 FILE *xfopen(const char *path, int flags) {
 	char mode[4];
 
@@ -157,52 +143,6 @@ char *xgetdelim(FILE *file, char delim) {
 	}
 }
 
-size_t xread(int fd, void *buf, size_t nbytes) {
-	size_t count = 0;
-
-	while (count < nbytes) {
-		ssize_t ret = read(fd, (char *)buf + count, nbytes - count);
-		if (ret < 0) {
-			if (errno == EINTR) {
-				continue;
-			} else {
-				break;
-			}
-		} else if (ret == 0) {
-			// EOF
-			errno = 0;
-			break;
-		} else {
-			count += ret;
-		}
-	}
-
-	return count;
-}
-
-size_t xwrite(int fd, const void *buf, size_t nbytes) {
-	size_t count = 0;
-
-	while (count < nbytes) {
-		ssize_t ret = write(fd, (const char *)buf + count, nbytes - count);
-		if (ret < 0) {
-			if (errno == EINTR) {
-				continue;
-			} else {
-				break;
-			}
-		} else if (ret == 0) {
-			// EOF?
-			errno = 0;
-			break;
-		} else {
-			count += ret;
-		}
-	}
-
-	return count;
-}
-
 /** Compile and execute a regular expression for xrpmatch(). */
 static int xrpregex(nl_item item, const char *response) {
 	const char *pattern = nl_langinfo(item);
@@ -398,6 +338,80 @@ int pipe_cloexec(int pipefd[2]) {
 #endif
 }
 
+size_t xread(int fd, void *buf, size_t nbytes) {
+	size_t count = 0;
+
+	while (count < nbytes) {
+		ssize_t ret = read(fd, (char *)buf + count, nbytes - count);
+		if (ret < 0) {
+			if (errno == EINTR) {
+				continue;
+			} else {
+				break;
+			}
+		} else if (ret == 0) {
+			// EOF
+			errno = 0;
+			break;
+		} else {
+			count += ret;
+		}
+	}
+
+	return count;
+}
+
+size_t xwrite(int fd, const void *buf, size_t nbytes) {
+	size_t count = 0;
+
+	while (count < nbytes) {
+		ssize_t ret = write(fd, (const char *)buf + count, nbytes - count);
+		if (ret < 0) {
+			if (errno == EINTR) {
+				continue;
+			} else {
+				break;
+			}
+		} else if (ret == 0) {
+			// EOF?
+			errno = 0;
+			break;
+		} else {
+			count += ret;
+		}
+	}
+
+	return count;
+}
+
+void close_quietly(int fd) {
+	int error = errno;
+	xclose(fd);
+	errno = error;
+}
+
+int xclose(int fd) {
+	int ret = close(fd);
+	if (ret != 0) {
+		assert(errno != EBADF);
+	}
+	return ret;
+}
+
+int xfaccessat(int fd, const char *path, int amode) {
+	int ret = faccessat(fd, path, amode, 0);
+
+#ifdef AT_EACCESS
+	// Some platforms, like Hurd, only support AT_EACCESS.  Other platforms,
+	// like Android, don't support AT_EACCESS at all.
+	if (ret != 0 && (errno == EINVAL || errno == ENOTSUP)) {
+		ret = faccessat(fd, path, amode, AT_EACCESS);
+	}
+#endif
+
+	return ret;
+}
+
 char *xconfstr(int name) {
 #if __ANDROID__
 	errno = ENOTSUP;
@@ -422,20 +436,6 @@ char *xconfstr(int name) {
 #endif // !__ANDROID__
 }
 
-int xfaccessat(int fd, const char *path, int amode) {
-	int ret = faccessat(fd, path, amode, 0);
-
-#ifdef AT_EACCESS
-	// Some platforms, like Hurd, only support AT_EACCESS.  Other platforms,
-	// like Android, don't support AT_EACCESS at all.
-	if (ret != 0 && (errno == EINVAL || errno == ENOTSUP)) {
-		ret = faccessat(fd, path, amode, AT_EACCESS);
-	}
-#endif
-
-	return ret;
-}
-
 char *xreadlinkat(int fd, const char *path, size_t size) {
 	ssize_t len;
 	char *name = NULL;