[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit e592f3d8afede8ef7d582b4dd99aa3cd8926c543
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 22 20:39:16 2003 +0000

    	Fixed 3266464.  Build problem on panther caused by overly
    	pedantic gcc.
    
            Reviewed by John.
    
            * WebView.subproj/WebPreferences.m:
            (-[WebPreferences initWithCoder:]):
            * WebView.subproj/WebView.m:
            (-[WebView initWithCoder:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4416 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 20750ca..06a16b5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,17 @@
 2003-05-22  Richard Williamson   <rjw at apple.com>
 
+	Fixed 3266464.  Build problem on panther caused by overly
+	pedantic gcc.
+
+        Reviewed by John.
+
+        * WebView.subproj/WebPreferences.m:
+        (-[WebPreferences initWithCoder:]):
+        * WebView.subproj/WebView.m:
+        (-[WebView initWithCoder:]):
+
+2003-05-22  Richard Williamson   <rjw at apple.com>
+
 	Add _web to method in category name.
 
 	Fixed 3266102.  @selector missing ":".
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 81e5ac9..c30e9a9 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -97,10 +97,10 @@ enum { WebPreferencesVersion = 1 };
 
 - (id)initWithCoder:(NSCoder *)decoder
 {
+NS_DURING
     int version;
     id result = nil;
 
-NS_DURING
 
     _private = [[WebPreferencesPrivate alloc] init];
     [decoder decodeValueOfObjCType:@encode(int) at:&version];
@@ -119,17 +119,11 @@ NS_DURING
             result = self;
         }
     }
-    
+    return result;
 NS_HANDLER
-
-    result = nil;
-
+    [self release];
+    return nil;
 NS_ENDHANDLER
-
-    if (result == nil)
-        [self release];
-
-    return result;
 }
 
 - (void)encodeWithCoder:(NSCoder *)encoder
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index e588236..5d74b62 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -131,33 +131,28 @@ enum { WebViewVersion = 1 };
 
 - (id)initWithCoder:(NSCoder *)decoder
 {
+NS_DURING
+
     id result = nil;
     int version;
 
-NS_DURING
-    self = [super initWithCoder:decoder];
+    result = [super initWithCoder:decoder];
 
     [decoder decodeValueOfObjCType:@encode(int) at:&version];
     if (version == 1){
         NSString *frameName = [decoder decodeObject];
         NSString *groupName = [decoder decodeObject];
-        [self _commonInitializationFrameName:frameName groupName:groupName];
-        
-        [self setPreferences: [decoder decodeObject]];
-        
-        result = self;
+        [result _commonInitializationFrameName:frameName groupName:groupName];
+        [result setPreferences: [decoder decodeObject]];
     }
-
+    return result;
+    
 NS_HANDLER
 
-    result = nil;
+    [self release];
+    return nil;
 
 NS_ENDHANDLER
-
-    if (result == nil)
-        [self release];
-        
-    return result;
 }
 
 - (void)encodeWithCoder:(NSCoder *)encoder

-- 
WebKit Debian packaging