Skip to content
This repository was archived by the owner on Aug 27, 2022. It is now read-only.

Commit 27fe20c

Browse files
committed
3 warnings
1 parent ea47d11 commit 27fe20c

File tree

7 files changed

+9
-83
lines changed

7 files changed

+9
-83
lines changed

MPWBridgeReader.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ +(void)parseBridgeDict:aDict forContext:aContext
7171
if ( [[attrs objectForKey:@"type"] isEqual:@"@"] ) {
7272
char symbol[255]="";
7373
id name = [attrs objectForKey:@"name"];
74-
[name getCString:symbol maxLength:250];
74+
[name getCString:symbol maxLength:250 encoding:NSISOLatin1StringEncoding];
7575
symbol[ [name length] ] =0;
7676

7777
#if !WINDOWS && !LINUX

MPWMASONParser.m

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,12 @@ -(NSString*)makeRetainedJSONStringStart:(const char*)start length:(long)len
100100
break;
101101
case 'u':
102102
{
103-
NSString* hexstring=[NSString stringWithCString:start+1 length:4];
104-
NSScanner* hexscanner=[NSScanner scannerWithString:hexstring];
103+
char hexstring[5];
104+
memcpy(hexstring, start+1, 4);
105+
hexstring[4]=0;
105106
unsigned int value=0;
106-
unichar charvalue=0;
107-
[hexscanner scanHexInt:&value];
107+
unichar charvalue=0;
108+
sscanf( hexstring, "%x",&value);
108109
charvalue=value;
109110
NSString *charString=[NSString stringWithCharacters:&charvalue length:1];
110111
[charString getCString:dest maxLength:5 encoding:NSUTF8StringEncoding];

MPWMAXParser.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,7 @@ objectAccessor_h( NSError, parserError, setParserError )
129129
// NSMAXParserDelegate 'protocol' and message patterns.
130130
-(instancetype)initWithData:(NSData*)data;
131131
-(BOOL)parse;
132-
-(BOOL)parseDataFromURL:(NSURL*)url;
133-
-(id)parsedDataFromURL:(id)theUrlOrString;
134132
-(id)parsedData:(NSData*)someData;
135-
-(BOOL)startParsingFromURL:(NSURL*)xmlUrl;
136133

137134
-(NSInteger)currentElementNestingLevel;//nesting level of the element currently being processed
138135
-(NSString*)elementNameAtNestingLevel:(NSInteger)depth;//the tag names at different nesting levels

MPWMAXParser.m

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,84 +1302,11 @@ -(id)parsedData:(NSData*)someData
13021302
}
13031303
}
13041304

