Changeset 13034 in webkit for trunk/JavaScriptCore/kxmlcore/Assertions.cpp

Timestamp:

Feb 27, 2006, 7:51:43 PM (19 years ago)

Author:

eseidel

Message:

2006-02-27 Eric Seidel <​[email protected]>

Reviewed by mjs.

Made Assertions.cpp platform independent.
Moved mac-specific logging logic up into WebCore.
​http://bugzilla.opendarwin.org/show_bug.cgi?id=7503

• JavaScriptCore.xcodeproj/project.pbxproj:
• kxmlcore/Assertions.cpp: Added.
• kxmlcore/Assertions.h:
• kxmlcore/Assertions.mm: Removed.

File:

• trunk/JavaScriptCore/kxmlcore/Assertions.cpp (moved) (moved from trunk/JavaScriptCore/kxmlcore/Assertions.mm ) (6 diffs)

trunk/JavaScriptCore/kxmlcore/Assertions.cpp

@@ -1 +1 @@
 // -*- mode: c++; c-basic-offset: 4 -*-
 /*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28 +28 @@
 #include "Assertions.h"
 
-#define SUPPORT_OBJC_LOGGING 1
-
-#if SUPPORT_OBJC_LOGGING
+#if __APPLE__
 #include <CoreFoundation/CFString.h>
 #endif
 
-#include <Foundation/NSString.h>
-#include <Foundation/NSUserDefaults.h>
-#include <Foundation/NSScanner.h>
-
 extern "C" {
 
+// This is to work around the "you should use a printf format attribute" warning on GCC
+// We can't use _attribute__ ((format (printf, 2, 3))) since we allow %@
 static int (* vfprintf_no_warning)(FILE *, const char *, va_list) = vfprintf;
 
-static void vprintf_stderr_objc(const char *format, va_list args)
+static void vprintf_stderr_common(const char *format, va_list args)
 {
-#if SUPPORT_OBJC_LOGGING
+#if __APPLE__
     if (!strstr(format, "%@")) {
         CFStringRef cfFormat = CFStringCreateWithCString(NULL, format, kCFStringEncodingUTF8);
@@ -77 +73 @@
     va_list args;
     va_start(args, format);
-    vprintf_stderr_objc(format, args);
+    vprintf_stderr_common(format, args);
     va_end(args);
     fprintf(stderr, "\n%s (%s:%d %s)\n=================\n", assertion, file, line, function);
@@ -92 +88 @@
     va_list args;
     va_start(args, format);
-    vprintf_stderr_objc(format, args);
+    vprintf_stderr_common(format, args);
     va_end(args);
     fprintf(stderr, "\n(%s:%d %s)\n=================\n", file, line, function);
@@ -102 +98 @@
     va_list args;
     va_start(args, format);
-    vprintf_stderr_objc(format, args);
+    vprintf_stderr_common(format, args);
     va_end(args);
     fprintf(stderr, "\n(%s:%d %s)\n=================\n", file, line, function);
 }
 
-static void fprintf_objc(const char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    vprintf_stderr_objc(format, args);
-    va_end(args);
-}
-
-
 void KXCLog(const char*, int, const char*, KXCLogChannel *channel, const char *format, ...)
-{
-    if (channel->state == KXCLogChannelUninitialized) {
-        channel->state = KXCLogChannelOff;
-        NSString *logLevelString = [[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithCString:channel->defaultName]];
-        if (logLevelString) {
-            unsigned logLevel;
-            if (![[NSScanner scannerWithString:logLevelString] scanHexInt:&logLevel]) {
-                fprintf_objc("unable to parse hex value for %s (%@), logging is off", channel->defaultName, logLevelString);
-            }
-            if ((logLevel & channel->mask) == channel->mask) {
-                channel->state = KXCLogChannelOn;
-            }
-        }
-    }
-    
+{    
     if (channel->state != KXCLogChannelOn)
         return;
@@ -137 +110 @@
     va_list args;
     va_start(args, format);
-    vprintf_stderr_objc(format, args);
+    vprintf_stderr_common(format, args);
     va_end(args);
     if (format[strlen(format) - 1] != '\n')