Changeset 673

Timestamp:

01/20/10 08:24:28 (8 weeks ago)

Author:

henri

Message:

Fixed some compile warnings

Location:

apps/iphone

Files:

• my.tel/trunk/Classes/JSON/SBJSON.m (modified) (40 diffs)
• my.tel/trunk/VIP.tel.xcodeproj/project.pbxproj (modified) (2 diffs)
• superbook/trunk/DotTel_SDK/Classes/Reachability.h (modified) (1 diff)
• superbook/trunk/DotTel_SDK/Classes/Reachability.m (modified) (3 diffs)

apps/iphone/my.tel/trunk/Classes/JSON/SBJSON.m

@@ -1 +1 @@
 /*
-Copyright (C) 2008 Stig Brautaset. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-  Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-  Neither the name of the author nor the names of its contributors may be used
-  to endorse or promote products derived from this software without specific
-  prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ Copyright (C) 2008 Stig Brautaset. All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ 
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ 
+ Neither the name of the author nor the names of its contributors may be used
+ to endorse or promote products derived from this software without specific
+ prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #import "SBJSON.h"
@@ -169 +169 @@
         if (![self appendArray:fragment into:json error:error])
             return NO;
-
+                
     } else if ([fragment isKindOfClass:[NSString class]]) {
         if (![self appendString:fragment into:json error:error])
             return NO;
-
+                
     } else if ([fragment isKindOfClass:[NSNumber class]]) {
         if ('c' == *[fragment objCType])
@@ -179 +179 @@
         else
             [json appendString:[fragment stringValue]];
-
+                
     } else if ([fragment isKindOfClass:[NSNull class]]) {
         [json appendString:@"null"];
         
     } else {
-        *error = err(EUNSUPPORTED, [NSString stringWithFormat:@"JSON serialisation not supported for %@", [fragment class]]);
+                if (error)
+                        *error = err(EUNSUPPORTED, [NSString stringWithFormat:@"JSON serialisation not supported for %@", [fragment class]]);
         return NO;
     }
@@ -200 +201 @@
         else
             addComma = YES;
-
+                
         if ([self humanReadable])
             [json appendString:[self indent]];
@@ -208 +209 @@
         }
     }
-
+        
     depth--;
     if ([self humanReadable] && [fragment count])
@@ -219 +220 @@
     [json appendString:@"{"];
     depth++;
-
+        
     NSString *colon = [self humanReadable] ? @" : " : @":";
     BOOL addComma = NO;
@@ -231 +232 @@
         else
             addComma = YES;
-
+                
         if ([self humanReadable])
             [json appendString:[self indent]];
         
         if (![value isKindOfClass:[NSString class]]) {
-            *error = err(EUNSUPPORTED, @"JSON object key must be string");
+                        if (error)
+                                *error = err(EUNSUPPORTED, @"JSON object key must be string");
             return NO;
         }
@@ -242 +244 @@
         if (![self appendString:value into:json error:error])
             return NO;
-
+                
         [json appendString:colon];
         if (![self appendValue:[fragment objectForKey:value] into:json error:error]) {
-            *error = err(EUNSUPPORTED, [NSString stringWithFormat:@"Unsupported value for key %@ in object", value]);
-            return NO;
-        }
-    }
-
+                        if (error)
+                                *error = err(EUNSUPPORTED, [NSString stringWithFormat:@"Unsupported value for key %@ in object", value]);
+            return NO;
+        }
+    }
+        
     depth--;
     if ([self humanReadable] && [fragment count])
@@ -258 +261 @@
 
 - (BOOL)appendString:(NSString*)fragment into:(NSMutableString*)json error:(NSError**)error {
-
+        
     static NSMutableCharacterSet *kEscapeChars;
     if( ! kEscapeChars ) {
@@ -295 +298 @@
         }
     }
-
+        
     [json appendString:@"\""];
     return YES;
@@ -311 +314 @@
  */
 - (id)objectWithString:(id)repr allowScalar:(BOOL)allowScalar error:(NSError**)error {
-
+        
     if (!repr) {
         if (error)
@@ -328 +331 @@
         return nil;
     }
-        
+        
     // We found some valid JSON. But did it also contain something else?
     if (![self scanIsAtEnd]) {
@@ -335 +338 @@
         return nil;
     }
-
+        
     // If we don't allow scalars, check that the object we've found is a valid JSON container.
     if (!allowScalar && ![o isKindOfClass:[NSDictionary class]] && ![o isKindOfClass:[NSArray class]]) {
@@ -342 +345 @@
         return nil;
     }
-
+        
     NSAssert1(o, @"Should have a valid object from %@", repr);
     return o;
@@ -401 +404 @@
             break;
         case '+':
-            *error = err(EPARSENUM, @"Leading + disallowed in number");
+                        if (error)
+                                *error = err(EPARSENUM, @"Leading + disallowed in number");
             return NO;
             break;
         case 0x0:
-            *error = err(EEOF, @"Unexpected end of string");
+                        if (error)
+                                *error = err(EEOF, @"Unexpected end of string");
             return NO;
             break;
         default:
-            *error = err(EPARSE, @"Unrecognised leading character");
+                        if (error)
+                                *error = err(EPARSE, @"Unrecognised leading character");
             return NO;
             break;
@@ -425 +431 @@
         return YES;
     }
