Commit d4d3f779 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r351504: 

------------------------------------------------------------------------
r351504 | brad | 2019-01-18 02:36:58 +0100 (Fri, 18 Jan 2019) | 2 lines

Use llvm::VersionTuple instead of manual version marshalling

------------------------------------------------------------------------

llvm-svn: 351536
parent ad1624ff

lldb/include/lldb/Host/openbsd/HostInfoOpenBSD.h

+2 −1
Original line number Diff line number Diff line
@@ -12,12 +12,13 @@ 


#include "lldb/Host/posix/HostInfoPosix.h"

#include "lldb/Utility/FileSpec.h"

#include "llvm/Support/VersionTuple.h"



namespace lldb_private {



class HostInfoOpenBSD : public HostInfoPosix {

public:

  static bool GetOSVersion(uint32_t &major, uint32_t &minor, uint32_t &update);

  static llvm::VersionTuple GetOSVersion();

  static bool GetOSBuildString(std::string &s);

  static bool GetOSKernelDescription(std::string &s);

  static FileSpec GetProgramFileSpec();

lldb/source/Host/openbsd/HostInfoOpenBSD.cpp

+6 −5
Original line number Diff line number Diff line
@@ -17,16 +17,17 @@ 


using namespace lldb_private;



bool HostInfoOpenBSD::GetOSVersion(uint32_t &major, uint32_t &minor,

                                   uint32_t &update) {

llvm::VersionTuple HostInfoOpenBSD::GetOSVersion() {

  struct utsname un;



  ::memset(&un, 0, sizeof(utsname));

  if (uname(&un) < 0)

    return false;

    return llvm::VersionTuple();



  int status = sscanf(un.release, "%u.%u", &major, &minor);

  return status == 2;

  unsigned major, minor;

  if (2 == sscanf(un.release, "%u.%u", &major, &minor))

    return llvm::VersionTuple(major, minor);

  return llvm::VersionTuple();

}



bool HostInfoOpenBSD::GetOSBuildString(std::string &s) {