aboutsummaryrefslogtreecommitdiffstats
path: root/Frameworks
diff options
context:
space:
mode:
Diffstat (limited to 'Frameworks')
-rw-r--r--Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h9
-rw-r--r--Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m12
-rw-r--r--Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.m4
3 files changed, 15 insertions, 10 deletions
diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h
index 864eb413..ef1da3df 100644
--- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h
@@ -51,6 +51,11 @@
/**
*
*/
+- (void)showErrorWithTitle:(NSString *)error message:(NSString *)connection;
+
+/**
+ *
+ */
- (NSString *)keychainPasswordForConnection:(id)connection;
/**
@@ -145,7 +150,7 @@
NSString *sslCACertificatePath;
NSString *encoding, *previousEncoding;
- NSStringEncoding *stringEncoding;
+ NSStringEncoding stringEncoding;
BOOL encodingUsesLatin1Transport, previousEncodingUsesLatin1Transport;
NSInteger currentProxyState;
@@ -212,7 +217,7 @@
// Connection details
- (BOOL)setPort:(NSInteger)thePort;
- (BOOL)setPassword:(NSString *)thePassword;
-- (BOOL) setSSL:(BOOL)shouldUseSSL usingKeyFilePath:(NSString *)keyFilePath certificatePath:(NSString *)certificatePath certificateAuthorityCertificatePath:(NSString *)caCertificatePath;
+- (void) setSSL:(BOOL)shouldUseSSL usingKeyFilePath:(NSString *)keyFilePath certificatePath:(NSString *)certificatePath certificateAuthorityCertificatePath:(NSString *)caCertificatePath;
// Proxy
- (BOOL)setConnectionProxy:(id <MCPConnectionProxy>)proxy;
diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
index 3bdc796a..9cb913f0 100644
--- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
@@ -1612,7 +1612,7 @@ void performThreadedKeepAlive(void *ptr)
* proceed and loop depending on the status, not returning control until either the query has been executed
* and the result can be returned or the connection and document have been closed.
*/
-- (id)queryString:(NSString *) query usingEncoding:(NSStringEncoding) encoding streamingResult:(NSInteger) streamResultType
+- (id)queryString:(NSString *) query usingEncoding:(NSStringEncoding)aStringEncoding streamingResult:(NSInteger) streamResultType
{
MCPResult *theResult = nil;
double queryStartTime, queryExecutionTime;
@@ -1659,7 +1659,7 @@ void performThreadedKeepAlive(void *ptr)
}
// Derive the query string in the correct encoding
- NSData *d = NSStringDataUsingLossyEncoding(query, encoding, 1);
+ NSData *d = NSStringDataUsingLossyEncoding(query, aStringEncoding, 1);
theCQuery = [d bytes];
// Set the length of the current query
theCQueryLength = [d length];
@@ -3091,7 +3091,7 @@ void performThreadedKeepAlive(void *ptr)
* For internal use only. Transforms a NSString to a C type string (ending with \0).
* Lossy conversions are enabled.
*/
-- (const char *)cStringFromString:(NSString *)theString usingEncoding:(NSStringEncoding)encoding
+- (const char *)cStringFromString:(NSString *)theString usingEncoding:(NSStringEncoding)aStringEncoding
{
NSMutableData *theData;
@@ -3099,7 +3099,7 @@ void performThreadedKeepAlive(void *ptr)
return (const char *)NULL;
}
- theData = [NSMutableData dataWithData:[theString dataUsingEncoding:encoding allowLossyConversion:YES]];
+ theData = [NSMutableData dataWithData:[theString dataUsingEncoding:aStringEncoding allowLossyConversion:YES]];
[theData increaseLengthBy:1];
return (const char *)[theData bytes];
@@ -3128,7 +3128,7 @@ void performThreadedKeepAlive(void *ptr)
/**
* Returns a NSString from a C style string.
*/
-- (NSString *)stringWithCString:(const char *)theCString usingEncoding:(NSStringEncoding)encoding
+- (NSString *)stringWithCString:(const char *)theCString usingEncoding:(NSStringEncoding)aStringEncoding
{
NSData *theData;
NSString *theString;
@@ -3136,7 +3136,7 @@ void performThreadedKeepAlive(void *ptr)
if (theCString == NULL) return @"";
theData = [NSData dataWithBytes:theCString length:(strlen(theCString))];
- theString = [[NSString alloc] initWithData:theData encoding:encoding];
+ theString = [[NSString alloc] initWithData:theData encoding:aStringEncoding];
if (theString) {
[theString autorelease];
diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.m b/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.m
index 35ef0e7e..5c607912 100644
--- a/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.m
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPStreamingResult.m
@@ -46,7 +46,7 @@
@interface MCPStreamingResult (PrivateAPI)
-const char *_bytes2bin(Byte *n, NSUInteger nbytes, NSUInteger len, char *buf);
+void _bytes2bin(Byte *n, NSUInteger nbytes, NSUInteger len, char *buf);
- (void) _downloadAllData;
- (void) _freeAllDataWhenDone;
@@ -430,7 +430,7 @@ const char *_bytes2bin(Byte *n, NSUInteger nbytes, NSUInteger len, char *buf);
* Provides a binary representation of the supplied chars (n) in the supplied buffer (buf). The resulting
* binary representation will be zero-padded according to the supplied field length (len).
*/
-const char *_bytes2bin(Byte *n, NSUInteger nbytes, NSUInteger len, char *buf)
+void _bytes2bin(Byte *n, NSUInteger nbytes, NSUInteger len, char *buf)
{
int i = 0;