[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 048e4d3bb5314a0ad008509a71c54abae92c5944
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Apr 29 17:06:02 2002 +0000

            Restored file, line, and function to log messages.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e8f7f8a..8f3b054 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-29  Richard Williamson  <rjw at apple.com>
+
+        Restored file, line, and function to log messages.
+        
+	* Misc.subproj/WebKitDebug.m:
+	(WebKitLog):
+
 2002-04-25  Darin Adler  <darin at apple.com>
 
 	* History.subproj/IFWebHistoryPrivate.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index e8f7f8a..8f3b054 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-04-29  Richard Williamson  <rjw at apple.com>
+
+        Restored file, line, and function to log messages.
+        
+	* Misc.subproj/WebKitDebug.m:
+	(WebKitLog):
+
 2002-04-25  Darin Adler  <darin at apple.com>
 
 	* History.subproj/IFWebHistoryPrivate.m:
diff --git a/WebKit/Misc.subproj/WebKitDebug.m b/WebKit/Misc.subproj/WebKitDebug.m
index 6e926ca..410b5f0 100644
--- a/WebKit/Misc.subproj/WebKitDebug.m
+++ b/WebKit/Misc.subproj/WebKitDebug.m
@@ -28,6 +28,7 @@ unsigned int WebKitGetLogLevel(){
     return WEBKIT_LOG_LEVEL;
 }
 
+#ifdef NEED_TIMESTAMP
 static const char *
 timestamp(void)
 {
@@ -36,12 +37,13 @@ timestamp(void)
                                                            locale:nil];
     return [date cString];
 }
+#endif
 
 void WebKitLog(unsigned int level, const char *file, int line, const char *function, const char *format, ...)
 {    
     if (WebKitGetLogLevel() & level) {
         va_list args;
-        fprintf(stderr, "%s - [WEBKIT] - ", timestamp());
+        fprintf(stderr, "[WEBKIT] - %s:%d %s - ", file, line, function);
         va_start(args, format); 
         vfprintf(stderr, format, args);
         va_end(args);

-- 
WebKit Debian packaging