https://github.com/brad0 created https://github.com/llvm/llvm-project/pull/74396
Also eliminate an unused variable while here.
>From 2c5e7f0a514132a977a0b12484d47fa7e4dcdc8a Mon Sep 17 00:00:00 2001
From: Brad Smith <b...@comstyle.com>
Date: Mon, 4 Dec 2023 20:05:52 -0500
Subject: [PATCH] [lldb] Sync OpenBSD GetOSVersion() closer to NetBSD function
Also eliminate an unused variable while here.
---
lldb/source/Host/openbsd/HostInfoOpenBSD.cpp | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/lldb/source/Host/openbsd/HostInfoOpenBSD.cpp
b/lldb/source/Host/openbsd/HostInfoOpenBSD.cpp
index 43f22be51ef95..b30c7a83243c0 100644
--- a/lldb/source/Host/openbsd/HostInfoOpenBSD.cpp
+++ b/lldb/source/Host/openbsd/HostInfoOpenBSD.cpp
@@ -20,19 +20,23 @@ using namespace lldb_private;
llvm::VersionTuple HostInfoOpenBSD::GetOSVersion() {
struct utsname un;
- ::memset(&un, 0, sizeof(utsname));
- if (uname(&un) < 0)
+ ::memset(&un, 0, sizeof(un));
+ if (::uname(&un) < 0)
return llvm::VersionTuple();
- unsigned major, minor;
- if (2 == sscanf(un.release, "%u.%u", &major, &minor))
+ uint32_t major, minor;
+ int status = ::sscanf(un.release, "%" PRIu32 ".%" PRIu32, &major, &minor);
+ switch (status) {
+ case 1:
+ return llvm::VersionTuple(major);
+ case 2:
return llvm::VersionTuple(major, minor);
+ }
return llvm::VersionTuple();
}
std::optional<std::string> HostInfoOpenBSD::GetOSBuildString() {
int mib[2] = {CTL_KERN, KERN_OSREV};
- char osrev_str[12];
uint32_t osrev = 0;
size_t osrev_len = sizeof(osrev);
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
