From 673eacd0992dc52c8206dc307b67705e2e506e05 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Wed, 25 Feb 2009 14:28:21 +0100
Subject: [PATCH] redundant D0s

---
 world/net/jabber/active.c    | 12 ++++++------
 world/net/jabber/common.c    |  4 ++--
 world/net/jabber/component.c |  2 +-
 world/net/jabber/gateway.c   |  4 ++--
 world/net/jabber/server.c    |  2 +-
 world/net/xml/parse.c        |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/world/net/jabber/active.c b/world/net/jabber/active.c
index 99045b5..ae1cf46 100644
--- a/world/net/jabber/active.c
+++ b/world/net/jabber/active.c
@@ -40,7 +40,7 @@ tls_logon(); // prototype
 quit() {
 	emitraw("</stream:stream>");
 #ifdef _flag_log_sockets_XMPP
-	D0( log_file("RAW_XMPP", "\n%O: shutting down, quit called\n", ME); )
+	log_file("RAW_XMPP", "\n%O: shutting down, quit called\n", ME);
 #endif
 	remove_interactive(ME);	// not XEP-0190 conformant, but shouldn't
 				// matter on an outgoing-only socket
@@ -88,7 +88,7 @@ handle_starttls(XMLNode node) {
 	P0(("%O: expecting xmpp-tls proceed or failure, got %O:%O\n",
 	    ME, node[Tag], node["@xmlns"]))
 #ifdef _flag_log_sockets_XMPP
-	D0( log_file("RAW_XMPP", "\n%O: expecting xmpp-tls proceed or failure, got %O:%O\t%O", ME, node[Tag], node["@xmlns"], ctime()); )
+	log_file("RAW_XMPP", "\n%O: expecting xmpp-tls proceed or failure, got %O:%O\t%O", ME, node[Tag], node["@xmlns"], ctime());
 #endif
 	nodeHandler = #'jabberMsg;
 	return jabberMsg(node);
@@ -114,7 +114,7 @@ handle_stream_features(XMLNode node) {
 	start_dialback(); 
 	process_dialback_queue();
 #ifdef _flag_log_sockets_XMPP
-	D0( log_file("RAW_XMPP", "\nprocessing dialback queue, expecting stream features but not found" ); ) 
+	log_file("RAW_XMPP", "\nprocessing dialback queue, expecting stream features but not found");
 #endif
 	return jabberMsg(node);
     }
@@ -214,7 +214,7 @@ handle_stream_features(XMLNode node) {
 disconnected(remainder) {
     P2(("active %O disconnected\n", ME))
 #ifdef _flag_log_sockets_XMPP
-    D0( log_file("RAW_XMPP", "\n%O disc\t%O", ME, ctime()); )
+    log_file("RAW_XMPP", "\n%O disc\t%O", ME, ctime());
 #endif
     authenticated = 0;
     ready = 0;
@@ -224,7 +224,7 @@ disconnected(remainder) {
 	P0(("%O got disconnected with dialback outgoing != 0\n", ME))
 	// TODO: reconnect koennte sinnvoll sein
 #ifdef _flag_log_sockets_XMPP
-	D0( log_file("RAW_XMPP", "\n%O disconnected with dialback outgoing != 0\t%O", ME, ctime()); )
+	log_file("RAW_XMPP", "\n%O disconnected with dialback outgoing != 0\t%O", ME, ctime());
 #endif
 	dialback_outgoing = 0;
     }
@@ -254,7 +254,7 @@ static int logon(int failure) {
 #endif
 	sTextPath(0, "en", "jabber");
 #ifdef _flag_log_sockets_XMPP
-	D0( log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime()); )
+	log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime());
 #endif
 /* 2. Originating Server sends a stream header to Receiving Server */
 	emit("<stream:stream xmlns:stream='http://etherx.jabber.org/streams' "
diff --git a/world/net/jabber/common.c b/world/net/jabber/common.c
index 03f4eb6..b026d67 100644
--- a/world/net/jabber/common.c
+++ b/world/net/jabber/common.c
@@ -67,7 +67,7 @@ int emit(string message) {
 	}
 #endif
 #ifdef _flag_log_sockets_XMPP
-	D0( log_file("RAW_XMPP", "\n« %O\t%s", ME, message); )
+	log_file("RAW_XMPP", "\n« %O\t%s", ME, message);
 #endif
 	return ::emit(message);
 }
@@ -76,7 +76,7 @@ int emit(string message) {
 // to be sending safe data
 int emitraw(string message) {
 #ifdef _flag_log_sockets_XMPP
-	D0( log_file("RAW_XMPP", "\n« %O\t%s", ME, message); )
+	log_file("RAW_XMPP", "\n« %O\t%s", ME, message);
 #endif
 	return ::emit(message);
 }
diff --git a/world/net/jabber/component.c b/world/net/jabber/component.c
index 4769266..e1b6d05 100644
--- a/world/net/jabber/component.c
+++ b/world/net/jabber/component.c
@@ -23,7 +23,7 @@ volatile int authenticated;
 
 logon(arg) {
 #ifdef _flag_log_sockets_XMPP
-    D0( log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime()); )
+    log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime());
 #endif
 #ifdef INPUT_NO_TELNET
     input_to(#'feed, INPUT_IGNORE_BANG | INPUT_CHARMODE | INPUT_NO_TELNET);
diff --git a/world/net/jabber/gateway.c b/world/net/jabber/gateway.c
index b7eb40a..173c888 100644
--- a/world/net/jabber/gateway.c
+++ b/world/net/jabber/gateway.c
@@ -64,7 +64,7 @@ disconnected(remainder) {
 #endif
         if (objectp(active)) active -> removeGateway(streamid);
 #ifdef _flag_log_sockets_XMPP
-        D0( log_file("RAW_XMPP", "\n%O disc\t%O", ME, ctime()); )
+        log_file("RAW_XMPP", "\n%O disc\t%O", ME, ctime());
 #endif
         destruct(ME);
         // expected or unexpected disconnect? flags shall tell
@@ -121,7 +121,7 @@ logon(a) {
     input_to(#'feed, INPUT_IGNORE_BANG | INPUT_CHARMODE);
 #endif
 #ifdef _flag_log_sockets_XMPP
-    D0( log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime()); )
+    log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime());
 #endif
     // return ::logon(a);
 }
diff --git a/world/net/jabber/server.c b/world/net/jabber/server.c
index a2c248a..2674a36 100644
--- a/world/net/jabber/server.c
+++ b/world/net/jabber/server.c
@@ -89,7 +89,7 @@ promptForPassword(user) {
 
 logon(a) {
 #ifdef _flag_log_sockets_XMPP
-	D0( log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime()); )
+	log_file("RAW_XMPP", "\n%O logon\t%O", ME, ctime());
 #endif
 	P3(("logon(%O) beim jabber:server.c\n", a))
 	set_combine_charset(COMBINE_CHARSET);
diff --git a/world/net/xml/parse.c b/world/net/xml/parse.c
index 51c751a..a010d2b 100644
--- a/world/net/xml/parse.c
+++ b/world/net/xml/parse.c
@@ -44,7 +44,7 @@ xmlparse(a) {
 
 #ifdef JABBER_PARSE
 # ifdef _flag_log_sockets_XMPP
-        D0( log_file("RAW_XMPP", "\n» %O\t%s", ME, a); )
+        log_file("RAW_XMPP", "\n» %O\t%s", ME, a);
 # endif
         length += sizeof(a);
         pos = index(a, '<', pos) + 1;