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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit ff803c563fa89b9e6b86293b9475fe73ff2d649a
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 28 02:25:10 2002 +0000

    Fixed a Jaguar crasher. Some differences in the way strmcp behaves
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@676 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/WCPlugin.mm b/WebCore/kwq/WCPlugin.mm
index 8fb41f4..f8fda2c 100644
--- a/WebCore/kwq/WCPlugin.mm
+++ b/WebCore/kwq/WCPlugin.mm
@@ -29,7 +29,8 @@
 
 @implementation WCPlugin
 
-- (BOOL)initializeWithPath:(NSString *)pluginPath{
+- (BOOL)initializeWithPath:(NSString *)pluginPath
+{
     NSFileManager *fileManager;
     NSDictionary *fileInfo;
     SInt16 resRef;
@@ -80,7 +81,8 @@
     return TRUE;
 }
 
-- (void)getPluginInfoForResourceFile:(SInt16)resRef{
+- (void)getPluginInfoForResourceFile:(SInt16)resRef
+{
     Str255 theString;
     char temp[300], description[600]; // I wish I didn't have to use these C strings
     NSMutableArray *mime; // mime is an array containing the mime type, extension(s) and descriptions for that mime type.
@@ -122,7 +124,8 @@
     [mimeTypes retain];
 }
 
-- (void)load{    
+- (void)load
+{    
     OSErr err;
     FSSpec spec;
     FSRef fref; 
@@ -140,7 +143,7 @@
         tempBundle = [NSBundle bundleWithPath:path];
         executableFile = [NSFileHandle fileHandleForReadingAtPath:[tempBundle executablePath]];
         data = [executableFile readDataOfLength:8];
-        if(!strcmp([data bytes], "Joy!peff")){
+        if(!memcmp([data bytes], "Joy!peff", 8)){
             isCFM = TRUE;
         }else{
             isCFM = FALSE;
@@ -259,7 +262,8 @@
     isLoaded = TRUE;
 }
 
-- (void)unload{
+- (void)unload
+{
     NPP_Shutdown();
     if(isBundle){
         CFBundleUnloadExecutable(bundle);
diff --git a/WebCore/src/kwq/WCPlugin.mm b/WebCore/src/kwq/WCPlugin.mm
index 8fb41f4..f8fda2c 100644
--- a/WebCore/src/kwq/WCPlugin.mm
+++ b/WebCore/src/kwq/WCPlugin.mm
@@ -29,7 +29,8 @@
 
 @implementation WCPlugin
 
-- (BOOL)initializeWithPath:(NSString *)pluginPath{
+- (BOOL)initializeWithPath:(NSString *)pluginPath
+{
     NSFileManager *fileManager;
     NSDictionary *fileInfo;
     SInt16 resRef;
@@ -80,7 +81,8 @@
     return TRUE;
 }
 
-- (void)getPluginInfoForResourceFile:(SInt16)resRef{
+- (void)getPluginInfoForResourceFile:(SInt16)resRef
+{
     Str255 theString;
     char temp[300], description[600]; // I wish I didn't have to use these C strings
     NSMutableArray *mime; // mime is an array containing the mime type, extension(s) and descriptions for that mime type.
@@ -122,7 +124,8 @@
     [mimeTypes retain];
 }
 
-- (void)load{    
+- (void)load
+{    
     OSErr err;
     FSSpec spec;
     FSRef fref; 
@@ -140,7 +143,7 @@
         tempBundle = [NSBundle bundleWithPath:path];
         executableFile = [NSFileHandle fileHandleForReadingAtPath:[tempBundle executablePath]];
         data = [executableFile readDataOfLength:8];
-        if(!strcmp([data bytes], "Joy!peff")){
+        if(!memcmp([data bytes], "Joy!peff", 8)){
             isCFM = TRUE;
         }else{
             isCFM = FALSE;
@@ -259,7 +262,8 @@
     isLoaded = TRUE;
 }
 
-- (void)unload{
+- (void)unload
+{
     NPP_Shutdown();
     if(isBundle){
         CFBundleUnloadExecutable(bundle);

-- 
WebKit Debian packaging