| Index: webrtc/base/objc/RTCLogging.h
|
| diff --git a/talk/app/webrtc/objc/public/RTCLogging.h b/webrtc/base/objc/RTCLogging.h
|
| similarity index 52%
|
| copy from talk/app/webrtc/objc/public/RTCLogging.h
|
| copy to webrtc/base/objc/RTCLogging.h
|
| index bcd160d921292c36a903f586071750ba8a665dc8..19fade5cfc7b8ccee5c21252ffdba8931741482c 100644
|
| --- a/talk/app/webrtc/objc/public/RTCLogging.h
|
| +++ b/webrtc/base/objc/RTCLogging.h
|
| @@ -1,28 +1,11 @@
|
| /*
|
| - * libjingle
|
| - * Copyright 2015 Google Inc.
|
| + * Copyright 2015 The WebRTC project authors. All Rights Reserved.
|
| *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions are met:
|
| - *
|
| - * 1. Redistributions of source code must retain the above copyright notice,
|
| - * this list of conditions and the following disclaimer.
|
| - * 2. Redistributions in binary form must reproduce the above copyright notice,
|
| - * this list of conditions and the following disclaimer in the documentation
|
| - * and/or other materials provided with the distribution.
|
| - * 3. The name of the author may not be used to endorse or promote products
|
| - * derived from this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
| - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
| - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
| - * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
| - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
| - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
| - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
| - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
| - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + * 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.
|
| */
|
|
|
| #import <Foundation/Foundation.h>
|
| @@ -36,14 +19,14 @@ typedef NS_ENUM(NSInteger, RTCLoggingSeverity) {
|
| };
|
|
|
| #if defined(__cplusplus)
|
| -extern "C" void RTCLogEx(RTCLoggingSeverity severity, NSString* logString);
|
| +extern "C" void RTCLogEx(RTCLoggingSeverity severity, NSString* log_string);
|
| extern "C" void RTCSetMinDebugLogLevel(RTCLoggingSeverity severity);
|
| extern "C" NSString* RTCFileName(const char* filePath);
|
| #else
|
|
|
| // Wrapper for C++ LOG(sev) macros.
|
| // Logs the log string to the webrtc logstream for the given severity.
|
| -extern void RTCLogEx(RTCLoggingSeverity severity, NSString* logString);
|
| +extern void RTCLogEx(RTCLoggingSeverity severity, NSString* log_string);
|
|
|
| // Wrapper for rtc::LogMessage::LogToDebug.
|
| // Sets the minimum severity to be logged to console.
|
| @@ -63,10 +46,10 @@ extern NSString* RTCFileName(const char* filePath);
|
| __FUNCTION__, \
|
| ##__VA_ARGS__]
|
|
|
| -#define RTCLogFormat(severity, format, ...) \
|
| - do { \
|
| - NSString *logString = RTCLogString(format, ##__VA_ARGS__); \
|
| - RTCLogEx(severity, logString); \
|
| +#define RTCLogFormat(severity, format, ...) \
|
| + do { \
|
| + NSString* log_string = RTCLogString(format, ##__VA_ARGS__); \
|
| + RTCLogEx(severity, log_string); \
|
| } while (false)
|
|
|
| #define RTCLogVerbose(format, ...) \
|
|
|