ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-09-02 18:59:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/iOS9-Updates

Browse Source
This commit is contained in:
Andreas Linde 2015-08-18 10:40:11 +02:00
commit 68f2a66f11
8 changed files with 32 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Classes/BITCrashReportTextFormatter.m
View File

@ -277,46 +277,32 @@ static const char *findSEL (const char *imageName, NSString *imageUUID, uint64_t
break;
}
/* If we were unable to determine the code type, fall back on the processor info's value. */
if (codeType == nil && report.systemInfo.processorInfo.typeEncoding == PLCrashReportProcessorTypeEncodingMach) {
switch (report.systemInfo.processorInfo.type) {
case CPU_TYPE_ARM:
/* If we were unable to determine the code type, fall back on the legacy architecture value. */
if (codeType == nil) {
switch (report.systemInfo.architecture) {
case PLCrashReportArchitectureARMv6:
case PLCrashReportArchitectureARMv7:
codeType = @"ARM";
lp64 = false;
break;
case CPU_TYPE_ARM64:
codeType = @"ARM-64";
lp64 = true;
break;
case CPU_TYPE_X86:
case PLCrashReportArchitectureX86_32:
codeType = @"X86";
lp64 = false;
break;
case CPU_TYPE_X86_64:
case PLCrashReportArchitectureX86_64:
codeType = @"X86-64";
lp64 = true;
break;
case CPU_TYPE_POWERPC:
case PLCrashReportArchitecturePPC:
codeType = @"PPC";
lp64 = false;
break;
default:
codeType = [NSString stringWithFormat: @"Unknown (%llu)", report.systemInfo.processorInfo.type];
codeType = [NSString stringWithFormat: @"Unknown (%d)", report.systemInfo.architecture];
lp64 = true;
break;
}
}
/* If we still haven't determined the code type, we're totally clueless. */
if (codeType == nil) {
codeType = @"Unknown";
lp64 = true;
}
}
{

BIN
Vendor/CrashReporter.framework/Versions/A/CrashReporter vendored
View File

Binary file not shown.

8
Vendor/CrashReporter.framework/Versions/A/Headers/CrashReporter.h vendored
View File

@ -95,13 +95,7 @@ typedef enum {
PLCrashReporterErrorCrashReportInvalid = 2,
/** An attempt to use a resource which was in use at the time in a manner which would have conflicted with the request. */
PLCrashReporterErrorResourceBusy = 3,
/** The requested resource could not be found. */
PLCRashReporterErrorNotFound = 4,
/** Allocation failed. */
PLCRashReporterErrorInsufficientMemory = 4
PLCrashReporterErrorResourceBusy = 3
} PLCrashReporterError;

50
Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashMacros.h vendored
View File

@ -52,12 +52,6 @@
# define PLCR_CPP_BEGIN_NS namespace plcrash {
# define PLCR_CPP_END_NS }
# endif
#
/** @internal Define the plcrash::async namespace, automatically inserting an inline namespace containing the configured PLCRASHREPORTER_PREFIX, if any. */
# define PLCR_CPP_BEGIN_ASYNC_NS PLCR_CPP_BEGIN_NS namespace async {
/** @internal Close the definition of the `plcrash::async` namespace (and the PLCRASHREPORTER_PREFIX inline namespace, if any). */
# define PLCR_CPP_END_ASYNC_NS PLCR_CPP_END_NS }
#endif
#ifdef __clang__
@ -66,56 +60,12 @@
# define PLCR_PRAGMA_CLANG(_p)
#endif
#ifdef __clang__
# define PLCR_DEPRECATED __attribute__((deprecated))
#else
# define PLCR_DEPRECATED
#endif
#if defined(__clang__) || defined(__GNUC__)
# define PLCR_UNUSED __attribute__((unused))
#else
# define PLCR_UNUSED
#endif
#ifdef PLCR_PRIVATE
/**
* Marks a definition as deprecated only for for external clients, allowing
* uses of it internal fo the framework.
*/
#define PLCR_EXTERNAL_DEPRECATED
/**
* @internal
* A macro to put above a definition marked PLCR_EXTERNAL_DEPRECATED that will
* silence warnings about there being a deprecation documentation marker but the
* definition not being marked deprecated.
*/
# define PLCR_EXTERNAL_DEPRECATED_NOWARN_PUSH() \
PLCR_PRAGMA_CLANG("clang diagnostic push"); \
PLCR_PRAGMA_CLANG("clang diagnostic ignored \"-Wdocumentation-deprecated-sync\"")
/**
* @internal
* A macro to put below a definition marked PLCR_EXTERNAL_DEPRECATED that will
* silence warnings about there being a deprecation documentation marker but the
* definition not being marked deprecated.
*/
# define PLCR_EXTERNAL_DEPRECATED_NOWARN_POP() PLCR_PRAGMA_CLANG("clang diagnostic pop")
#else
# define PLCR_EXTERNAL_DEPRECATED PLCR_DEPRECATED
# define PLCR_EXTERNAL_DEPRECATED_NOWARN_PUSH()
# define PLCR_EXTERNAL_DEPRECATED_NOWARN_PUSH()
#endif /* PLCR_PRIVATE */
#ifdef PLCR_PRIVATE
# if defined(__clang__) && __has_feature(cxx_attributes) && __has_warning("-Wimplicit-fallthrough")
# define PLCR_FALLTHROUGH [[clang::fallthrough]]
# else
# define PLCR_FALLTHROUGH do {} while (0)
# endif
#endif
#ifdef PLCR_PRIVATE
/**
* @internal

4
Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashNamespace.h vendored
View File

@ -247,8 +247,8 @@
#define plcrash_nasync_image_list_free PLNS(plcrash_nasync_image_list_free)
#define plcrash_nasync_image_list_init PLNS(plcrash_nasync_image_list_init)
#define plcrash_nasync_image_list_remove PLNS(plcrash_nasync_image_list_remove)
#define plcrash_async_macho_free PLNS(plcrash_async_macho_free)
#define plcrash_async_macho_init PLNS(plcrash_async_macho_init)
#define plcrash_nasync_macho_free PLNS(plcrash_nasync_macho_free)
#define plcrash_nasync_macho_init PLNS(plcrash_nasync_macho_init)
#define plcrash_populate_error PLNS(plcrash_populate_error)
#define plcrash_populate_mach_error PLNS(plcrash_populate_mach_error)
#define plcrash_populate_posix_error PLNS(plcrash_populate_posix_error)

28
Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportSystemInfo.h vendored
View File

@ -27,8 +27,6 @@
*/
#import <Foundation/Foundation.h>
#include "PLCrashMacros.h"
@class PLCrashReportProcessorInfo;
/**
* @ingroup constants
@ -57,7 +55,7 @@ typedef enum {
*
* Indicates the architecture under which a Crash Log was generated.
*
* @note The architecture value has been deprecated in v1.1 and later crash reports. All new reports
* @deprecated The architecture value has been deprecated in v1.1 and later crash reports. All new reports
* will make use of the new PLCrashReportProcessorInfo CPU type encodings.
*
* @internal
@ -79,7 +77,7 @@ typedef enum {
* values.
* @sa PLCrashReportArchitectureARMv6
*/
PLCrashReportArchitectureARM PLCR_DEPRECATED = PLCrashReportArchitectureARMv6,
PLCrashReportArchitectureARM = PLCrashReportArchitectureARMv6,
/** PPC */
PLCrashReportArchitecturePPC = 3,
@ -96,9 +94,7 @@ typedef enum {
extern PLCrashReportOperatingSystem PLCrashReportHostOperatingSystem;
PLCR_EXTERNAL_DEPRECATED_NOWARN_PUSH();
extern PLCrashReportArchitecture PLCrashReportHostArchitecture PLCR_EXTERNAL_DEPRECATED;
PLCR_EXTERNAL_DEPRECATED_NOWARN_PUSH();
extern PLCrashReportArchitecture PLCrashReportHostArchitecture;
@interface PLCrashReportSystemInfo : NSObject {
@private
@ -116,27 +112,17 @@ PLCR_EXTERNAL_DEPRECATED_NOWARN_PUSH();
/** Date crash report was generated. May be nil if the date is unknown. */
NSDate *_timestamp;
/** Processor information. */
PLCrashReportProcessorInfo *_processorInfo;
}
- (id) initWithOperatingSystem: (PLCrashReportOperatingSystem) operatingSystem
operatingSystemVersion: (NSString *) operatingSystemVersion
architecture: (PLCrashReportArchitecture) architecture
timestamp: (NSDate *) timestamp PLCR_DEPRECATED;
timestamp: (NSDate *) timestamp;
- (id) initWithOperatingSystem: (PLCrashReportOperatingSystem) operatingSystem
operatingSystemVersion: (NSString *) operatingSystemVersion
operatingSystemBuild: (NSString *) operatingSystemBuild
architecture: (PLCrashReportArchitecture) architecture
timestamp: (NSDate *) timestamp PLCR_DEPRECATED;
- (id) initWithOperatingSystem: (PLCrashReportOperatingSystem) operatingSystem
operatingSystemVersion: (NSString *) operatingSystemVersion
operatingSystemBuild: (NSString *) operatingSystemBuild
architecture: (PLCrashReportArchitecture) architecture
processorInfo: (PLCrashReportProcessorInfo *) processorInfo
timestamp: (NSDate *) timestamp;
/** The operating system. */
@ -151,13 +137,9 @@ PLCR_EXTERNAL_DEPRECATED_NOWARN_PUSH();
/** Architecture. @deprecated The architecture value has been deprecated in v1.1 and later crash reports. All new reports
* include the CPU type as part of the crash report's machine info structure, using the PLCrashReportProcessorInfo
* extensible encoding. */
@property(nonatomic, readonly) PLCrashReportArchitecture architecture PLCR_DEPRECATED;
@property(nonatomic, readonly) PLCrashReportArchitecture architecture;
/** Date and time that the crash report was generated. This may be unavailable, and this property will be nil. */
@property(nonatomic, readonly) NSDate *timestamp;
/** The processor type. For v1.2 reports and later, this is an alias to the machine info's processorInfo.
* For earlier reports, this will be synthesized from the deprecated architecture property. */
@property(nonatomic, readonly) PLCrashReportProcessorInfo *processorInfo;
@end

7
Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReporter.h vendored
View File

@ -30,7 +30,6 @@
#import <mach/mach.h>
#import "PLCrashReporterConfig.h"
#import "PLCrashMacros.h"
@class PLCrashMachExceptionServer;
@class PLCrashMachExceptionPortSet;
@ -45,7 +44,7 @@
* @param uap The crash's threads context.
* @param context The API client's supplied context value.
*
* @sa The @ref async_safety documentation.
* @sa @ref async_safety
* @sa PLCrashReporter::setPostCrashCallbacks:
*/
typedef void (*PLCrashReporterPostCrashSignalCallback)(siginfo_t *info, ucontext_t *uap, void *context);
@ -56,7 +55,7 @@ typedef void (*PLCrashReporterPostCrashSignalCallback)(siginfo_t *info, ucontext
* This structure contains callbacks supported by PLCrashReporter to allow the host application to perform
* additional tasks prior to program termination after a crash has occured.
*
* @sa The @ref async_safety documentation.
* @sa @ref async_safety
*/
typedef struct PLCrashReporterCallbacks {
/** The version number of this structure. If not one of the defined version numbers for this type, the behavior
@ -111,7 +110,7 @@ typedef struct PLCrashReporterCallbacks {
NSString *_crashReportDirectory;
}
+ (PLCrashReporter *) sharedReporter PLCR_DEPRECATED;
+ (PLCrashReporter *) sharedReporter;
- (instancetype) initWithConfiguration: (PLCrashReporterConfig *) config;

16
Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist vendored
View File

@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>14E46</string>
<string>14F27</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
@ -18,21 +18,25 @@
<string>FMWK</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>6E35b</string>
<string>7A176x</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>14D125</string>
<string>15A244e</string>
<key>DTSDKName</key>
<string>macosx10.10</string>
<string>macosx10.11</string>
<key>DTXcode</key>
<string>0640</string>
<string>0700</string>
<key>DTXcodeBuild</key>
<string>6E35b</string>
<string>7A176x</string>
</dict>
</plist>