Author: rfm
Date: Fri May 22 16:37:21 2015
New Revision: 38519
URL: http://svn.gna.org/viewcvs/gnustep?rev=38519&view=rev
Log:
Minor optimisation
Modified:
libs/webservices/trunk/GWSCoder.m
libs/webservices/trunk/GWSElement.m
Modified: libs/webservices/trunk/GWSCoder.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/webservices/trunk/GWSCoder.m?rev=38519&r1=38518&r2=38519&view=diff
==============================================================================
--- libs/webservices/trunk/GWSCoder.m (original)
+++ libs/webservices/trunk/GWSCoder.m Fri May 22 16:37:21 2015
@@ -953,9 +953,10 @@
if (_oldparser == YES)
{
- NSRange r = [elementName rangeOfString: @":"];
+ NSRange r;
NSString *prefix = @"";
+ r = [elementName rangeOfString: @":" options: NSLiteralSearch];
qualifiedName = elementName;
if (r.length > 0)
{
@@ -971,13 +972,19 @@
{
NSString *name = nil;
- if ([key isEqualToString: @"xmlns"] == YES)
+ if ([key rangeOfString: @"xmlns"
+ options: (NSLiteralSearch | NSAnchoredSearch)].length > 0)
{
- name = @"";
- }
- else if ([key hasPrefix: @"xmlns:"] == YES)
- {
- name = [key substringFromIndex: 6];
+ NSUInteger l = [key length];
+
+ if (5 == l)
+ {
+ name = @"";
+ }
+ else if (6 == l && [key characterAtIndex: 5] == ':')
+ {
+ name = [key substringFromIndex: 6];
+ }
}
if (name != nil)
{
@@ -1045,8 +1052,9 @@
if (_oldparser == YES)
{
- NSRange r = [elementName rangeOfString: @":"];
-
+ NSRange r;
+
+ r = [elementName rangeOfString: @":" options: NSLiteralSearch];
if (r.length > 0)
{
elementName = [elementName substringFromIndex: NSMaxRange(r)];
Modified: libs/webservices/trunk/GWSElement.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/webservices/trunk/GWSElement.m?rev=38519&r1=38518&r2=38519&view=diff
==============================================================================
--- libs/webservices/trunk/GWSElement.m (original)
+++ libs/webservices/trunk/GWSElement.m Fri May 22 16:37:21 2015
@@ -983,9 +983,11 @@
- (void) setName: (NSString*)name
{
+ NSRange r;
+
NSAssert([name length] > 0, NSInvalidArgumentException);
- NSAssert(0 == [name rangeOfString: @":"].length,
- NSInvalidArgumentException);
+ r = [name rangeOfString: @":" options: NSLiteralSearch];
+ NSAssert(0 == r.length, NSInvalidArgumentException);
name = [name copy];
[_name release];
_name = name;
@@ -1004,12 +1006,14 @@
- (void) setNamespace: (NSString*)uri forPrefix: (NSString*)prefix
{
+ NSRange r;
+
if (prefix == nil)
{
prefix = @"";
}
- NSAssert(0 == [prefix rangeOfString: @":"].length,
- NSInvalidArgumentException);
+ r = [prefix rangeOfString: @":" options: NSLiteralSearch];
+ NSAssert(0 == r.length, NSInvalidArgumentException);
if ([uri length] == 0)
{
if (_namespaces != nil)
@@ -1046,8 +1050,8 @@
{
prefix = @"";
}
- NSAssert(0 == [prefix rangeOfString: @":"].length,
- NSInvalidArgumentException);
+ r = [prefix rangeOfString: @":" options: NSLiteralSearch];
+ NSAssert(0 == r.length, NSInvalidArgumentException);
empty = (0 == [prefix length]) ? YES : NO;
ns = [self namespaceForPrefix: prefix];
@@ -1057,7 +1061,7 @@
format: @"No namespace found for prefix '%@'", prefix];
}
- r = [_qualified rangeOfString: @":"];
+ r = [_qualified rangeOfString: @":" options: NSLiteralSearch];
if (YES == empty)
{
if (r.length > 0)
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
