Skip to content

Commit 9799b34

Browse files
committed
Fixes Warnings in Xcode Version 6.1 (6A1052d) Rename XMPPNamespaces to XMPPConstants
1 parent 2bb249c commit 9799b34

File tree

4 files changed

+5
-24
lines changed

4 files changed

+5
-24
lines changed

Core/XMPPNamespaces.h renamed to Core/XMPPConstants.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
//
2-
// Created by Jonathon Staff on 10/22/14.
3-
// Copyright (c) 2014 nplexity, LLC. All rights reserved.
4-
//
5-
61
#import <Foundation/Foundation.h>
72

83
/**
@@ -19,6 +14,3 @@ extern NSString *const XMPPBytestreamsNamespace;
1914
extern NSString *const XMPPIBBNamespace;
2015
extern NSString *const XMPPDiscoItemsNamespace;
2116
extern NSString *const XMPPDiscoInfoNamespace;
22-
23-
@interface XMPPNamespaces : NSObject
24-
@end
Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
//
2-
// Created by Jonathon Staff on 10/22/14.
3-
// Copyright (c) 2014 nplexity, LLC. All rights reserved.
4-
//
5-
6-
#import "XMPPNamespaces.h"
1+
#import "XMPPConstants.h"
72

83
NSString *const XMPPSINamespace = @"http://jabber.org/protocol/si";
94
NSString *const XMPPSIProfileFileTransferNamespace =
@@ -13,7 +8,3 @@
138
NSString *const XMPPIBBNamespace = @"http://jabber.org/protocol/ibb";
149
NSString *const XMPPDiscoItemsNamespace = @"http://jabber.org/protocol/disco#items";
1510
NSString *const XMPPDiscoInfoNamespace = @"http://jabber.org/protocol/disco#info";
16-
17-
@implementation XMPPNamespaces
18-
19-
@end

Extensions/FileTransfer/XMPPIncomingFileTransfer.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#endif
99

1010
#import "XMPPIncomingFileTransfer.h"
11-
#import "XMPPNamespaces.h"
11+
#import "XMPPConstants.h"
1212
#import "XMPPLogging.h"
1313
#import "idn-int.h"
1414
#import "NSNumber+XMPP.h"

Extensions/FileTransfer/XMPPOutgoingFileTransfer.m

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@
99

1010
#import <ifaddrs.h>
1111
#import <net/if.h>
12-
#import <netinet6/in6.h>
1312
#import <netinet/in.h>
1413
#import <arpa/inet.h>
1514
#import "XMPPLogging.h"
1615
#import "XMPPOutgoingFileTransfer.h"
1716
#import "XMPPIDTracker.h"
1817
#import "idn-int.h"
19-
#import "XMPPNamespaces.h"
18+
#import "XMPPConstants.h"
2019
#import "NSNumber+XMPP.h"
2120
#import "NSData+XMPP.h"
2221

@@ -1727,10 +1726,9 @@ - (NSTimeInterval)socket:(GCDAsyncSocket *)sock
17271726
elapsed:(NSTimeInterval)elapsed
17281727
bytesDone:(NSUInteger)length
17291728
{
1730-
XMPPLogVerbose(@"%@: socket shouldTimeoutReadWithTag:%ld elapsed:%d bytesDone:%d", THIS_FILE, tag,
1731-
elapsed, length);
1729+
XMPPLogVerbose(@"%@: socket shouldTimeoutReadWithTag:%ld elapsed:%f bytesDone:%lu", THIS_FILE, tag, elapsed, (unsigned long)length);
17321730

1733-
NSString *reason = [NSString stringWithFormat:@"Read timeout. %d bytes read.", length];
1731+
NSString *reason = [NSString stringWithFormat:@"Read timeout. %lu bytes read.", (unsigned long)length];
17341732
[self failWithReason:reason error:nil];
17351733

17361734
return 0;

0 commit comments

Comments
 (0)