[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 8084422a580edd4a2c0dc5a64591f774bfba1fbc
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 10 23:08:23 2002 +0000

    	Made log output match webkit logging.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1136 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8a95ea7..ca4d704 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-05-10  Richard J. Williamson  <rjw at apple.com>
+
+	Made log output match webkit logging.
+
+	* kwq/kwqdebug.mm:
+	(KWQLog):
+
 2002-05-10  Chris Blumenberg  <cblu at apple.com>
 
 	Changed WCIFWebDataSourceMake to wrap around [IFWebDataSource initWithURL: attributes: flags:]
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8a95ea7..ca4d704 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-05-10  Richard J. Williamson  <rjw at apple.com>
+
+	Made log output match webkit logging.
+
+	* kwq/kwqdebug.mm:
+	(KWQLog):
+
 2002-05-10  Chris Blumenberg  <cblu at apple.com>
 
 	Changed WCIFWebDataSourceMake to wrap around [IFWebDataSource initWithURL: attributes: flags:]
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8a95ea7..ca4d704 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-05-10  Richard J. Williamson  <rjw at apple.com>
+
+	Made log output match webkit logging.
+
+	* kwq/kwqdebug.mm:
+	(KWQLog):
+
 2002-05-10  Chris Blumenberg  <cblu at apple.com>
 
 	Changed WCIFWebDataSourceMake to wrap around [IFWebDataSource initWithURL: attributes: flags:]
diff --git a/WebCore/kwq/kwqdebug.mm b/WebCore/kwq/kwqdebug.mm
index 54f3fb6..11054b1 100644
--- a/WebCore/kwq/kwqdebug.mm
+++ b/WebCore/kwq/kwqdebug.mm
@@ -51,6 +51,7 @@ unsigned int KWQGetLogLevel(){
     return KWQ_LOG_LEVEL;
 }
 
+#ifdef NEED_TIMESTAMP
 static const char *
 timestamp(void)
 {
@@ -59,13 +60,13 @@ timestamp(void)
                                                            locale:nil];
     return [date cString];
 }
-
+#endif
 
 void KWQLog(unsigned int level, const char *file, int line, const char *function, const char *format, ...)
 {    
     if (KWQGetLogLevel() & level) {
         va_list args;
-        fprintf(stderr, "%s - [WEBCORE] - ", timestamp());
+        fprintf(stderr, "[WEBCORE] - %s:%d %s - ", file, line, function);
         va_start(args, format); 
         vfprintf(stderr, format, args);
         va_end(args);

-- 
WebKit Debian packaging