hotfix

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

diff --git a/sope-appserver/NGObjWeb/WOContext.m b/sope-appserver/NGObjWeb/WOContext.m
index eb20581943984e8208622b9e4b4e8b958f9058fb..1b08905714c11bcb38125af53de59abf160276f1 100644 (file)
--- a/sope-appserver/NGObjWeb/WOContext.m
+++ b/sope-appserver/NGObjWeb/WOContext.m
@@ -102,7 +102,8 @@ static NSString *WOApplicationSuffix = nil;
     char buf[24];
     self->qpJoin = @"&";
     
-    sprintf(buf, "%03x%08x%08x", ++contextCount, (int)time(NULL), (int)self);
+    sprintf(buf, "%03x%08x%08x", ++contextCount, (int)time(NULL),
+           (unsigned int)(unsigned long)self);
     self->ctxId = [[NSString alloc] initWithCString:buf];
     
     /* per default close tags in XML style */
@@ -668,11 +669,11 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
     sid = [[self session] sessionID];
   
   return [NSString stringWithFormat:
-                     @"<0x%08X[%@]: %@ app=%@ sn=%@ eid=%@ rqeid=%@>",
-                     (unsigned)self, NSStringFromClass([self class]),
+                     @"<0x%p[%@]: %@ app=%@ sn=%@ eid=%@ rqeid=%@>",
+                     self, NSStringFromClass([self class]),
                      [self  contextID],
                      [app name],
-                     sid ? sid : @"none",
+                    sid != nil ? sid : (NSString *)@"none",
                      [self  elementID],
                      [self  senderID]];
 }
@@ -763,7 +764,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
        else [qs appendString:self->qpJoin];
 
        // TODO: code duplication ...
-       value = ![value isNotNull] ? nil : [value stringValue];
+       value = ![value isNotNull] ? (NSString *)nil : [value stringValue];
        key   = [key   stringByEscapingURL];
        value = [value stringByEscapingURL];
     
@@ -781,7 +782,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
     if (isFirst) isFirst = NO;
     else [qs appendString:self->qpJoin];
     
-    value = ![value isNotNull] ? nil : [value stringValue];
+    value = ![value isNotNull] ? (NSString *)nil : [value stringValue];
     key   = [key   stringByEscapingURL];
     value = [value stringByEscapingURL];
     
@@ -1106,7 +1107,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
     self->cycleContext = [[NSMutableArray alloc] initWithCapacity:8];
   
   /* add to cursor stack */
-  [self->cycleContext addObject:(_obj ? _obj : [NSNull null])];
+  [self->cycleContext addObject:(_obj != nil ? _obj : (id)[NSNull null])];
   
   /* set active cursor */
   [self setObject:_obj forKey:@"_"];