Remove deprecated Gestalt methods.

webrtc/base/macutils.cc

 /*
  *  Copyright 2007 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include <cstring>
 #include <memory>
 #include <sstream>
 
-#include <CoreServices/CoreServices.h>
+#include <sys/utsname.h>
 
 #include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/macutils.h"
 #include "webrtc/base/stringutils.h"
 
 namespace rtc {
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ skipping 38 matching lines @@
   }
   if (printable) {
     ss << '\'';
   } else {
     ss.str("");
     ss << "0x" << std::hex << fc;
   }
   out->append(ss.str());
 }
 
-static bool GetGestalt(OSType ostype, int* value) {
-  ASSERT(NULL != value);
-  SInt32 native_value;
-  OSStatus result = Gestalt(ostype, &native_value);
-  if (noErr == result) {
-    *value = native_value;
-    return true;
-  }
-  std::string str;
-  DecodeFourChar(ostype, &str);
-  LOG_E(LS_ERROR, OS, result) << "Gestalt(" << str << ")";
-  return false;
-}
-
 static bool GetOSVersion(int* major, int* minor, int* bugfix) {
   ASSERT(major && minor && bugfix);
-  if (!GetGestalt(gestaltSystemVersion, major)) {
+  struct utsname uname_info;
+  if (uname(&uname_info) != 0)
     return false;
-  }
-  if (*major < 0x1040) {
-    *bugfix = *major & 0xF;
-    *minor = (*major >> 4) & 0xF;
-    *major = (*major >> 8);
-    return true;
-  }
-  return GetGestalt(gestaltSystemVersionMajor, major) &&
-         GetGestalt(gestaltSystemVersionMinor, minor) &&
-         GetGestalt(gestaltSystemVersionBugFix, bugfix);
+
+  if (strcmp(uname_info.sysname, "Darwin") != 0)
+    return false;
+  *major = 10;
+
+  // The market version of macOS is always 4 lower than the internal version.

[kthelgason, 2016/10/05 18:23:26]

This should not be relied upon. Though there has been a (relatively)
straightforward mapping from kernel version to macOS release version in the
past, there is no reason that should continue to be the case.

[erikchen, 2016/10/05 20:16:35]

-[NSProcessInfo operatingSystemVersion] isn't available until macOS 10.10. This
logic is pretty much the same as what we do in Chrome:
https://cs.chromium.org/chromium/src/base/mac/mac_util.mm?q=mac_util.mm&sq=pa...

Including the "minus four".
https://cs.chromium.org/chromium/src/base/mac/mac_util.mm?q=mac_util.mm&sq=pa...

[Sergey Ulanov, 2016/10/05 23:04:45]

Maybe add CHECK(atoi(uname_info.release) >= 6) here to match the logic that we
have in chrome

[erikchen, 2016/10/05 23:48:43]

Done.

+  *minor = atoi(uname_info.release) - 4;
+
+  char delimiter = '.';
+  const char* dot = strchr(uname_info.release, &delimiter);

[Sergey Ulanov, 2016/10/05 23:04:45]

strchr() takes char as the second argument, but you pass a pointer here.

[erikchen, 2016/10/05 23:48:43]

webrtc uses an inlined strchr that has a different signature:
https://cs.chromium.org/chromium/src/third_party/webrtc/base/stringutils.h?q=...

[Sergey Ulanov, 2016/10/07 00:08:46]

This is a wchar_t version, which I don't think is applicable here. There is also
rtc::strchr():
https://cs.chromium.org/chromium/src/third_party/webrtc/base/stringutils.h?rc...
.
Is that the one being called here? It expects 0-terminated second parameter, and
that's not what's being passed to it.
Maybe change this to ::strchr() to ensure that the right function is being
called.

[erikchen, 2016/10/07 00:31:02]

ah, yup, switched to ::strchr().

+  if (!dot)
+    return false;
+  *bugfix = atoi(dot + 1);
+  return true;
 }
 
 MacOSVersionName GetOSVersionName() {
   int major = 0, minor = 0, bugfix = 0;
   if (!GetOSVersion(&major, &minor, &bugfix)) {
     return kMacOSUnknown;
   }
   if (major > 10) {
     return kMacOSNewer;
   }
@@ skipping 12 matching lines @@
     case 7:
       return kMacOSLion;
     case 8:
       return kMacOSMountainLion;
     case 9:
       return kMacOSMavericks;
   }
   return kMacOSNewer;
 }
 }  // namespace rtc