ObjFW/ObjXMPP
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Style improvements.

Browse source
This commit is contained in:
Jonathan Schleifer 2012-01-26 13:35:05 +01:00
parent f42623800d
commit da76528178
7 changed files with 38 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/XMPPCallback.h
View file

@ -25,7 +25,7 @@
@class XMPPIQ;
#ifdef OF_HAVE_BLOCKS
typedef void(^xmpp_callback_block)(XMPPIQ*);
typedef void(^xmpp_callback_block_t)(XMPPIQ*);
#endif
@interface XMPPCallback: OFObject
@ -33,10 +33,12 @@ typedef void(^xmpp_callback_block)(XMPPIQ*);
id object;
SEL selector;
}
#ifdef OF_HAVE_BLOCKS
+ callbackWithCallbackBlock: (xmpp_callback_block)callback;
- initWithCallbackBlock: (xmpp_callback_block)callback;
+ callbackWithCallbackBlock: (xmpp_callback_block_t)callback;
- initWithCallbackBlock: (xmpp_callback_block_t)callback;
#endif
+ callbackWithCallbackObject: (id)object
selector: (SEL)selector;
- initWithCallbackObject: (id)object

11
src/XMPPCallback.m
View file

@ -28,12 +28,12 @@
@implementation XMPPCallback
#ifdef OF_HAVE_BLOCKS
+ callbackWithCallbackBlock: (xmpp_callback_block)callback
+ callbackWithCallbackBlock: (xmpp_callback_block_t)callback
{
return [[[self alloc] initWithCallbackBlock: callback] autorelease];
}
- initWithCallbackBlock: (xmpp_callback_block)callback
- initWithCallbackBlock: (xmpp_callback_block_t)callback
{
self = [super init];
@ -55,8 +55,7 @@
{
self = [super init];
// TODO: Retain or follow delegate paradigm?
object = [object_ retain];
object = object_;
selector = selector_;
return self;
@ -64,8 +63,6 @@
- (void)dealloc
{
[object release];
[super dealloc];
}
@ -73,7 +70,7 @@
{
#ifdef OF_HAVE_BLOCKS
if ([object isKindOfClass: [OFBlock class]])
((xmpp_callback_block)object)(iq);
((xmpp_callback_block_t)object)(iq);
else
#endif
[object performSelector: selector

2
src/XMPPConnection.m
View file

@ -405,7 +405,7 @@ withCallbackObject: (id)object
#ifdef OF_HAVE_BLOCKS
- (void)sendIQ: (XMPPIQ*)iq
withCallbackBlock: (xmpp_callback_block)callback;
withCallbackBlock: (xmpp_callback_block_t)callback;
{
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
@try {

2
src/XMPPEXTERNALAuth.m
View file

@ -42,7 +42,7 @@
- (OFDataArray*)initialMessage
{
OFDataArray *message = [OFDataArray dataArrayWithItemSize: 1];
OFDataArray *message = [OFDataArray dataArray];
/* authzid */
if (authzid)

2
src/XMPPPLAINAuth.m
View file

@ -46,7 +46,7 @@
- (OFDataArray*)initialMessage
{
OFDataArray *message = [OFDataArray dataArrayWithItemSize: 1];
OFDataArray *message = [OFDataArray dataArray];
/* authzid */
if (authzid)

2
src/XMPPPresence.m
View file

@ -81,6 +81,8 @@
{
if (type == nil)
return @"available";
return type;
}
- (void)addShow: (OFString*)show

28
src/XMPPSCRAMAuth.m
View file

@ -145,7 +145,7 @@
- (OFDataArray*)initialMessage
{
OFDataArray *ret = [OFDataArray dataArrayWithItemSize: 1];
OFDataArray *ret = [OFDataArray dataArray];
/* New authentication attempt, reset status */
[cNonce release];
@ -215,8 +215,8 @@
} got = 0;
hash = [[[hashType alloc] init] autorelease];
ret = [OFDataArray dataArrayWithItemSize: 1];
authMessage = [OFDataArray dataArrayWithItemSize: 1];
ret = [OFDataArray dataArray];
authMessage = [OFDataArray dataArray];
OFString *chal = [OFString stringWithUTF8String: [data cArray]
length: [data count] *
@ -252,7 +252,7 @@
@throw [OFInvalidServerReplyException exceptionWithClass: isa];
// Add c=<base64(GS2Header+channelBindingData)>
tmpArray = [OFDataArray dataArrayWithItemSize: 1];
tmpArray = [OFDataArray dataArray];
[tmpArray addNItems: [GS2Header UTF8StringLength]
fromCArray: [GS2Header UTF8String]];
if (plusAvailable && [connection encrypted]) {
@ -278,7 +278,7 @@
* IETF RFC 5802:
* SaltedPassword := Hi(Normalize(password), salt, i)
*/
tmpArray = [OFDataArray dataArrayWithItemSize: 1];
tmpArray = [OFDataArray dataArray];
[tmpArray addNItems: [password UTF8StringLength]
fromCArray: [password UTF8String]];
@ -305,7 +305,7 @@
* IETF RFC 5802:
* ClientKey := HMAC(SaltedPassword, "Client Key")
*/
tmpArray = [OFDataArray dataArrayWithItemSize: 1];
tmpArray = [OFDataArray dataArray];
[tmpArray addNItems: 10
fromCArray: "Client Key"];
clientKey = [self XMPP_HMACWithKey: saltedPassword
@ -317,7 +317,7 @@
*/
[hash updateWithBuffer: (void*) clientKey
length: [hashType digestSize]];
tmpArray = [OFDataArray dataArrayWithItemSize: 1];
tmpArray = [OFDataArray dataArray];
[tmpArray addNItems: [hashType digestSize]
fromCArray: [hash digest]];
@ -332,7 +332,7 @@
* IETF RFC 5802:
* ServerKey := HMAC(SaltedPassword, "Server Key")
*/
tmpArray = [OFDataArray dataArrayWithItemSize: 1];
tmpArray = [OFDataArray dataArray];
[tmpArray addNItems: 10
fromCArray: "Server Key"];
serverKey = [self XMPP_HMACWithKey: saltedPassword
@ -342,10 +342,10 @@
* IETF RFC 5802:
* ServerSignature := HMAC(ServerKey, AuthMessage)
*/
tmpArray = [OFDataArray dataArrayWithItemSize: 1];
tmpArray = [OFDataArray dataArray];
[tmpArray addNItems: [hashType digestSize]
fromCArray: serverKey];
serverSignature = [[OFDataArray alloc] initWithItemSize: 1];
serverSignature = [[OFDataArray alloc] init];
[serverSignature addNItems: [hashType digestSize]
fromCArray: [self XMPP_HMACWithKey: tmpArray
data: authMessage]];
@ -354,7 +354,7 @@
* IETF RFC 5802:
* ClientProof := ClientKey XOR ClientSignature
*/
tmpArray = [OFDataArray dataArrayWithItemSize: 1];
tmpArray = [OFDataArray dataArray];
for (i = 0; i < [hashType digestSize]; i++) {
uint8_t c = clientKey[i] ^ clientSignature[i];
[tmpArray addItem: &c];
@ -428,7 +428,7 @@
data: (OFDataArray*)data
{
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
OFDataArray *k = [OFDataArray dataArrayWithItemSize: 1];
OFDataArray *k = [OFDataArray dataArray];
size_t i, kSize, blockSize = [hashType blockSize];
uint8_t *kI = NULL, *kO = NULL;
OFHash *hashI, *hashO;
@ -505,7 +505,7 @@
result[j] ^= uOld[j];
for (j = 0; j < i - 1; j++) {
tmp = [OFDataArray dataArrayWithItemSize: 1];
tmp = [OFDataArray dataArray];
[tmp addNItems: digestSize
fromCArray: uOld];
@ -520,7 +520,7 @@
[pool releaseObjects];
}
ret = [OFDataArray dataArrayWithItemSize: 1];
ret = [OFDataArray dataArray];
[ret addNItems: digestSize
fromCArray: result];
} @finally {