use %p for pointer formats, fixed gcc 4.1 warnings, minor code improvs

[sope] / sope-appserver / NGObjWeb / WORequest.m

diff --git a/sope-appserver/NGObjWeb/WORequest.m b/sope-appserver/NGObjWeb/WORequest.m
index c37f972ed2182c8ee46d0bd0f29d798600041cc2..afd8a8ebb030981e503d0c765df7ffc58cf16b32 100644 (file)
--- a/sope-appserver/NGObjWeb/WORequest.m
+++ b/sope-appserver/NGObjWeb/WORequest.m
@@ -283,7 +283,7 @@ static BOOL debugOn = NO;
       tmp++;
     
     component = ((tmp - cstr) == 0)
-      ? @""
+      ? (id)@""
       : [[NSString alloc] initWithCString:cstr length:(tmp - cstr)];
 
     if (component) {
@@ -429,7 +429,7 @@ static BOOL debugOn = NO;
     r = [self->_uri rangeOfString:@"?"];
     query = (r.length > 0)
       ? [self->_uri substringFromIndex:(r.location + r.length)]
-      : nil;
+      : (NSString *)nil;
     
     if ((ctype = [self headerForKey:@"content-type"]) != nil) {
       isFormContent = [ctype hasPrefix:@"application/x-www-form-urlencoded"];
@@ -488,7 +488,7 @@ static BOOL debugOn = NO;
   id paras = [self _getFormParameters];
   return [paras respondsToSelector:@selector(objectsForKey:)]
     ? [paras objectsForKey:_key]
-    : nil;
+    : (NSArray *)nil;
 }
 
 - (NSDictionary *)formValues {
@@ -681,7 +681,7 @@ static BOOL debugOn = NO;
   return debugOn;
 }
 - (NSString *)loggingPrefix {
-  return [NSString stringWithFormat:@"|Rq:%@ 0x%08X|", 
+  return [NSString stringWithFormat:@"|Rq:%@ 0x%p|", 
                      [self method], self];
 }
 
@@ -691,7 +691,7 @@ static BOOL debugOn = NO;
   NSMutableString *str;
 
   str = [NSMutableString stringWithCapacity:256];
-  [str appendFormat:@"<%@[0x%08X]:", NSStringFromClass([self class]), self];
+  [str appendFormat:@"<%@[0x%p]:", NSStringFromClass([self class]), self];
   [str appendFormat:@" method=%@",   [self method]];
   [str appendFormat:@" uri=%@",      [self uri]];
   [str appendFormat:@" app=%@",      self->appName];