-    *error = err(EPARSE, @"Expected 'true'");
+        if (error)
+                *error = err(EPARSE, @"Expected 'true'");
     return NO;
 }
@@ -436 +443 @@
         return YES;
     }
-    *error = err(EPARSE, @"Expected 'false'");
+        if (error)
+                *error = err(EPARSE, @"Expected 'false'");
     return NO;
 }
@@ -447 +455 @@
         return YES;
     }
-    *error = err(EPARSE, @"Expected 'null'");
+        if (error)
+                *error = err(EPARSE, @"Expected 'null'");
     return NO;
 }
@@ -454 +463 @@
 {
     if (maxDepth && ++depth > maxDepth) {
-        *error = err(EDEPTH, @"Nested too deep");
+                if (error)
+                        *error = err(EDEPTH, @"Nested too deep");
         return NO;
     }
@@ -470 +480 @@
         
         if (![self scanValue:&v error:error]) {
-            *error = errWithUnderlier(EPARSE, error, @"Expected value while parsing array");
+                        if (error)
+                                *error = errWithUnderlier(EPARSE, error, @"Expected value while parsing array");
             return NO;
         }
@@ -480 +491 @@
             skipWhitespace(c);
             if (*c == ']') {
-                *error = err(ETRAILCOMMA, @"Trailing comma disallowed in array");
+                                if (error)
+                                        *error = err(ETRAILCOMMA, @"Trailing comma disallowed in array");
                 return NO;
             }
@@ -486 +498 @@
     }
     
-    *error = err(EEOF, @"End of input while parsing array");
+        if (error)
+                *error = err(EEOF, @"End of input while parsing array");
     return NO;
 }
@@ -493 +506 @@
 {
     if (maxDepth && ++depth > maxDepth) {
-        *error = err(EDEPTH, @"Nested too deep");
+                if (error)
+                        *error = err(EDEPTH, @"Nested too deep");
         return NO;
     }
@@ -509 +523 @@
         
         if (!(*c == '\"' && c++ && [self scanRestOfString:&k error:error])) {
-            *error = errWithUnderlier(EPARSE, error, @"Object key string expected");
+                        if (error)
+                                *error = errWithUnderlier(EPARSE, error, @"Object key string expected");
             return NO;
         }
@@ -515 +530 @@
         skipWhitespace(c);
         if (*c != ':') {
-            *error = err(EPARSE, @"Expected ':' separating key and value");
+                        if (error)
+                                *error = err(EPARSE, @"Expected ':' separating key and value");
             return NO;
         }
@@ -522 +538 @@
         if (![self scanValue:&v error:error]) {
             NSString *string = [NSString stringWithFormat:@"Object value expected for key: %@", k];
-            *error = errWithUnderlier(EPARSE, error, string);
+                        if (error)
+                                *error = errWithUnderlier(EPARSE, error, string);
             return NO;
         }
@@ -532 +549 @@
             skipWhitespace(c);
             if (*c == '}') {
-                *error = err(ETRAILCOMMA, @"Trailing comma disallowed in object");
+                                if (error)
+                                        *error = err(ETRAILCOMMA, @"Trailing comma disallowed in object");
                 return NO;
             }
@@ -538 +556 @@
     }
     
