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

[sope] / sope-appserver / NGObjWeb / WebDAV / SoDAVLockManager.m

diff --git a/sope-appserver/NGObjWeb/WebDAV/SoDAVLockManager.m b/sope-appserver/NGObjWeb/WebDAV/SoDAVLockManager.m
index 8441f2a38515431842cdbd91c0c4b055bb0dad95..4e8e128d922f8ba56adc87ce615ebba4d1a2e116 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/SoDAVLockManager.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoDAVLockManager.m
@@ -94,7 +94,7 @@
       lockInfo = nil;
     }
   }
-  return lockInfo ? lockInfo->token : nil;
+  return [lockInfo isNotNull] ? lockInfo->token : (NSString *)nil;
 }
 
 @end /* SoDAVLockManager */