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

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

diff --git a/sope-appserver/NGObjWeb/WOScriptedComponent.m b/sope-appserver/NGObjWeb/WOScriptedComponent.m
index 5e47eaa0ee80670af018967985e654caf7a16783..9fc436f1d66d034df68084ac14d0531a8467d9cf 100644 (file)
--- a/sope-appserver/NGObjWeb/WOScriptedComponent.m
+++ b/sope-appserver/NGObjWeb/WOScriptedComponent.m
@@ -1,24 +1,23 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2005 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of SOPE.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOPE is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOPE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
   License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
+  License along with SOPE; see the file COPYING.  If not, write to the
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "WOScriptedComponent.h"
 #include <NGObjWeb/WOTemplateBuilder.h>
@@ -249,19 +248,11 @@ static BOOL logScriptDealloc = NO;
 /* logging */
 
 - (NSString *)loggingPrefix {
-  return [NSString stringWithFormat:@"script<%@>[0x%08X]", [self name], self];
+  return [NSString stringWithFormat:@"script<%@>[0x%p]", [self name], self];
 }
 
 @end /* WOScriptedComponent */
 
-@implementation WOScriptedComponent(JSSupport)
-
-- (id)_jsfunc_FileManager:(NSArray *)_args {
-  return [NSFileManager defaultManager];
-}
-
-@end /* WOScriptedComponent(JSSupport) */
-
 @implementation NSObject(ScriptFunc)
 
 - (BOOL)isScriptFunction {