diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn index 83e36cb59d..4e03dc7b9e 100644 --- a/webrtc/base/BUILD.gn +++ b/webrtc/base/BUILD.gn @@ -553,8 +553,6 @@ rtc_static_library("rtc_base") { sources += [ "maccocoathreadhelper.h", "maccocoathreadhelper.mm", - "macconversion.cc", - "macconversion.h", "macifaddrs_converter.cc", "scoped_autorelease_pool.h", "scoped_autorelease_pool.mm", diff --git a/webrtc/base/macconversion.cc b/webrtc/base/macconversion.cc deleted file mode 100644 index c1eec03de7..0000000000 --- a/webrtc/base/macconversion.cc +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Copyright 2004 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. - */ - -#if defined(WEBRTC_MAC) || defined(WEBRTC_IOS) - -#include - -#include "webrtc/base/logging.h" -#include "webrtc/base/macconversion.h" - -bool p_convertHostCFStringRefToCPPString( - const CFStringRef cfstr, std::string& cppstr) { - bool result = false; - - // First this must be non-null, - if (NULL != cfstr) { - // it must actually *be* a CFString, and not something just masquerading - // as one, - if (CFGetTypeID(cfstr) == CFStringGetTypeID()) { - // and we must be able to get the characters out of it. - // (The cfstr owns this buffer; it came from somewhere else, - // so someone else gets to take care of getting rid of the cfstr, - // and then this buffer will go away automatically.) - unsigned length = CFStringGetLength(cfstr); - char* buf = new char[1 + length]; - if (CFStringGetCString(cfstr, buf, 1 + length, kCFStringEncodingASCII)) { - if (strlen(buf) == length) { - cppstr.assign(buf); - result = true; - } - } - delete [] buf; - } - } - - return result; -} - -bool p_convertCFNumberToInt(CFNumberRef cfn, int* i) { - bool converted = false; - - // It must not be null. - if (NULL != cfn) { - // It must actually *be* a CFNumber and not something just masquerading - // as one. - if (CFGetTypeID(cfn) == CFNumberGetTypeID()) { - CFNumberType ntype = CFNumberGetType(cfn); - switch (ntype) { - case kCFNumberSInt8Type: - SInt8 sint8; - converted = CFNumberGetValue(cfn, ntype, static_cast(&sint8)); - if (converted) *i = static_cast(sint8); - break; - case kCFNumberSInt16Type: - SInt16 sint16; - converted = CFNumberGetValue(cfn, ntype, static_cast(&sint16)); - if (converted) *i = static_cast(sint16); - break; - case kCFNumberSInt32Type: - SInt32 sint32; - converted = CFNumberGetValue(cfn, ntype, static_cast(&sint32)); - if (converted) *i = static_cast(sint32); - break; - case kCFNumberSInt64Type: - SInt64 sint64; - converted = CFNumberGetValue(cfn, ntype, static_cast(&sint64)); - if (converted) *i = static_cast(sint64); - break; - case kCFNumberFloat32Type: - Float32 float32; - converted = CFNumberGetValue(cfn, ntype, - static_cast(&float32)); - if (converted) *i = static_cast(float32); - break; - case kCFNumberFloat64Type: - Float64 float64; - converted = CFNumberGetValue(cfn, ntype, - static_cast(&float64)); - if (converted) *i = static_cast(float64); - break; - case kCFNumberCharType: - char charvalue; - converted = CFNumberGetValue(cfn, ntype, - static_cast(&charvalue)); - if (converted) *i = static_cast(charvalue); - break; - case kCFNumberShortType: - short shortvalue; - converted = CFNumberGetValue(cfn, ntype, - static_cast(&shortvalue)); - if (converted) *i = static_cast(shortvalue); - break; - case kCFNumberIntType: - int intvalue; - converted = CFNumberGetValue(cfn, ntype, - static_cast(&intvalue)); - if (converted) *i = static_cast(intvalue); - break; - case kCFNumberLongType: - long longvalue; - converted = CFNumberGetValue(cfn, ntype, - static_cast(&longvalue)); - if (converted) *i = static_cast(longvalue); - break; - case kCFNumberLongLongType: - long long llvalue; - converted = CFNumberGetValue(cfn, ntype, - static_cast(&llvalue)); - if (converted) *i = static_cast(llvalue); - break; - case kCFNumberFloatType: - float floatvalue; - converted = CFNumberGetValue(cfn, ntype, - static_cast(&floatvalue)); - if (converted) *i = static_cast(floatvalue); - break; - case kCFNumberDoubleType: - double doublevalue; - converted = CFNumberGetValue(cfn, ntype, - static_cast(&doublevalue)); - if (converted) *i = static_cast(doublevalue); - break; - case kCFNumberCFIndexType: - CFIndex cfindex; - converted = CFNumberGetValue(cfn, ntype, - static_cast(&cfindex)); - if (converted) *i = static_cast(cfindex); - break; - default: - LOG(LS_ERROR) << "got unknown type."; - break; - } - } - } - - return converted; -} - -bool p_isCFNumberTrue(CFNumberRef cfn) { - // We assume it's false until proven otherwise. - bool result = false; - int asInt; - bool converted = p_convertCFNumberToInt(cfn, &asInt); - - if (converted && (0 != asInt)) { - result = true; - } - - return result; -} - -#endif // WEBRTC_MAC || WEBRTC_IOS diff --git a/webrtc/base/macconversion.h b/webrtc/base/macconversion.h deleted file mode 100644 index 63b27cf930..0000000000 --- a/webrtc/base/macconversion.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2004 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. - */ - -#ifndef WEBRTC_BASE_MACCONVERSION_H_ -#define WEBRTC_BASE_MACCONVERSION_H_ - -#if defined(WEBRTC_MAC) || defined(WEBRTC_IOS) - -#include - -#include - -// given a CFStringRef, attempt to convert it to a C++ string. -// returns true if it succeeds, false otherwise. -// We can safely assume, given our context, that the string is -// going to be in ASCII, because it will either be an IP address, -// or a domain name, which is guaranteed to be ASCII-representable. -bool p_convertHostCFStringRefToCPPString(const CFStringRef cfstr, - std::string& cppstr); - -// Convert the CFNumber to an integer, putting the integer in the location -// given, and returhing true, if the conversion succeeds. -// If given a NULL or a non-CFNumber, returns false. -// This is pretty aggresive about trying to convert to int. -bool p_convertCFNumberToInt(CFNumberRef cfn, int* i); - -// given a CFNumberRef, determine if it represents a true value. -bool p_isCFNumberTrue(CFNumberRef cfn); - -#endif // WEBRTC_MAC || WEBRTC_IOS - -#endif // WEBRTC_BASE_MACCONVERSION_H_