1305-
-(BOOL)startParsingFromURL:(NSURL*)xmlUrl
1306-
{
1307-
BOOL success=YES;
1308-
if ( [xmlUrl isFileURL] ) {
1309-
//NSLog(@"isFileURL: %@",xmlUrl);
1310-
return [self parse:[NSData dataWithContentsOfURL:xmlUrl]];
1311-
} else {
1312-
NS_DURING
1313-
//downloader = [[[MPWCachingDownloader alloc] init] autorelease];
1314-
NSMutableURLRequest *theRequest = [NSMutableURLRequest requestWithURL:xmlUrl];
1315-
//NSLog(@"theRequest: %@",theRequest);
1316-
[theRequest setValue:@"ObjectiveXML" forHTTPHeaderField:@"User-Agent"];
1317-
[theRequest setValue:@"gzip" forHTTPHeaderField:@"Accept-Encoding"];
1318-
isReceivingData=YES;
1319-
[[[NSURLConnection alloc] initWithRequest:theRequest delegate:self] autorelease];
1320-
if ( [documentHandler respondsToSelector:@selector(parserDidStartDocument:) ] ) {
1321-
[documentHandler parserDidStartDocument:(NSXMLParser*)self];
1322-
}
1323-
NS_HANDLER
1324-
if ( ![[localException name] isEqual:@"abort"] ) {
1325-
NSLog(@"got exception: %@",localException);
1326-
success=NO;
1327-
} else {
1328-
NSLog(@"got abort");
1329-
}
1330-
NS_ENDHANDLER
1331-
1332-
//NSLog(@"started the connection: %@",connection);
1333-
}
1334-
return success;
1335-
}
1336-
1337-
-(BOOL)parseDataFromURL:(NSURL*)xmlUrl
1338-
{
1339-
BOOL success=YES;
1340-
//NSLog(@"parseDataFromURL: %@",xmlUrl);
1341-
if ( [self startParsingFromURL:xmlUrl] ) {
1342-
@try {
1343-
while ( isReceivingData ) {
1344-
// NSLog(@"will run runloop %@",[NSRunLoop currentRunLoop]);
1345-
[[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]];
1346-
// NSLog(@"loop did run");
1347-
}
1348-
// NSLog(@"end of loop");
1349-
}
1350-
@catch (NSException *exception) {
1351-
if ( ![[exception name] isEqual:@"abort"] ) {
1352-
NSLog(@"got exception: %@",exception);
1353-
success=NO;
1354-
} else {
1355-
NSLog(@"got abort");
1356-
}
1357-
1358-
}
1359-
}
1360-
return success;
1361-
}
1362-
1363-
-(id)parsedDataFromURL:urlOrString
1364-
{
1365-
NSURL *theUrl=(NSURL*)urlOrString;
1366-
//NSLog(@"parsedDataFromURL: %@",theUrl);
1367-
if ( [theUrl isKindOfClass:[NSString class]] ) {
1368-
theUrl=[NSURL URLWithString:(NSString*)theUrl];
1369-
}
1370-
if ( [self parseDataFromURL:theUrl] ) {
1371-
return [self parseResult];
1372-
} else {
1373-
return nil;
1374-
}
1375-
}
13761305

13771306
-(BOOL)parse
13781307
{
13791308
if ( [self data] ) {
13801309
return [self parse:[self data]];
1381-
} else if ( [self url] ) {
1382-
return [self parseDataFromURL:[self url]];
13831310
} else {
13841311
[NSException raise:@"nodata" format:@"no data or URL specified"];
13851312
return NO;

MPWXmlAppleProplistReader.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,6 @@ THE POSSIBILITY OF SUCH DAMAGE.
4141
-integerElement:(id <NSXMLAttributes>)children attributes:(id <NSXMLAttributes>)attrs parser:(MPWMAXParser*)parser;
4242
-dictElement:(MPWXMLAttributes*)children attributes:(id <NSXMLAttributes>)attrs parser:(MPWMAXParser*)parser;
4343
-arrayElement:(MPWXMLAttributes*)children attributes:(id <NSXMLAttributes>)attrs parser:(MPWMAXParser*)parser;
44+
-integerElementAtPtr:(const char*)start length:(long)len;
4445

4546
@end

MPWXmlRpcGeneratorStream.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ -(NSData*)_requestOrResponse:(const char*)requestOrResponse withMethodName:(NSSt
8989
}
9090
[TARGET closeTag];
9191

92-
return [[[self target] target] target];
92+
return [[(id)[self target] target] target];
9393
}
9494

9595
-(NSData*)requestWithMethodName:(NSString*)requestName parameters:params

MPWXmlWrapperArchiver.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ @implementation MPWXmlWrapperArchiver
5353

5454
-(void)encodeDataObject:(NSData*)theObject
5555
{
56-
[target writeElementName:"datareference" attributes:[NSString stringWithFormat:@"length='%d'",[theObject length]] contents:nil];
56+
[target writeElementName:"datareference" attributes:[NSString stringWithFormat:@"length='%d'",(int)[theObject length]] contents:nil];
5757
[datas addObject:theObject];
5858
}
5959

0 commit comments

Comments
 (0)