src/shared: import more code cleanups from upstream

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/shared/util.h b/src/shared/util.h
index 4d05224542..dd1c515f90 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -148,8 +148,8 @@ char *strnappend(const char *s, const char *suffix, size_t length);
 
 char *truncate_nl(char *s);
 
-char octchar(int x) _const_;
 char hexchar(int x) _const_;
+char octchar(int x) _const_;
 
 char *cescape(const char *s);
 char *xescape(const char *s, const char *bad);
@@ -229,8 +229,6 @@ bool null_or_empty(struct stat *st) _pure_;
 int null_or_empty_path(const char *fn);
 int null_or_empty_fd(int fd);
 
-int execute_command(const char *command, char *const argv[]);
-
 bool nulstr_contains(const char*nulstr, const char *needle);
 
 char *strjoin(const char *x, ...) _sentinel_;
@@ -368,3 +366,5 @@ union file_handle_union {
 };
 
 char *tempfn_xxxxxx(const char *p);
+
+int execute_command(const char *command, char *const argv[]);