-    *error = err(EEOF, @"End of input while parsing object");
+        if (error)
+                *error = err(EEOF, @"End of input while parsing object");
     return NO;
 }
@@ -583 +602 @@
                     c++;
                     if (![self scanUnicodeChar:&uc error:error]) {
-                        *error = errWithUnderlier(EUNICODE, error, @"Broken unicode character");
+                                                if (error)
+                                                        *error = errWithUnderlier(EUNICODE, error, @"Broken unicode character");
                         return NO;
                     }
@@ -589 +609 @@
                     break;
                 default:
-                    *error = err(EESCAPE, [NSString stringWithFormat:@"Illegal escape sequence '0x%x'", uc]);
+                                        if (error)
+                                                *error = err(EESCAPE, [NSString stringWithFormat:@"Illegal escape sequence '0x%x'", uc]);
                     return NO;
                     break;
@@ -597 +618 @@
             
         } else if (*c < 0x20) {
-            *error = err(ECTRL, [NSString stringWithFormat:@"Unescaped control character '0x%x'", *c]);
+                        if (error)
+                                *error = err(ECTRL, [NSString stringWithFormat:@"Unescaped control character '0x%x'", *c]);
             return NO;
             
@@ -605 +627 @@
     } while (*c);
     
-    *error = err(EEOF, @"Unexpected EOF while parsing string");
+        if (error)
+                *error = err(EEOF, @"Unexpected EOF while parsing string");
     return NO;
 }
@@ -614 +637 @@
     
     if (![self scanHexQuad:&hi error:error]) {
-        *error = err(EUNICODE, @"Missing hex quad");
+                if (error)
+                        *error = err(EUNICODE, @"Missing hex quad");
         return NO;        
     }
@@ -622 +646 @@
             
             if (!(*c == '\\' && ++c && *c == 'u' && ++c && [self scanHexQuad:&lo error:error])) {
-                *error = errWithUnderlier(EUNICODE, error, @"Missing low character in surrogate pair");
+                                if (error)
+                                        *error = errWithUnderlier(EUNICODE, error, @"Missing low character in surrogate pair");
                 return NO;
             }
             
             if (lo < 0xdc00 || lo >= 0xdfff) {
-                *error = err(EUNICODE, @"Invalid low surrogate char");
+                                if (error)
+                                        *error = err(EUNICODE, @"Invalid low surrogate char");
                 return NO;
             }
@@ -634 +660 @@
             
         } else if (hi < 0xe000) {
-            *error = err(EUNICODE, @"Invalid high character in surrogate pair");
+                        if (error)
+                                *error = err(EUNICODE, @"Invalid high character in surrogate pair");
             return NO;
         }
@@ -654 +681 @@
         ? (uc - 'A' + 10) : -1;
         if (d == -1) {
-            *error = err(EUNICODE, @"Missing hex digit in quad");
+                        if (error)
+                                *error = err(EUNICODE, @"Missing hex digit in quad");
             return NO;
         }
