@@ -22,24 +22,21 @@ #import "OFInvalidArgumentException.h" @implementation OFMessagePackExtension @synthesize type = _type, data = _data; -+ (instancetype)extensionWithType: (int8_t)type - data: (OFData *)data ++ (instancetype)extensionWithType: (int8_t)type data: (OFData *)data { - return [[[self alloc] initWithType: type - data: data] autorelease]; + return [[[self alloc] initWithType: type data: data] autorelease]; } - (instancetype)init { OF_INVALID_INIT_METHOD } -- (instancetype)initWithType: (int8_t)type - data: (OFData *)data +- (instancetype)initWithType: (int8_t)type data: (OFData *)data { self = [super init]; @try { if (data == nil || data.itemSize != 1) @@ -122,12 +119,11 @@ prefix = 0xC8; [ret addItem: &prefix]; length = OF_BSWAP16_IF_LE((uint16_t)count); - [ret addItems: &length - count: 2]; + [ret addItems: &length count: 2]; [ret addItem: &_type]; } else { uint32_t length; @@ -135,19 +131,16 @@ prefix = 0xC9; [ret addItem: &prefix]; length = OF_BSWAP32_IF_LE((uint32_t)count); - [ret addItems: &length - count: 4]; + [ret addItems: &length count: 4]; [ret addItem: &_type]; } - [ret addItems: _data.items - count: _data.count]; - + [ret addItems: _data.items count: _data.count]; [ret makeImmutable]; return ret; }