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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 1a2ad79c8a53c6c6e2e567c0182d5969bed7fe49
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 3 13:27:48 2002 +0000

    	* src/kwq/kwqdebug.mm: (KWQGetLogLevel): Allocate and release
    	NSScanner instead of using an autoreleased one, to fix Jersey
    	redness whereby the regression tests leak.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@947 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6239672..900ce48 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-04-03  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/kwqdebug.mm: (KWQGetLogLevel): Allocate and release
+	NSScanner instead of using an autoreleased one, to fix Jersey
+	redness whereby the regression tests leak.
+
 2002-04-02  Darin Adler  <darin at apple.com>
 
 	* src/kwq/kwqdebug.h: Turn off logging when xNDEBUG is defined.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6239672..900ce48 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-04-03  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/kwqdebug.mm: (KWQGetLogLevel): Allocate and release
+	NSScanner instead of using an autoreleased one, to fix Jersey
+	redness whereby the regression tests leak.
+
 2002-04-02  Darin Adler  <darin at apple.com>
 
 	* src/kwq/kwqdebug.h: Turn off logging when xNDEBUG is defined.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6239672..900ce48 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-04-03  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/kwqdebug.mm: (KWQGetLogLevel): Allocate and release
+	NSScanner instead of using an autoreleased one, to fix Jersey
+	redness whereby the regression tests leak.
+
 2002-04-02  Darin Adler  <darin at apple.com>
 
 	* src/kwq/kwqdebug.h: Turn off logging when xNDEBUG is defined.
diff --git a/WebCore/kwq/kwqdebug.mm b/WebCore/kwq/kwqdebug.mm
index fee5e85..2fdae58 100644
--- a/WebCore/kwq/kwqdebug.mm
+++ b/WebCore/kwq/kwqdebug.mm
@@ -37,9 +37,12 @@ unsigned int KWQGetLogLevel(){
     if (!kwq_checkedDefault){
         NSString *logLevelString = [[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitLogLevel"];
         if (logLevelString != nil){
-            if (![[NSScanner scannerWithString: logLevelString] scanHexInt: &KWQ_LOG_LEVEL]){
+	    NSScanner *scanner = [[NSScanner alloc] initWithString:logLevelString];
+
+            if (![scanner scanHexInt: &KWQ_LOG_LEVEL]){
                 NSLog (@"Unable to scan hex value for WebKitLogLevel, default to value of %d", KWQ_LOG_LEVEL);
             }
+	    [scanner release];
         }
         kwq_checkedDefault = 1; 
     }
diff --git a/WebCore/src/kwq/kwqdebug.mm b/WebCore/src/kwq/kwqdebug.mm
index fee5e85..2fdae58 100644
--- a/WebCore/src/kwq/kwqdebug.mm
+++ b/WebCore/src/kwq/kwqdebug.mm
@@ -37,9 +37,12 @@ unsigned int KWQGetLogLevel(){
     if (!kwq_checkedDefault){
         NSString *logLevelString = [[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitLogLevel"];
         if (logLevelString != nil){
-            if (![[NSScanner scannerWithString: logLevelString] scanHexInt: &KWQ_LOG_LEVEL]){
+	    NSScanner *scanner = [[NSScanner alloc] initWithString:logLevelString];
+
+            if (![scanner scanHexInt: &KWQ_LOG_LEVEL]){
                 NSLog (@"Unable to scan hex value for WebKitLogLevel, default to value of %d", KWQ_LOG_LEVEL);
             }
+	    [scanner release];
         }
         kwq_checkedDefault = 1; 
     }

-- 
WebKit Debian packaging