From adaf748ab6e779fdf53706448bb31718f098f6d5 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Thu, 4 Mar 2021 09:00:34 +1100 Subject: Fix include file ordering of generic headers --- generic/hostname.h | 1 + generic/openzfs_sysctl.h | 1 + generic/uname.c | 9 +++++---- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'generic') diff --git a/generic/hostname.h b/generic/hostname.h index c6b941e8..32f0c461 100644 --- a/generic/hostname.h +++ b/generic/hostname.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include + void Generic_hostname(char* buffer, size_t size); #endif diff --git a/generic/openzfs_sysctl.h b/generic/openzfs_sysctl.h index 4cf5485e..dab13051 100644 --- a/generic/openzfs_sysctl.h +++ b/generic/openzfs_sysctl.h @@ -9,6 +9,7 @@ in the source distribution for its full text. #include "zfs/ZfsArcStats.h" + void openzfs_sysctl_init(ZfsArcStats* stats); void openzfs_sysctl_updateArcStats(ZfsArcStats* stats); diff --git a/generic/uname.c b/generic/uname.c index 5b4fb2cf..ecde11e1 100644 --- a/generic/uname.c +++ b/generic/uname.c @@ -61,18 +61,19 @@ static void parseOSRelease(char* buffer, size_t bufferLen) { snprintf(buffer, bufferLen, "%s%s%s", name[0] ? name : "", name[0] && version[0] ? " " : "", version); } - + char* Generic_uname(void) { static char savedString[ /* uname structure fields - manpages recommend sizeof */ - sizeof(uname_info.sysname) + - sizeof(uname_info.release) + - sizeof(uname_info.machine) + + sizeof(((struct utsname*)0)->sysname) + + sizeof(((struct utsname*)0)->release) + + sizeof(((struct utsname*)0)->machine) + 16/*markup*/ + 128/*distro*/] = {'\0'}; static bool loaded_data = false; if (!loaded_data) { + struct utsname uname_info; int uname_result = uname(&uname_info); char distro[128]; -- cgit v1.2.3