[Gnustep-cvs] r39906 - in /libs/base/trunk/Tests/base/NSURLConnection/Helpers: NSURLConnectionTest.m SimpleWebServer.m

[rfm]

Author: rfm
Date: Wed Jun 22 16:14:05 2016
New Revision: 39906

URL: http://svn.gna.org/viewcvs/gnustep?rev=39906&view=rev
Log:
Fix uninitialised variables

Modified:
    libs/base/trunk/Tests/base/NSURLConnection/Helpers/NSURLConnectionTest.m
    libs/base/trunk/Tests/base/NSURLConnection/Helpers/SimpleWebServer.m

Modified: 
libs/base/trunk/Tests/base/NSURLConnection/Helpers/NSURLConnectionTest.m
URL: 
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tests/base/NSURLConnection/Helpers/NSURLConnectionTest.m?rev=39906&r1=39905&r2=39906&view=diff
==============================================================================
--- libs/base/trunk/Tests/base/NSURLConnection/Helpers/NSURLConnectionTest.m    
(original)
+++ libs/base/trunk/Tests/base/NSURLConnection/Helpers/NSURLConnectionTest.m    
Wed Jun 22 16:14:05 2016
@@ -487,7 +487,7 @@
   NSString *path = nil;
   NSString *redirectPath = nil;
   NSString *statusCode = nil;
-  NSString *redirectCode;
+  NSString *redirectCode = nil;
   NSString *method = nil;
   id payload = nil;
   id content = nil;
@@ -551,8 +551,9 @@
            }
        }
 
-      isOwnAuxServer = [[d objectForKey: @"IsAuxilliary"] isEqualToString: 
@"YES"] &&
-                      nil == _auxServer;
+      isOwnAuxServer
+       = [[d objectForKey: @"IsAuxilliary"] isEqualToString: @"YES"]
+       && nil == _auxServer;
       if (isOwnAuxServer)
        {
          auxPort = [d objectForKey: @"AuxPort"];
@@ -615,7 +616,8 @@
          if (_expectedStatusCode == 0)
            {
              [NSException raise: NSInvalidArgumentException
-                         format: @"Invalid expected 'StatusCode' supplied %@", 
statusCode];
+               format: @"Invalid expected 'StatusCode' supplied %@",
+               statusCode];
            }
        }
       if (nil == redirectCode)
@@ -628,7 +630,8 @@
          if (_redirectStatusCode == 0)
            {
              [NSException raise: NSInvalidArgumentException
-                         format: @"Invalid expected 'RedirectCode' supplied 
%@", redirectCode];
+               format: @"Invalid expected 'RedirectCode' supplied %@",
+               redirectCode];
            }
        }
 
@@ -650,12 +653,14 @@
        }
 
       url = [NSURL URLWithString: 
-                    [NSString stringWithFormat: @"%@://%@:%@%@", protocol, 
address, auxPort, redirectPath]];
+        [NSString stringWithFormat:
+         @"%@://%@:%@%@", protocol, address, auxPort, redirectPath]];
       _redirectRequest = [NSMutableURLRequest requestWithURL: url];
       RETAIN(_redirectRequest);
 
       url = [NSURL URLWithString: 
-                    [NSString stringWithFormat: @"%@://%@:%@%@", protocol, 
address, port, path]];
+       [NSString stringWithFormat:
+         @"%@://%@:%@%@", protocol, address, port, path]];
       _request = [NSMutableURLRequest requestWithURL: url];
       RETAIN(_request);
 

Modified: libs/base/trunk/Tests/base/NSURLConnection/Helpers/SimpleWebServer.m
URL: 
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tests/base/NSURLConnection/Helpers/SimpleWebServer.m?rev=39906&r1=39905&r2=39906&view=diff
==============================================================================
--- libs/base/trunk/Tests/base/NSURLConnection/Helpers/SimpleWebServer.m        
(original)
+++ libs/base/trunk/Tests/base/NSURLConnection/Helpers/SimpleWebServer.m        
Wed Jun 22 16:14:05 2016
@@ -109,7 +109,8 @@
     }
   else
     {
-      NSLog(@"%@: already started '%@' on '%@'", self, _serverStream, 
[NSThread currentThread]);
+      NSLog(@"%@: already started '%@' on '%@'",
+       self, _serverStream, [NSThread currentThread]);
     }
 
   return ret;
@@ -212,7 +213,7 @@
              NSData        *statusData;
              char          *crlf = "\r\n";
              id            content;
-             NSData        *contentData;
+             NSData        *contentData = nil;
              NSUInteger    cLength = 0; // content-length
              NSString      *connection;
              BOOL          close = YES;
@@ -226,15 +227,17 @@
                {
                  connection = [[_request headerNamed: @"connection"] value];
                }
-             // if the client didn't supply the header 'Connection' or 
explicitly stated
-             // to close the current connection
-             close = (nil == connection || [[connection lowercaseString] 
isEqualToString: @"close"]);
+             // if the client didn't supply the header 'Connection' or
+             // explicitly stated to close the current connection
+             close = (nil == connection
+               || [[connection lowercaseString] isEqualToString: @"close"]);
 
              // adding the 'Content-Length' to the response
              content = [_response content];
              if ([content isKindOfClass: [NSString class]])
                {
-                 contentData = [(NSString *)content dataUsingEncoding: 
NSUTF8StringEncoding];
+                 contentData = [(NSString *)content
+                   dataUsingEncoding: NSUTF8StringEncoding];
                }
              else if ([content isKindOfClass: [NSData class]])
                {


_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs