Cosmetic fixes.

Rev: lib/modules/Protocols.pmod/TELNET.pmod:1.31

lib/modules/Protocols.pmod/TELNET.pmod

 //
-// $Id: TELNET.pmod,v 1.30 2008/12/06 16:50:43 grubba Exp $
+// $Id: TELNET.pmod,v 1.31 2008/12/06 17:07:31 grubba Exp $
 //
 // The TELNET protocol as described by RFC 764 and others.
 //
@@ -422,7 +422,8 @@ class protocol
 
     if (sizeof(to_send))
     {
-      DWRITE(sprintf("TELNET: We now have data to send! (%d bytes)\n", sizeof(to_send)));
+      DWRITE(sprintf("TELNET: We now have data to send! (%d bytes)\n",
+		     sizeof(to_send)));
       if (to_send[0] == 242) {
 	// DataMark needs extra quoting... Stupid.
 	DWRITE("TELNET: Found datamark @ offset 0!\n");
@@ -472,20 +473,21 @@ class protocol
   //! @param option
   //!   The option to disable.
 
-
 #define CONTROL(OPTIONS,DO,DONT,WILL,WONT,YES,NO)			\
   void send_##DO(int option)						\
   {									\
     if ((option < 0) || (option > 255)) {				\
       error( "Bad TELNET option #%d\n", option);			\
     }									\
-     DWRITE(sprintf("TELNET: send_" #DO "(%s) state is %d\n",lookup_telopt[option] || (string)option,OPTIONS##_options[option])); \
-    switch(OPTIONS##_options[option])							\
-    {											\
+    DWRITE(sprintf("TELNET: send_" #DO "(%s) state is %d\n",		\
+		    lookup_telopt[option] || (string)option,		\
+		    OPTIONS##_options[option]));			\
+    switch(OPTIONS##_options[option]) {					\
     case NO:								\
     case UNKNOWN:							\
 	OPTIONS##_options[option]= WANT | YES;				\
-        DWRITE(sprintf("TELNET: => " #DO " %s\n",lookup_telopt[option] || (string)option)); \
+        DWRITE(sprintf("TELNET: => " #DO " %s\n",			\
+		       lookup_telopt[option] || (string)option));	\
 	to_send += sprintf("%c%c%c",IAC,DO,option);			\
 	break;								\
 									\
@@ -500,7 +502,8 @@ class protocol
       break;								\
       									\
     default:								\
-	error("TELNET: Strange remote_options[%d]=%d\n",option,remote_options[option]);	\
+      error("TELNET: Strange remote_options[%d]=%d\n",			\
+	    option, remote_options[option]);				\
       /* ERROR: weird state! */						\
       break;								\
     }									\
@@ -651,16 +654,7 @@ class protocol
   protected void got_data(mixed ignored, string line)
   {
 #ifdef TELNET_DEBUG
-  werror("TELNET: got_data(\"%s\")\n",Array.map(values(line),lambda(int s) { 
-    switch(s)
-    {
-      case ' '..'z':
-	return sprintf("%c",s);
-	
-      default:
-	return sprintf("\\0x%02x",s);
-    }
-  })*"");
+    werror("TELNET: got_data(%O)\n",line);
 #endif
 
     if (sizeof(line) && (line[0] == DM)) {
@@ -679,7 +673,8 @@ class protocol
 	string part = a[i];
 	if (sizeof(part)) {
 
-	    DWRITE(sprintf("TELNET: Code %s\n", lookup_telnetcodes[part[0]] || (string)part[0]));
+	  DWRITE(sprintf("TELNET: Code %s\n",
+			 lookup_telnetcodes[part[0]] || (string)part[0]));
 
 	  switch (part[0]) {
 	  default:
@@ -713,15 +708,16 @@ class protocol
 #endif
 
 #define HANDLE(OPTIONS,WILL,WONT,DO,DONT)				\
-	    case WILL:{									\
+	  case WILL:							\
+	  {								\
 	    int option = a[i][1];					\
 	    int state = OPTIONS##_options[option];			\
 	    a[i] = a[i][2..];						\
 	  								\
-	      DWRITE(sprintf(#WILL " %s, state 0x%04x\n", lookup_telopt[option], state));		\
+	    DWRITE(sprintf(#WILL " %s, state 0x%04x\n",			\
+	  		     lookup_telopt[option], state));		\
 	    								\
-	      switch(state)								\
-	      {										\
+	    switch(state) {						\
 	    case NO:							\
 	    case UNKNOWN:						\
 	  	if (WILL##_callback(option))				\
@@ -758,16 +754,20 @@ class protocol
 	  	      option,remote_options[option]);			\
 	  	/* Weird state ! */					\
 	    }								\
-	      DWRITE(sprintf("TELNET: => " #WILL " %s, state 0x%04x\n", lookup_telopt[option], state));	\
+	    DWRITE(sprintf("TELNET: => " #WILL " %s, state 0x%04x\n",	\
+	  		     lookup_telopt[option], state));		\
 	    set_##OPTIONS##_option(option,state);			\
-	      break;}									\
+	    break;							\
+	  }								\
 	  								\
-	    case WONT:{									\
+	  case WONT:							\
+	  {								\
 	    int option = a[i][1];					\
 	    int state = OPTIONS##_options[option];			\
 	    a[i] = a[i][2..];						\
 	    								\
-	      DWRITE(sprintf(#WONT " %s, state 0x%04x\n", lookup_telopt[option], state));		\
+	    DWRITE(sprintf(#WONT " %s, state 0x%04x\n",			\
+	  		     lookup_telopt[option], state));		\
 	    								\
 	    switch(state)						\
 	    {								\
@@ -801,11 +801,11 @@ class protocol
 	  	/* Weird state */					\
 	    }								\
 	    								\
-	      DWRITE(sprintf("TELNET: => " #WONT " %s, state 0x%04x\n", lookup_telopt[option], state));	\
+	    DWRITE(sprintf("TELNET: => " #WONT " %s, state 0x%04x\n",	\
+	  		     lookup_telopt[option], state));		\
 	    set_##OPTIONS##_option(option,state);			\
-	      }break
-
-
+	  }								\
+	  break
 
 	  HANDLE(remote,WILL,WONT,DO,DONT);
 	  HANDLE(local,DO,DONT,WILL,WONT);
@@ -832,16 +832,7 @@ class protocol
 
     if ((!synch)) {
 #ifdef TELNET_DEBUG
-	werror("TELNET: calling read_callback(X,\"%s\")\n",Array.map(values(line),lambda(int s) { 
-	  switch(s)
-	  {
-	    case ' '..'z':
-	      return sprintf("%c",s);
-	      
-	    default:
-	      return sprintf("\\0x%02x",s);
-	  }
-	})*"");
+      werror("TELNET: calling read_callback(X,%O)\n", line);
 #endif
       call_read_cb(line);
     }
@@ -878,7 +869,7 @@ class protocol
   //! @param r_cb
   //!   Function to call when data has arrived.
   //! @param w_cb
-  //!   Function to call when data can be sent.
+  //!   Function to call when the send buffer is empty.
   //! @param c_cb
   //!   Function to call when the connection is closed.
   //! @param callbacks
@@ -910,7 +901,8 @@ class protocol
     read_cb = r_cb;
     write_cb = w_cb;
     close_cb = c_cb;
-    DWRITE(sprintf("TELNET: set_nonblocking(): Calling fd->set_nonblocking() %O %O\n",
+    DWRITE(sprintf("TELNET: set_nonblocking(): "
+		   "Calling fd->set_nonblocking() %O %O\n",
 		   w_cb, w_cb || send_data));
     fd->set_nonblocking(got_data, w_cb && send_data, close_cb, got_oob);
     nonblocking_write = !!w_cb;