use %p for pointer formats

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1284 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/Recycler/ApacheWO/AWODirectoryConfig.m b/Recycler/ApacheWO/AWODirectoryConfig.m
index 33eb745491749530098d5b1198e6ea5ebf319a5e..efe05f60ea2a2cb764f785c9ae7c2a8dc8c9f58b 100644 (file)
--- a/Recycler/ApacheWO/AWODirectoryConfig.m
+++ b/Recycler/ApacheWO/AWODirectoryConfig.m
@@ -52,10 +52,10 @@
   id tmp;
   
   ms = [NSMutableString stringWithCapacity:64];
-  [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+  [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
   
   if ((tmp = [self application]))
-    [ms appendFormat:@" app=%@(0x%08X)", [(WOApplication *)tmp name], tmp];
+    [ms appendFormat:@" app=%@(0x%p)", [(WOApplication *)tmp name], tmp];
   if ((tmp = [self requestHandler]))
     [ms appendFormat:@" rqh=%@", tmp];
   

diff --git a/Recycler/ApacheWO/AWOServerConfig.m b/Recycler/ApacheWO/AWOServerConfig.m
index 9b2f20e681e90d92f47c36929d0d5cd24bde3113..cb70b3baecea27d189ffecba912cb6238de70383 100644 (file)
--- a/Recycler/ApacheWO/AWOServerConfig.m
+++ b/Recycler/ApacheWO/AWOServerConfig.m
@@ -56,7 +56,7 @@
   NSMutableString *ms;
   
   ms = [NSMutableString stringWithCapacity:64];
-  [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+  [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
   
   [ms appendFormat:@" appAlias=%@", self->appAlias];
   

diff --git a/Recycler/ApacheWO/ApacheWOTransaction.m b/Recycler/ApacheWO/ApacheWOTransaction.m
index 1f8b23410d82e747e643dad84e283592ac23a9e8..08a3748a71d5129c00c2717d6c1dbceab5a7d5ec 100644 (file)
--- a/Recycler/ApacheWO/ApacheWOTransaction.m
+++ b/Recycler/ApacheWO/ApacheWOTransaction.m
@@ -107,7 +107,7 @@
   NSMutableString *ms;
   
   ms = [NSMutableString stringWithCapacity:64];
-  [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+  [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
   [ms appendFormat:@" uri=%@", [[self request] uri]];
   [ms appendString:@">"];
   return ms;

diff --git a/Recycler/NGJavaScript/Core+JS.subproj/NSString+JS.m b/Recycler/NGJavaScript/Core+JS.subproj/NSString+JS.m
index 54d8eef8470f5ef5dd98968aaf3fb6b57af310ec..2e8c5c91fbb927d35d719e2fc8554d203b415aae 100644 (file)
--- a/Recycler/NGJavaScript/Core+JS.subproj/NSString+JS.m
+++ b/Recycler/NGJavaScript/Core+JS.subproj/NSString+JS.m
@@ -115,7 +115,7 @@
   if ((cstr = JS_GetStringBytes(_jss)))
     return [(NSString *)self initWithCString:cstr];
   
-  NSLog(@"ERROR(%s): did not get bytes of JS string 0x%08X !",
+  NSLog(@"ERROR(%s): did not get bytes of JS string 0x%p !",
        __PRETTY_FUNCTION__, _jss);
   [self release];
   return nil;

diff --git a/Recycler/NGJavaScript/JSObjectOps.m b/Recycler/NGJavaScript/JSObjectOps.m
index 42a257ca62efd8c006031dd9f4d88d0f96d6c14c..9d68b449df8d793de07d72234a57cb1c5acdd801 100644 (file)
--- a/Recycler/NGJavaScript/JSObjectOps.m
+++ b/Recycler/NGJavaScript/JSObjectOps.m
@@ -43,7 +43,7 @@ jop_newMap(JSContext *cx, jsrefcount nrefs,
   jso_ObjectMap *emap;
 
 #if LOG_OBJECT_OPS
-  NSLog(@"new map: cx=0x%08X, nrefs=%i, ops=0x%08X, class=0x%08X, obj=0x%08X",
+  NSLog(@"new map: cx=0x%p, nrefs=%i, ops=0x%p, class=0x%p, obj=0x%p",
        cx, nrefs, ops, clasp, obj);
 #endif
   

diff --git a/Recycler/NGJavaScript/NGJavaScriptContext.m b/Recycler/NGJavaScript/NGJavaScriptContext.m
index 7a0179607f4835a7c01b1e1071793c5e895545b3..a3d5535f85d25608f3af6d4cae38823b41f6b7bd 100644 (file)
--- a/Recycler/NGJavaScript/NGJavaScriptContext.m
+++ b/Recycler/NGJavaScript/NGJavaScriptContext.m
@@ -140,7 +140,7 @@ static JSBool global_resolve(JSContext *cx, JSObject *obj, jsval _id) {
   [self->rt release];
   [super dealloc];
   
-  if (debugDealloc) NSLog(@"did dealloc context: 0x%08X", self);
+  if (debugDealloc) NSLog(@"did dealloc context: 0x%p", self);
 }
 
 - (BOOL)loadStandardClasses {
@@ -366,7 +366,7 @@ static JSBool global_resolve(JSContext *cx, JSObject *obj, jsval _id) {
 
 - (NSString *)description {
   return [NSString stringWithFormat:
-                     @"<%@[0x%08X]: %@%@handle=0x%08X version=%i runtime=%@>",
+                     @"<%@[0x%p]: %@%@handle=0x%p version=%i runtime=%@>",
                      NSStringFromClass([self class]), self,
                      [self isRunning]      ? @"running "      : @"",
                      [self isConstructing] ? @"constructing " : @"",

diff --git a/Recycler/NGJavaScript/NGJavaScriptError.m b/Recycler/NGJavaScript/NGJavaScriptError.m
index 17df767513ac067a3505ffebfdaa941c2657fde9..bffc05b7c8c532c7fa9b9c3b4081aefcd2d1194c 100644 (file)
--- a/Recycler/NGJavaScript/NGJavaScriptError.m
+++ b/Recycler/NGJavaScript/NGJavaScriptError.m
@@ -114,9 +114,9 @@
   NSMutableString *ms = [NSMutableString stringWithCapacity:64];
   id tmp;
   
-  [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+  [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
   if (self->cx)
-    [ms appendFormat:@" cx=0x%08X", self->cx];
+    [ms appendFormat:@" cx=0x%p", self->cx];
   else
     [ms appendString:@" no-cx"];
   

diff --git a/Recycler/NGJavaScript/NGJavaScriptLanguage.m b/Recycler/NGJavaScript/NGJavaScriptLanguage.m
index 3e8519e9310289c23bf309b88b5e406c9adefa4b..11f663408be9aef9332fc5e56da51847e47d3c61 100644 (file)
--- a/Recycler/NGJavaScript/NGJavaScriptLanguage.m
+++ b/Recycler/NGJavaScript/NGJavaScriptLanguage.m
@@ -83,7 +83,7 @@
   srcname = [_source cString];
   
 #if 0
-  NSLog(@"%s:%i eval script on objc=0x%08X js=0x%08X cx=0x%08X", 
+  NSLog(@"%s:%i eval script on objc=0x%p js=0x%p cx=0x%p", 
        [_source cString], _line,
        _object, jso, cx);
 #endif

diff --git a/Recycler/NGJavaScript/NGJavaScriptObjCClassInfo.m b/Recycler/NGJavaScript/NGJavaScriptObjCClassInfo.m
index 53c6694464961c37bfa79f85054c86ede92d22af..8d7711c45e9fbb76022fcce4b84e87b9d09fbeda 100644 (file)
--- a/Recycler/NGJavaScript/NGJavaScriptObjCClassInfo.m
+++ b/Recycler/NGJavaScript/NGJavaScriptObjCClassInfo.m
@@ -313,7 +313,7 @@
   JSBool ret;
   
   if (NGJavaScriptBridge_LOG_PROP_DEFINITION) {
-    NSLog(@"%s: definition of %@ property '%@' on j0x%08X",
+    NSLog(@"%s: definition of %@ property '%@' on j0x%p",
           __PRETTY_FUNCTION__, _ro ? @"ro/noslot" : @"rw/noslot", 
          mname, _jso);
   }
@@ -342,8 +342,8 @@
   
   if ((fspecs = [self functionSpecs])) {  
     if (!JS_DefineFunctions(_cx, _jso, fspecs)) {
-      NSLog(@"ERROR(%s): couldn't define static JS functions (0x%08X) on "
-           @"JSObject 0x%08X in JSContext 0x%08X ..", 
+      NSLog(@"ERROR(%s): couldn't define static JS functions (0x%p) on "
+           @"JSObject 0x%p in JSContext 0x%p ..", 
            __PRETTY_FUNCTION__, fspecs, _jso, _cx);
       return NO;
     }
@@ -357,7 +357,7 @@
                 onObject:_jso inJSContext:_cx];
     if (!ret) {
       NSLog(@"ERROR(%s): couldn't define property '%@' on "
-           @"JSObject 0x%08X in JSContext 0x%08X", 
+           @"JSObject 0x%p in JSContext 0x%p", 
            __PRETTY_FUNCTION__, mname, _jso, _cx);
       continue;
     }

diff --git a/Recycler/NGJavaScript/NGJavaScriptObject.m b/Recycler/NGJavaScript/NGJavaScriptObject.m
index 5d5c674526187933afc6ffd37bb379c01f457c7f..26618af0190ac9262a709d2698b81e3d190009e2 100644 (file)
--- a/Recycler/NGJavaScript/NGJavaScriptObject.m
+++ b/Recycler/NGJavaScript/NGJavaScriptObject.m
@@ -115,7 +115,7 @@
 
 - (void)dealloc {
   if (NGJavaScriptBridge_TRACK_MEMORY) {
-    NSLog(@"%s: dealloc o0x%08X j0x%08X ctx=0x%08X jcx=0x%08X",
+    NSLog(@"%s: dealloc o0x%p j0x%p ctx=0x%p jcx=0x%p",
           __PRETTY_FUNCTION__, self, self->handle,
           self->ctx, self->jscx);
   }
@@ -420,7 +420,7 @@
   if (val == JSVAL_VOID) {
     /* property is not defined */
 #if 0
-    NSLog(@"%s: got void for key '%s' o0x%08X j0x%08X",
+    NSLog(@"%s: got void for key '%s' o0x%p j0x%p",
           __PRETTY_FUNCTION__,
           ckey, self, self->handle);
 #endif
@@ -599,7 +599,7 @@
   id tmp;
   
   ms = [NSMutableString stringWithCapacity:32];
-  [ms appendFormat:@"<%@[0x%08X]: handle=0x%08X>",
+  [ms appendFormat:@"<%@[0x%p]: handle=0x%p>",
                      NSStringFromClass([self class]), self,
                      [self handle]];
   if ((tmp = [self javaScriptClassName]))
@@ -683,7 +683,7 @@
 
 - (NSString *)description {
   return [NSString stringWithFormat:
-                    @"<0x%08X[%@]: len=%d>",
+                    @"<0x%p[%@]: len=%d>",
                     self, NSStringFromClass([self class]),
                     self->idArray ? self->idArray->length : 0];
 }

diff --git a/Recycler/NGJavaScript/NGJavaScriptObjectHandler.m b/Recycler/NGJavaScript/NGJavaScriptObjectHandler.m
index 49685ef3ab48d2e8eb6cd87c9fae9dc4c9ac13db..ae5d40d8c46e04ace7f53eaab0e698f6e932aaf4 100644 (file)
--- a/Recycler/NGJavaScript/NGJavaScriptObjectHandler.m
+++ b/Recycler/NGJavaScript/NGJavaScriptObjectHandler.m
@@ -230,7 +230,7 @@ JSClass NGJavaScriptObjectHandler_JSClass = {
   */
   
   if (NGJavaScriptBridge_TRACK_MEMORY) {
-    NSLog(@"%s: dealloc 0x%08X<%@> at 0x%08X on j0x%08X",
+    NSLog(@"%s: dealloc 0x%p<%@> at 0x%p on j0x%p",
           __PRETTY_FUNCTION__,
           self, NSStringFromClass([self class]),
           self->managedObject,
@@ -249,7 +249,7 @@ JSClass NGJavaScriptObjectHandler_JSClass = {
       
       priv = JS_GetPrivate(cx, self->jsObject);
       if (priv == self) {
-        NSLog(@"ERROR(%s): object handler 0x%08X still has a private ???",
+        NSLog(@"ERROR(%s): object handler 0x%p still has a private ???",
               __PRETTY_FUNCTION__, self);
         JS_SetPrivate(cx, self->jsObject, NULL);
       }
@@ -257,7 +257,7 @@ JSClass NGJavaScriptObjectHandler_JSClass = {
   }
   else {
     if (self->jsRootRC > 0) {
-      NSLog(@"WARNING(%s): jsRootRc > 0, but jsObject is missing 0x%08X",
+      NSLog(@"WARNING(%s): jsRootRc > 0, but jsObject is missing 0x%p",
             __PRETTY_FUNCTION__, self);
     }
   }
@@ -306,7 +306,7 @@ JSClass NGJavaScriptObjectHandler_JSClass = {
   /* WATCH OUT: leaks memory ! */
   char *buf;
   buf = malloc(32);
-  sprintf(buf, "ObjC:0x%08X", (unsigned)self);
+  sprintf(buf, "ObjC:0x%p", (unsigned)self);
   return buf;
 #else
   return "ObjC root";
@@ -579,7 +579,7 @@ staticFuncDispatcher
     else
       cname = "<no class>";
     
-    printf("%s: cx=0x%08X, obj=0x%08X<%s>, argc=%d\n",
+    printf("%s: cx=0x%p, obj=0x%p<%s>, argc=%d\n",
            __PRETTY_FUNCTION__,
            cx, obj, cname, argc);
   }
@@ -731,8 +731,8 @@ staticFuncDispatcher
   NSMutableString *ms;
   
   ms = [NSMutableString stringWithCapacity:256];
-  [ms appendFormat:@"<%@[0x%08X]:", NSStringFromClass([self class]), self];
-  [ms appendFormat:@" handle=0x%08X", [self handle]];
+  [ms appendFormat:@"<%@[0x%p]:", NSStringFromClass([self class]), self];
+  [ms appendFormat:@" handle=0x%p", [self handle]];
   [ms appendFormat:@" class=%@", [self javaScriptClassName]];
   [ms appendFormat:@" parent=%@", [self parentObject]];
   [ms appendString:@">"];
@@ -765,7 +765,7 @@ static inline JSBool _propOp(JSContext *cx, NGPropOp op,
     return JS_PropertyStub(cx, obj, _id, vp);
 
   NSCAssert2(self->managedObject,
-             @"missing managed object (handler=%@, j0x%08X) !",
+             @"missing managed object (handler=%@, j0x%p) !",
              self, obj);
   
   if (JSVAL_IS_INT(_id)) {
@@ -855,7 +855,7 @@ static inline JSBool _propOp(JSContext *cx, NGPropOp op,
       case NGPropOp_add: {
         if (NGJavaScriptBridge_LOG_PROP_ADD) {
           NSLog(@"JS: add by name '%@' type %s "
-                @"j0x%08X o0x%08X<%@> on o0x%08X<%@>",
+                @"j0x%p o0x%p<%@> on o0x%p<%@>",
                 name, JS_GetTypeName(cx, JS_TypeOfValue(cx, *vp)),
                 obj, self, NSStringFromClass([self class]),
                 self->managedObject,
@@ -881,7 +881,7 @@ static inline JSBool _propOp(JSContext *cx, NGPropOp op,
         
         if (NGJavaScriptBridge_LOG_PROP_GET) {
           NSLog(@"JS: get by name '%@' type %s "
-                @"j0x%08X o0x%08X<%@> on o0x%08X<%@>",
+                @"j0x%p o0x%p<%@> on o0x%p<%@>",
                 name, JS_GetTypeName(cx, JS_TypeOfValue(cx, *vp)),
                 obj, self, NSStringFromClass([self class]),
                 self->managedObject,
@@ -896,7 +896,7 @@ static inline JSBool _propOp(JSContext *cx, NGPropOp op,
             v   = [self->managedObject valueForJSPropertyNamed:name];
             
             if (NGJavaScriptBridge_LOG_PROP_GET) {
-              NSLog(@"  return value o0x%08X<%@>",
+              NSLog(@"  return value o0x%p<%@>",
                     v, NSStringFromClass([v class]));
             }
             
@@ -917,7 +917,7 @@ static inline JSBool _propOp(JSContext *cx, NGPropOp op,
         
         if (NGJavaScriptBridge_LOG_PROP_SET) {
           NSLog(@"JSObjectHandler: set by name '%@' type %s "
-                @"j0x%08X o0x%08X<%@> on o0x%08X<%@>",
+                @"j0x%p o0x%p<%@> on o0x%p<%@>",
                 name, JS_GetTypeName(cx, JS_TypeOfValue(cx, *vp)),
                 obj, self, NSStringFromClass([self class]),
                 self->managedObject,
@@ -1079,7 +1079,7 @@ static void _finalize(JSContext *cx, JSObject *obj) {
     NSCAssert(self->managedObject, @"missing managed object !");
     
     if (NGJavaScriptBridge_TRACK_FINALIZATION) {
-      NSLog(@"finalizing j0x%08X o0x%08X<%@>",
+      NSLog(@"finalizing j0x%p o0x%p<%@>",
             obj, 
             self->managedObject, 
            NSStringFromClass([self->managedObject class]));

diff --git a/Recycler/NGJavaScript/NGJavaScriptObjectMappingContext.m b/Recycler/NGJavaScript/NGJavaScriptObjectMappingContext.m
index 3490aeaed54b693046174152de8a0a4e5bf705d0..ac9014449d2e2ff972783d802a6cd59c6cd4c5cd 100644 (file)
--- a/Recycler/NGJavaScript/NGJavaScriptObjectMappingContext.m
+++ b/Recycler/NGJavaScript/NGJavaScriptObjectMappingContext.m
@@ -218,18 +218,18 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
   id   parent;
   
   if (logHandleForObject)
-    NSLog(@"-proxyForObject:0x%08X %@", _object, _object);
+    NSLog(@"-proxyForObject:0x%p %@", _object, _object);
   
   if (_object == nil) {
     jso = JSVAL_TO_OBJECT(JSVAL_NULL);
-    if (logHandleForObject) NSLog(@"  => is nil: 0x%08X", jso);
+    if (logHandleForObject) NSLog(@"  => is nil: 0x%p", jso);
     return jso;
   }
   
   if ([_object respondsToSelector:@selector(_jsHandleInMapContext:)]) {
     jso = [_object _jsHandleInMapContext:self];
     if (logHandleForObject) {
-      NSLog(@"  obj (class %@) handles itself: 0x%08X", 
+      NSLog(@"  obj (class %@) handles itself: 0x%p", 
            NSStringFromClass([_object class]), jso);
     }
     return jso;
@@ -237,20 +237,20 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
   
   if ((jso = NSMapGet(self->objcToJS, _object))) {
     /* a proxy is already registered */
-    if (logHandleForObject) NSLog(@"  proxy already registered: 0x%08X", jso);
+    if (logHandleForObject) NSLog(@"  proxy already registered: 0x%p", jso);
     return jso;
   }
   
   if ((combinedObjInfo = NSMapGet(combinedToInfo, _object))) {
     /* check for correct context */
     if (combinedObjInfo->ctx != self) {
-      NSLog(@"%s: tried to access combined object 0x%08X<%@> in "
-            @"different mapping context (ctx=0x%08X, required=0x%08X)  !",
+      NSLog(@"%s: tried to access combined object 0x%p<%@> in "
+            @"different mapping context (ctx=0x%p, required=0x%p)  !",
             __PRETTY_FUNCTION__, _object, NSStringFromClass([_object class]),
             self, combinedObjInfo->ctx);
       return nil;
     }
-    if (logHandleForObject) NSLog(@"  proxy is combined object: 0x%08X", jso);
+    if (logHandleForObject) NSLog(@"  proxy is combined object: 0x%p", jso);
     return combinedObjInfo->jso;
   }
   
@@ -261,9 +261,9 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
     /* register proxy */
 #if DEBUG
     NSAssert1(NSMapGet(self->objcToJS, _object) == NULL,
-              @"already registered a proxy for object o0x%08X", _object);
+              @"already registered a proxy for object o0x%p", _object);
 #endif
-    if (logHandleForObject) NSLog(@"  register handle 0x%08X ...", jso);
+    if (logHandleForObject) NSLog(@"  register handle 0x%p ...", jso);
     NSMapInsertKnownAbsent(self->objcToJS, _object, jso);
   }
   else {
@@ -279,7 +279,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
     JSBool res;
     
     if (logHandleForObject) 
-      NSLog(@"register parent 0x%08X for object .."), parent;
+      NSLog(@"register parent 0x%p for object .."), parent;
     
     pjso = [self handleForObject:parent];
     
@@ -314,7 +314,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
     return nil;
   
   if ((handleClass = JS_GetClass(_handle)) == NULL) {
-    NSLog(@"couldn't get class of handle 0x%08X", (unsigned)_handle);
+    NSLog(@"couldn't get class of handle 0x%p", (unsigned)_handle);
     return nil;
   }
   
@@ -324,7 +324,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
     NGJavaScriptObjectHandler *h;
     
     if ((h = JS_GetPrivate([self->jsContext handle], _handle)) == nil) {
-      NSLog(@"couldn't get private of JS object 0x%08X "
+      NSLog(@"couldn't get private of JS object 0x%p "
             @"(NGJavaScriptObjectHandler)", _handle);
       return nil;
     }
@@ -336,7 +336,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
     NGJavaScriptShadow *h;
     
     if ((h = JS_GetPrivate([self->jsContext handle], _handle)) == nil) {
-      NSLog(@"couldn't get private of JS shadow object 0x%08X "
+      NSLog(@"couldn't get private of JS shadow object 0x%p "
             @"(NGJavaScriptShadow)", _handle);
       return nil;
     }
@@ -367,7 +367,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
   
   if ((combinedObjInfo = NSMapGet(combinedToInfo, _object))) {
     if (combinedObjInfo->ctx != self) {
-      NSLog(@"forget combined object 0x%08X in wrong context !", _object);
+      NSLog(@"forget combined object 0x%p in wrong context !", _object);
     }
     else
       [self _jsFinalizeCombinedObject:_object];
@@ -377,7 +377,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
       JSObject *jso;
       
       jso = NSMapGet(self->objcToJS, _object);
-      NSLog(@"forgetting non-combined object o0x%08X<%@> j0x%08X rc %d",
+      NSLog(@"forgetting non-combined object o0x%p<%@> j0x%p rc %d",
             _object, NSStringFromClass([_object class]),
             jso,
             [_object retainCount]);
@@ -402,7 +402,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
   JSObject *jso;
   
   if ((jso = [self handleForObject:_object]) == NULL) {
-    NSLog(@"did not find handle for object 0x%08X", _object);
+    NSLog(@"did not find handle for object 0x%p", _object);
     return nil;
   }
   
@@ -446,7 +446,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
   while (NSNextMapEnumeratorPair(&e, (void*)&jso, (void*)&proxy)) {
     jsClass = jso ? JS_GetClass(jso) : NULL;
     
-    printf("  0x%08X %-20s 0x%08X %-26s %2d\n",
+    printf("  0x%p %-20s 0x%p %-26s %2d\n",
           (unsigned)jso,
            jsClass ? jsClass->name : "<null>",
           (unsigned)proxy,
@@ -478,7 +478,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
     
     jsClass = jsProxy ? JS_GetClass(jsProxy) : NULL;
     
-    printf("  0x%08X %-20s 0x%08X %-26s %2d\n",
+    printf("  0x%p %-20s 0x%p %-26s %2d\n",
           (unsigned)object,
           [NSStringFromClass([object class]) cString],
           (unsigned)jsProxy,
@@ -609,7 +609,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
   
   if ([_obj respondsToSelector:@selector(_jsGetValue:inJSContext:)]) {
     if (logValueConversion) {
-      NSLog(@"%s(0x%08X, 0x%08X<%@>) => own handling ..", 
+      NSLog(@"%s(0x%p, 0x%p<%@>) => own handling ..", 
              __PRETTY_FUNCTION__,
              _value, _obj, NSStringFromClass([_obj class]));
     }
@@ -620,7 +620,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
     JSObject *jso;
 
     if (logValueConversion) {
-      NSLog(@"%s(0x%08X, 0x%08X<%@>) => get handle ..", 
+      NSLog(@"%s(0x%p, 0x%p<%@>) => get handle ..", 
              __PRETTY_FUNCTION__,
              _value, _obj, NSStringFromClass([_obj class]));
     }
@@ -633,7 +633,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
   }
   else {
     if (logValueConversion) {
-      NSLog(@"%s(0x%08X, 0x%08X<%@>) => missing value store ?", 
+      NSLog(@"%s(0x%p, 0x%p<%@>) => missing value store ?", 
              __PRETTY_FUNCTION__,
              _value, _obj, NSStringFromClass([_obj class]));
     }
@@ -697,8 +697,8 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
   NSMapInsertKnownAbsent(combinedToInfo,  _object, combinedObjInfo);
   
   if (NGJavaScriptBridge_TRACK_MEMORY) {
-    NSLog(@"combine: o0x%08X<%@>->j0x%08X "
-          @"(handler=0x%08X, old-rc=%d, new-rc=%d)",
+    NSLog(@"combine: o0x%p<%@>->j0x%p "
+          @"(handler=0x%p, old-rc=%d, new-rc=%d)",
           _object, NSStringFromClass([_object class]),
           combinedObjInfo->jso, combinedObjInfo->handler, oldRC, [_object retainCount]);
   }
@@ -729,7 +729,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
         "h#");
   e = NSEnumerateMapTable(combinedToInfo);
   while (NSNextMapEnumeratorPair(&e, (void*)&object, (void*)&combinedObjInfo)) {
-    printf("  0x%08X %-16s %2d 0x%08X 0x%08X 0x%08X %2d %2d\n", 
+    printf("  0x%p %-16s %2d 0x%p 0x%p 0x%p %2d %2d\n", 
           (unsigned)object, [NSStringFromClass([object class]) cString],
           [object retainCount],
           (unsigned)combinedObjInfo->jso,
@@ -759,7 +759,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
       }
       
       if (NGJavaScriptBridge_TRACK_MEMORY) {
-        NSLog(@"FREEING COMBINED OBJECT o%08X<%@>-j%08X (handler 0x%08X).",
+        NSLog(@"FREEING COMBINED OBJECT o%p<%@>-j%p (handler 0x%p).",
               _object, NSStringFromClass([_object class]),
               combinedObjInfo->jso, combinedObjInfo->handler);
       }
@@ -819,7 +819,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
   
   if ((combinedObjInfo = NSMapGet(combinedToInfo, self)) == NULL) {
     if (NGJavaScriptBridge_TRACK_NOINFO_MEMORY) {
-      NSLog(@"CO: NO INFO retain: o%08X<%@>, rc=%d",
+      NSLog(@"CO: NO INFO retain: o%p<%@>, rc=%d",
             self, NSStringFromClass([self class]), [self retainCount]);
     }
     return [super retain];
@@ -827,7 +827,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
   
   if (combinedObjInfo->handler == nil) {
     if (NGJavaScriptBridge_TRACK_MEMORY) {
-      NSLog(@"CO: NO HANDLER retain: o%08X<%@>-j0x%08X, rc=%d",
+      NSLog(@"CO: NO HANDLER retain: o%p<%@>-j0x%p, rc=%d",
             self, NSStringFromClass([self class]),
             combinedObjInfo->jso, [self retainCount]);
     }
@@ -846,7 +846,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
   combinedObjInfo->rc++;
   
   if (NGJavaScriptBridge_TRACK_MEMORY_RC) {
-    NSLog(@"CO: retain: o%08X<%@>-j%08X (handler=0x%08X), rc=%d, root-rc=%d",
+    NSLog(@"CO: retain: o%p<%@>-j%p (handler=0x%p), rc=%d, root-rc=%d",
           self, NSStringFromClass([self class]), combinedObjInfo->jso, combinedObjInfo->handler,
           combinedObjInfo->rc, [combinedObjInfo->handler jsRootRetainCount]);
   }
@@ -859,7 +859,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
 
   if ((combinedObjInfo = NSMapGet(combinedToInfo, self)) == NULL) {
     if (NGJavaScriptBridge_TRACK_NOINFO_MEMORY)
-      NSLog(@"CO: NO INFO release: o%08X, rc=%d", self, [self retainCount]);
+      NSLog(@"CO: NO INFO release: o%p, rc=%d", self, [self retainCount]);
     
     [super release];
     return;
@@ -867,7 +867,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
   
   if (combinedObjInfo->handler == nil) {
     if (NGJavaScriptBridge_TRACK_MEMORY) {
-      NSLog(@"CO: NO HANDLER release: o%08X<%@>-j0x%08X, rc=%d",
+      NSLog(@"CO: NO HANDLER release: o%p<%@>-j0x%p, rc=%d",
             self, NSStringFromClass([self class]),
             combinedObjInfo->jso, [self retainCount]);
     }
@@ -877,12 +877,12 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
   }
   
   if (NGJavaScriptBridge_TRACK_MEMORY_RC) {
-    NSLog(@"CO: release: o%08X<%@>-j%08X (handler=0x%08X), rc=%d, root-rc=%d",
+    NSLog(@"CO: release: o%p<%@>-j%p (handler=0x%p), rc=%d, root-rc=%d",
           self, NSStringFromClass([self class]), combinedObjInfo->jso, combinedObjInfo->handler,
           [self retainCount], [combinedObjInfo->handler jsRootRetainCount]);
   }
   NSAssert1(combinedObjInfo->handler,
-            @"missing handler for combined object 0x%08X ..", self);
+            @"missing handler for combined object 0x%p ..", self);
 
   
   /*
@@ -901,7 +901,7 @@ static NSMapTable *combinedToInfo = NULL; // combined objects
     combinedObjInfo->rootRef = NO;
     
     if (NGJavaScriptBridge_TRACK_MEMORY) {
-      NSLog(@"%s: released last ObjC reference of o%08X-j%08X, %d root-refs ..",
+      NSLog(@"%s: released last ObjC reference of o%p-j%p, %d root-refs ..",
             __PRETTY_FUNCTION__,
             self, combinedObjInfo->jso, [combinedObjInfo->handler jsRootRetainCount]);
     }

diff --git a/Recycler/NGJavaScript/NGJavaScriptRuntime.m b/Recycler/NGJavaScript/NGJavaScriptRuntime.m
index 5bdf9b6cb69f710dec237861aa8977b43bf5cc4a..16ae80d726b3efddbd8c6bc55186422c8e6808f7 100644 (file)
--- a/Recycler/NGJavaScript/NGJavaScriptRuntime.m
+++ b/Recycler/NGJavaScript/NGJavaScriptRuntime.m
@@ -106,7 +106,7 @@ static void rootDumper(const char *name, void *rp, void *data)
      __attribute__((unused));
 
 static void rootDumper(const char *name, void *rp, void *data) {
-  printf("ROOT: %s rp=0x%08X rt=0x%08X\n", name, (unsigned)rp, (unsigned)data);
+  printf("ROOT: %s rp=0x%p rt=0x%p\n", name, (unsigned)rp, (unsigned)data);
 }
 
 - (void)dumpNamedRoots {
@@ -151,7 +151,7 @@ static void rootDumper(const char *name, void *rp, void *data) {
 
 - (NSString *)description {
   return [NSString stringWithFormat:
-                     @"<%@[0x%08X]: handle=0x%08X>",
+                     @"<%@[0x%p]: handle=0x%p>",
                      NSStringFromClass([self class]), self,
                      [self handle]
                    ];

diff --git a/Recycler/NGJavaScript/NGJavaScriptShadow.m b/Recycler/NGJavaScript/NGJavaScriptShadow.m
index 1803a9efeb269045730cedb1e21d9a3299f5ef1c..a846b2b5eaef9dd85343672104e20900bd6062b2 100644 (file)
--- a/Recycler/NGJavaScript/NGJavaScriptShadow.m
+++ b/Recycler/NGJavaScript/NGJavaScriptShadow.m
@@ -50,8 +50,8 @@ static void _finalize(JSContext *cx, JSObject *obj) {
     //printf("finalized JS shadow ..\n");
   }
   else {
-    NSLog(@"ERROR(%s): finalizing JS shadow j0x%08X, "
-          @"still has a private o0x%08X !!!",
+    NSLog(@"ERROR(%s): finalizing JS shadow j0x%p, "
+          @"still has a private o0x%p !!!",
           __PRETTY_FUNCTION__, obj, self);
   }
 }
@@ -130,7 +130,7 @@ static NGJavaScriptObjCClassInfo *jsClassInfo(Class _class) {
 
 - (void)dealloc {
   if (NGJavaScriptBridge_TRACK_MEMORY) {
-    NSLog(@"%s: dealloc shadow o0x%08X j0x%08X ctx=0x%08X jcx=0x%08X",
+    NSLog(@"%s: dealloc shadow o0x%p j0x%p ctx=0x%p jcx=0x%p",
           __PRETTY_FUNCTION__, self, self->handle,
           self->ctx, self->jscx);
   }

diff --git a/Recycler/NGJavaScript/tests/JSBridgeTests.m b/Recycler/NGJavaScript/tests/JSBridgeTests.m
index 15889368e8bc279d84b10f087d2c44a011a13e13..b7f9f067914f75609c16a1529505e3b887c7c0b7 100644 (file)
--- a/Recycler/NGJavaScript/tests/JSBridgeTests.m
+++ b/Recycler/NGJavaScript/tests/JSBridgeTests.m
@@ -60,10 +60,10 @@ NSString *testScript2 =
   pool = [[NSAutoreleasePool alloc] init];
   
   global = [mapCtx globalObject];
-  [self print:@"global is 0x%08X %@", global, global];
+  [self print:@"global is 0x%p %@", global, global];
   
   jobj = [[Blah alloc] init];
-  [self print:@"  blah: %@ -> j0x%08X", jobj, [mapCtx handleForObject:jobj]];
+  [self print:@"  blah: %@ -> j0x%p", jobj, [mapCtx handleForObject:jobj]];
 
   [self print:@"  do: MyType()"];
   result = [jobj evaluateScript:@"MyType()" language:SLANG];
@@ -159,13 +159,13 @@ NSString *testScript2 =
   id   global;
   
   global = [mapCtx globalObject];
-  NSLog(@"global is 0x%08X %@", global, global);
+  NSLog(@"global is 0x%p %@", global, global);
   
   blah = [[Blah alloc] init];
   [global setObject:blah forKey:@"blah"];
   
   jso = NGObjectMapping_GetHandleForObject(blah);
-  NSLog(@"obj o0x%08X j0x%08X", blah, jso);
+  NSLog(@"obj o0x%p j0x%p", blah, jso);
 
   for (i = 0; i < 3; i++) {
     NSAutoreleasePool *pool;
@@ -198,13 +198,13 @@ NSString *testScript2 =
   
   obj = [[Blah alloc] init];
   jso = NGObjectMapping_GetHandleForObject(obj);
-  NSLog(@"obj o0x%08X j0x%08X", obj, jso);
+  NSLog(@"obj o0x%p j0x%p", obj, jso);
   [obj evaluateScript:testScript2 language:SLANG];
 #endif
   
   jobj = [[NGJavaScriptObject alloc] init];
   jso = NGObjectMapping_GetHandleForObject(jobj);
-  //NSLog(@"obj o0x%08X j0x%08X", jobj, jso);
+  //NSLog(@"obj o0x%p j0x%p", jobj, jso);
 
 #if 0
   [[NGObjectMappingContext activeObjectMappingContext]

diff --git a/Recycler/NGJavaScript/tests/JSTest.m b/Recycler/NGJavaScript/tests/JSTest.m
index 5f4ff3e217c385b0c37cd77d2910d60f629ef958..32973df7bc26bf105b74f4ef34a7b660822456a7 100644 (file)
--- a/Recycler/NGJavaScript/tests/JSTest.m
+++ b/Recycler/NGJavaScript/tests/JSTest.m
@@ -76,7 +76,7 @@
   jso = [[NGObjectMappingContext activeObjectMappingContext]
                                 handleForObject:obj];
   
-  [self print:@"info on o0x%08X j0x%08X", obj, jso];
+  [self print:@"info on o0x%p j0x%p", obj, jso];
   [self print:@"  description: %@", obj];
   
   e = [obj keyEnumerator];

diff --git a/Recycler/NGJavaScript/tests/MyNum.m b/Recycler/NGJavaScript/tests/MyNum.m
index 4e20f406f69ecad6d77d27b89b4e992d095979bb..6bb05b874f3fb74668bdc7987718d7e8536c2168 100644 (file)
--- a/Recycler/NGJavaScript/tests/MyNum.m
+++ b/Recycler/NGJavaScript/tests/MyNum.m
@@ -32,7 +32,7 @@
 }
 
 - (void)dealloc {
-  NSLog(@"dealloc MyNum: 0x%08X %i", self, self->i);
+  NSLog(@"dealloc MyNum: 0x%p %i", self, self->i);
   [super dealloc];
 }
 

diff --git a/Recycler/NGObjDOM/ODNodeRenderer+attributes.m b/Recycler/NGObjDOM/ODNodeRenderer+attributes.m
index 61b05a8b2f5b594e1e736fda70f72e2bf89dc3c2..bc17ef3dab75032fe6156bbdb74139f292d30be4 100644 (file)
--- a/Recycler/NGObjDOM/ODNodeRenderer+attributes.m
+++ b/Recycler/NGObjDOM/ODNodeRenderer+attributes.m
@@ -277,7 +277,7 @@ static void _categoryInitialize(void) {
   }
   
   if (logValues) {
-    [self logWithFormat:@"  return value: %@ (%@,0x%08X)\n", 
+    [self logWithFormat:@"  return value: %@ (%@,0x%p)\n", 
            value ? value: @"<nil>", NSStringFromClass([value class]), value];
   }
   return value;

diff --git a/Recycler/NGObjDOM/ODNodeRendererFactorySet.m b/Recycler/NGObjDOM/ODNodeRendererFactorySet.m
index 7f963509a63e2b7415f57ec147c2a75c26a5d224..16d91bddcb4a89767f060af5875fa5dec20ba160 100644 (file)
--- a/Recycler/NGObjDOM/ODNodeRendererFactorySet.m
+++ b/Recycler/NGObjDOM/ODNodeRendererFactorySet.m
@@ -211,7 +211,7 @@
   
   ms = [NSMutableString stringWithCapacity:32];
   
-  [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+  [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
   [ms appendFormat:@" factories=#%d", [self->subfactories count]];
   [ms appendFormat:@">"];
   

diff --git a/Recycler/NGScripting/NGObjectMappingContext.m b/Recycler/NGScripting/NGObjectMappingContext.m
index b85db3cf6ded92cb238ad06d6c4c2af4f188f76f..78111e0f4cb33986cd9550001dd98587e3b46529 100644 (file)
--- a/Recycler/NGScripting/NGObjectMappingContext.m
+++ b/Recycler/NGScripting/NGObjectMappingContext.m
@@ -77,9 +77,9 @@ static unsigned currentContextDepth = 0;
 
 #if DEBUG_CTX_STACK
   if (currentContextDepth == 1)
-    printf("PUSHED first 0x%08X\n", self);
+    printf("PUSHED first 0x%p\n", self);
   else
-    printf("PUSHED[%i]: 0x%08X, prev 0x%08X", 
+    printf("PUSHED[%i]: 0x%p, prev 0x%p", 
            currentContextDepth, self, ctxs[currentContextDepth - 2]);
   
   NSAssert([[self class] activeObjectMappingContext] == self,
@@ -95,9 +95,9 @@ static unsigned currentContextDepth = 0;
   
 #if DEBUG_CTX_STACK
   if (currentContextDepth == 1)
-    printf("POP first 0x%08X\n", self);
+    printf("POP first 0x%p\n", self);
   else
-    printf("POP[%i]: 0x%08X, activate 0x%08X", 
+    printf("POP[%i]: 0x%p, activate 0x%p", 
            currentContextDepth, self, ctxs[currentContextDepth - 2]);
 #endif
   currentContextDepth--;

diff --git a/Recycler/SxComponents/SxBasicAuthCredentials.m b/Recycler/SxComponents/SxBasicAuthCredentials.m
index 715649b77093a63263286a6e983cbc2af1ab1edf..0b1c68fd11e0055856765b01cc57cf4215db4ebd 100644 (file)
--- a/Recycler/SxComponents/SxBasicAuthCredentials.m
+++ b/Recycler/SxComponents/SxBasicAuthCredentials.m
@@ -119,7 +119,7 @@
 /* description */
 
 - (NSString *)description {
-  return [NSString stringWithFormat:@"<0x%08X[%@]: realm=%@ user=%@>",
+  return [NSString stringWithFormat:@"<0x%p[%@]: realm=%@ user=%@>",
                      self, NSStringFromClass([self class]),
                      [self realm], [self userName]];
 }

diff --git a/Recycler/SxComponents/SxComponent.m b/Recycler/SxComponents/SxComponent.m
index eca1ce3e54c34b4ae4840144bf575609323eb5d3..451eb84d90f124c69736fb38cfbf3ed029c72f4e 100644 (file)
--- a/Recycler/SxComponents/SxComponent.m
+++ b/Recycler/SxComponents/SxComponent.m
@@ -382,7 +382,7 @@ NSString *SxAsyncResultReadyNotificationName =
   NSMutableString *ms;
 
   ms = [NSMutableString stringWithCapacity:64];
-  [ms appendFormat:@"<0x%08X[%@]: name=%@",
+  [ms appendFormat:@"<0x%p[%@]: name=%@",
         self, NSStringFromClass([self class]),
         [self componentName]];
   [ms appendString:@">"];

diff --git a/Recycler/SxComponents/SxComponentException.m b/Recycler/SxComponents/SxComponentException.m
index 500524bf4f3ff147b4615e41afafa43e343a9db0..939dc7719409274339c6489bca58ee1ae8156996 100644 (file)
--- a/Recycler/SxComponents/SxComponentException.m
+++ b/Recycler/SxComponents/SxComponentException.m
@@ -77,7 +77,7 @@
   id t;
   
   ms = [NSMutableString stringWithCapacity:64];
-  [ms appendFormat:@"<0x%08X[%@]: name=%@",
+  [ms appendFormat:@"<0x%p[%@]: name=%@",
         self, NSStringFromClass([self class]),
         [self name]];
   

diff --git a/Recycler/SxComponents/SxComponentInvocation.m b/Recycler/SxComponents/SxComponentInvocation.m
index a561b7c48e01436d9ed8e70b9e96b9268f214e6a..a3b7fc19876725ac964887619e8bd81e911ae6d2 100644 (file)
--- a/Recycler/SxComponents/SxComponentInvocation.m
+++ b/Recycler/SxComponents/SxComponentInvocation.m
@@ -373,7 +373,7 @@ static NSNull *null = nil;
   NSMutableString *ms;
   
   ms = [NSMutableString stringWithCapacity:128];
-  [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+  [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
   [ms appendFormat:@" %@", self->methodName];
   if (self->arguments)
     [ms appendFormat:@" #args=%i", [self->arguments count]];

diff --git a/Recycler/SxComponents/SxComponentRegistry.m b/Recycler/SxComponents/SxComponentRegistry.m
index 88f208b4264ddfa673f9fea288c9e8d532e617e3..121978204788033fae7ff3b46ad0da88212cb1f8 100644 (file)
--- a/Recycler/SxComponents/SxComponentRegistry.m
+++ b/Recycler/SxComponents/SxComponentRegistry.m
@@ -333,7 +333,7 @@ static SxComponentRegistry *defreg = nil;
 
 - (NSString *)description {
   return [NSString stringWithFormat:
-                     @"<0x%08X[%@]: backends=%@>",
+                     @"<0x%p[%@]: backends=%@>",
                      self, NSStringFromClass([self class]),
                      self->backends];
 }

diff --git a/Recycler/SxComponents/SxXmlRpcComponent.m b/Recycler/SxComponents/SxXmlRpcComponent.m
index 5ae6f5e6febff7c44b8e4e86b67139f4aa36b73c..a4f66852162741b9fc8f8d36935b968bf1121213 100644 (file)
--- a/Recycler/SxComponents/SxXmlRpcComponent.m
+++ b/Recycler/SxComponents/SxXmlRpcComponent.m
@@ -348,7 +348,7 @@
   NSMutableString *ms;
 
   ms = [NSMutableString stringWithCapacity:64];
-  [ms appendFormat:@"<0x%08X[%@]: name=%@",
+  [ms appendFormat:@"<0x%p[%@]: name=%@",
         self, NSStringFromClass([self class]),
         [self componentName]];
   [ms appendFormat:@" url=%@", [self->url absoluteString]];

diff --git a/Recycler/SxComponents/SxXmlRpcInvocation.m b/Recycler/SxComponents/SxXmlRpcInvocation.m
index ddfff61f258442dccc29ea780d3217df45a49a06..a8099fd33b2ceb7f13dfbd38623e657712371964 100644 (file)
--- a/Recycler/SxComponents/SxXmlRpcInvocation.m
+++ b/Recycler/SxComponents/SxXmlRpcInvocation.m
@@ -759,7 +759,7 @@ static NSNull *null = nil;
 
 - (NSString *)loggingPrefix {
   return [NSString stringWithFormat:
-                     @"XML-RPC Tx[%@] 0x%08X", 
+                     @"XML-RPC Tx[%@] 0x%p", 
                     [self->invocation methodName], self];
 }
 

diff --git a/Recycler/SxComponents/SxXmlRpcRegBackend.m b/Recycler/SxComponents/SxXmlRpcRegBackend.m
index 6ee7d56b3a43717cf615865cdaf55b4353f99492..24cf0e96c6b020ac7e71d8f583e23c1285cd6d57 100644 (file)
--- a/Recycler/SxComponents/SxXmlRpcRegBackend.m
+++ b/Recycler/SxComponents/SxXmlRpcRegBackend.m
@@ -321,7 +321,7 @@
 
 - (NSString *)description {
   return [NSString stringWithFormat:
-                     @"<0x%08X[%@]: server=%@>",
+                     @"<0x%p[%@]: server=%@>",
                      self, NSStringFromClass([self class]),
                      self->registryServer];
 }

diff --git a/Recycler/mod_objc/ApTest.m b/Recycler/mod_objc/ApTest.m
index 3940a2aaa178859aa5c5aa221c7c7a97183b4b2b..1f98d74268affa945095490d80fa6f0db126bb4d 100644 (file)
--- a/Recycler/mod_objc/ApTest.m
+++ b/Recycler/mod_objc/ApTest.m
@@ -11,11 +11,11 @@
 @implementation ApTest
 
 - (id)init {
-  //printf("INIT 0x%08X ..\n", (unsigned int)self);
+  //printf("INIT 0x%p ..\n", (unsigned int)self);
   return self;
 }
 - (void)dealloc {
-  //printf("DEALLOC 0x%08X ..\n", (unsigned int)self);
+  //printf("DEALLOC 0x%p ..\n", (unsigned int)self);
   [super dealloc];
 }
 

diff --git a/Recycler/mod_objc/ApacheCmdParms.m b/Recycler/mod_objc/ApacheCmdParms.m
index e88d4543d8ae78015521c2a862f2fb07f9c7f549..3f635c55ff0e07d46c78dfc86e100b78020a5060 100644 (file)
--- a/Recycler/mod_objc/ApacheCmdParms.m
+++ b/Recycler/mod_objc/ApacheCmdParms.m
@@ -50,9 +50,9 @@
   id tmp;
 
   ms = [NSMutableString stringWithCapacity:256];
-  [ms appendFormat:@"<0x%08X[%@]: ", self, NSStringFromClass([self class])];
+  [ms appendFormat:@"<0x%p[%@]: ", self, NSStringFromClass([self class])];
 
-  [ms appendFormat:@" 0x%08X ui=0x%08X", self->handle, [self userInfo]];
+  [ms appendFormat:@" 0x%p ui=0x%p", self->handle, [self userInfo]];
   
   if ((tmp = [self path]))
     [ms appendFormat:@" path=%@", tmp];

diff --git a/Recycler/mod_objc/ApacheConnection.m b/Recycler/mod_objc/ApacheConnection.m
index b7b102b83076be5bdc897ad45655f2b53dd0d130..c2c92c0e75c4fed87b8e6e7978784a4d8dfae266 100644 (file)
--- a/Recycler/mod_objc/ApacheConnection.m
+++ b/Recycler/mod_objc/ApacheConnection.m
@@ -84,8 +84,8 @@
   id tmp;
   
   ms = [NSMutableString stringWithCapacity:128];
-  [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
-  [ms appendFormat:@" 0x%08X", self->handle];
+  [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
+  [ms appendFormat:@" 0x%p", self->handle];
 
   if ([self isAborted])       [ms appendString:@" aborted"];
   if ([self usesKeepAlive])   [ms appendString:@" keepalive"];

diff --git a/Recycler/mod_objc/ApacheModule.m b/Recycler/mod_objc/ApacheModule.m
index 76e254a095954cf4a008bdaa3bb713756524f600..696fef18dd72aa91fe3a11261afd67fd12a4d9c7 100644 (file)
--- a/Recycler/mod_objc/ApacheModule.m
+++ b/Recycler/mod_objc/ApacheModule.m
@@ -26,9 +26,9 @@ int ApacheHandledRequest = OK;
   va_end(ap);
   
 #if DEBUG
-  printf("|0x%08X| %s\n", (unsigned int)self, [[value description] cString]);
+  printf("|0x%p| %s\n", (unsigned int)self, [[value description] cString]);
 #else
-  NSLog(@"|0x%08X| %@", self, value);
+  NSLog(@"|0x%p| %@", self, value);
 #endif
 }
 - (void)debugWithFormat:(NSString *)_format, ... {
@@ -48,10 +48,10 @@ int ApacheHandledRequest = OK;
     va_end(ap);
     
 #if DEBUG
-    printf("|0x%08X|D %s\n", (unsigned int)self,
+    printf("|0x%p|D %s\n", (unsigned int)self,
            [[value description] cString]);
 #else
-    NSLog(@"|0x%08X|D %@", self, value);
+    NSLog(@"|0x%p|D %@", self, value);
 #endif
   }
 }

diff --git a/Recycler/mod_objc/ApacheObject.m b/Recycler/mod_objc/ApacheObject.m
index 53a40c1b35d06afad50565c7166ab2f1cb4feb38..eb423224a5229857e188aa365cc903cab94c8c64 100644 (file)
--- a/Recycler/mod_objc/ApacheObject.m
+++ b/Recycler/mod_objc/ApacheObject.m
@@ -71,7 +71,7 @@ static NSMapTable *proxyRegistry = NULL; // THREAD
 /* description */
 
 - (NSString *)description {
-  return [NSString stringWithFormat:@"<0x%08X[%@]: apache=0x%08X>",
+  return [NSString stringWithFormat:@"<0x%p[%@]: apache=0x%p>",
                      self, NSStringFromClass([self class]),
                      self->handle];
 }

diff --git a/Recycler/mod_objc/ApacheRequest.m b/Recycler/mod_objc/ApacheRequest.m
index c4d17cde76c19cca4b13543c92b36aa9ddfd5b78..3022a3f8354a0a4e9396cb1103ba88dac1037b7c 100644 (file)
--- a/Recycler/mod_objc/ApacheRequest.m
+++ b/Recycler/mod_objc/ApacheRequest.m
@@ -427,8 +427,8 @@
   id tmp;
   
   ms = [NSMutableString stringWithCapacity:128];
-  [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
-  [ms appendFormat:@" 0x%08X", self->handle];
+  [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
+  [ms appendFormat:@" 0x%p", self->handle];
   
   if ([self isHeadRequest]) [ms appendString:@" head"];
   

diff --git a/Recycler/mod_objc/ApacheServer.m b/Recycler/mod_objc/ApacheServer.m
index 3317ee7d903d9ded7f8f0efea92828407614d28c..d84de98cf7731087bfe0f1b078d19fe69e9947e7 100644 (file)
--- a/Recycler/mod_objc/ApacheServer.m
+++ b/Recycler/mod_objc/ApacheServer.m
@@ -119,8 +119,8 @@ static NSString *mkString(const char *str) {
   id tmp;
 
   ms = [NSMutableString stringWithCapacity:128];
-  [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
-  [ms appendFormat:@" 0x%08X", self->handle];
+  [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
+  [ms appendFormat:@" 0x%p", self->handle];
   
   if ([self isVirtual])
     [ms appendString:@" virtual"];

diff --git a/Recycler/mod_objc/GSBundleModule.m b/Recycler/mod_objc/GSBundleModule.m
index bf803d5f8f9787f99dc5d4de517b1cd27be9d8c4..beddc8217542a4ff92dbc1b7187a80f1374b34c7 100644 (file)
--- a/Recycler/mod_objc/GSBundleModule.m
+++ b/Recycler/mod_objc/GSBundleModule.m
@@ -200,7 +200,7 @@ static void _ensureObjCEnvironment(void) {
   pool = [[NSAutoreleasePool alloc] init];
 
 #if 0
-  printf("\nSETUP 0x%08X (loaded=%s) ...\n", (unsigned int)self,
+  printf("\nSETUP 0x%p (loaded=%s) ...\n", (unsigned int)self,
          self->bundleLoaded ? "yes" : "no");
   fflush(stdout);
 #endif
@@ -270,7 +270,7 @@ static void _ensureObjCEnvironment(void) {
   pool = [[NSAutoreleasePool alloc] init];
 
 #if 0
-  printf("TEARDOWN 0x%08X ...\n", (unsigned int)self);
+  printf("TEARDOWN 0x%p ...\n", (unsigned int)self);
   fflush(stdout);
 #endif
 
@@ -310,7 +310,7 @@ static void _ensureObjCEnvironment(void) {
   }
 
 #if DEBUG && 0
-  printf("CONFIGURE 0x%08X ...\n", (unsigned int)self);
+  printf("CONFIGURE 0x%p ...\n", (unsigned int)self);
   fflush(stdout);
 #endif
   
@@ -346,8 +346,8 @@ const char *GSBundleModuleLoadBundleCommand
   callCount++;
   
 #if HEAVY_GSBUNDLE_DEBUG
-  printf("%s: #%i module=0x%08X pid=%i "
-         "(cmd=0x%08X,bp=0x%08X) ...\n",
+  printf("%s: #%i module=0x%p pid=%i "
+         "(cmd=0x%p,bp=0x%p) ...\n",
          __PRETTY_FUNCTION__, callCount, (unsigned int)module, getpid(),
          (unsigned int)cmd, (unsigned int)bundlePath);
   fflush(stdout); fflush(stderr);