@@ -676 +704 @@
     if ('0' == *c && c++) {        
         if (isdigit(*c)) {
-            *error = err(EPARSENUM, @"Leading 0 disallowed in number");
+                        if (error)
+                                *error = err(EPARSENUM, @"Leading 0 disallowed in number");
             return NO;
         }
         
     } else if (!isdigit(*c) && c != ns) {
-        *error = err(EPARSENUM, @"No digits after initial minus");
+                if (error)
+                        *error = err(EPARSENUM, @"No digits after initial minus");
         return NO;
         
@@ -692 +722 @@
         
         if (!isdigit(*c)) {
-            *error = err(EPARSENUM, @"No digits after decimal point");
+                        if (error)
+                                *error = err(EPARSENUM, @"No digits after decimal point");
             return NO;
         }        
@@ -706 +737 @@
         
         if (!isdigit(*c)) {
-            *error = err(EPARSENUM, @"No digits after exponent");
+                        if (error)
+                                *error = err(EPARSENUM, @"No digits after exponent");
             return NO;
         }
@@ -720 +752 @@
         return YES;
     
-    *error = err(EPARSENUM, @"Failed creating decimal instance");
+        if (error)
+                *error = err(EPARSENUM, @"Failed creating decimal instance");
     return NO;
 }

apps/iphone/my.tel/trunk/VIP.tel.xcodeproj/project.pbxproj

@@ -1005 +1005 @@
                                 GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
                                 GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-                                GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
                                 GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
                                 GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -1016 +1015 @@
                                 GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
                                 GCC_WARN_SHADOW = YES;
-                                GCC_WARN_SIGN_COMPARE = YES;
                                 GCC_WARN_UNDECLARED_SELECTOR = YES;
                                 GCC_WARN_UNINITIALIZED_AUTOS = YES;

apps/iphone/superbook/trunk/DotTel_SDK/Classes/Reachability.h

@@ -96 +96 @@
 - (NetworkStatus)localWiFiConnectionStatus;
 
-/*
- When reachability change notifications are posted, the callback method 'ReachabilityCallback' is called
- and posts a notification that the client application can observe to learn about changes.
- */
-static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReachabilityFlags flags, void *info);
 
 @end

apps/iphone/superbook/trunk/DotTel_SDK/Classes/Reachability.m

@@ -70 +70 @@
 - (BOOL)addressFromString:(NSString *)IPAddress address:(struct sockaddr_in *)outAddress;
 - (void)stopListeningForReachabilityChanges;
+/*
+ When reachability change notifications are posted, the callback method 'ReachabilityCallback' is called
+ and posts a notification that the client application can observe to learn about changes.
+ */
+static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReachabilityFlags flags, void *info);
 @end
 
@@ -154 +159 @@
         
         // Build a sockaddr_in that we can pass to the address reachability query.
-        struct sockaddr_in sin;
-        
-        bzero(&sin, sizeof(sin));
-        sin.sin_len = sizeof(sin);
-        sin.sin_family = AF_INET;
+        struct sockaddr_in soin;
+        
+        bzero(&soin, sizeof(soin));
+        soin.sin_len = sizeof(soin);
+        soin.sin_family = AF_INET;
         // IN_LINKLOCALNETNUM is defined in <netinet/in.h> as 169.254.0.0
-        sin.sin_addr.s_addr = htonl(IN_LINKLOCALNETNUM);
-        
-        adHocWiFiNetworkReachability = SCNetworkReachabilityCreateWithAddress(NULL, (struct sockaddr *)&sin);
+        soin.sin_addr.s_addr = htonl(IN_LINKLOCALNETNUM);
+        
+        adHocWiFiNetworkReachability = SCNetworkReachabilityCreateWithAddress(NULL, (struct sockaddr *)&soin);
                 
                 query = [[[ReachabilityQuery alloc] init] autorelease];
@@ -225 +230 @@
         defaultRouteReachability = SCNetworkReachabilityCreateWithAddress(NULL, (struct sockaddr *)&zeroAddress);
                 
-                ReachabilityQuery *query = [[[ReachabilityQuery alloc] init] autorelease];
-                query.hostNameOrAddress = kDefaultRouteKey;
-                query.reachabilityRef = defaultRouteReachability;
-                
-                [self.reachabilityQueries setObject:query forKey:kDefaultRouteKey];
+                ReachabilityQuery *query2 = [[[ReachabilityQuery alloc] init] autorelease];
+                query2.hostNameOrAddress = kDefaultRouteKey;
+                query2.reachabilityRef = defaultRouteReachability;
+                
+                [self.reachabilityQueries setObject:query2 forKey:kDefaultRouteKey];
     }