Changeset 974:2091bf698fb1 in freeDiameter for extensions/app_diameap/diameap_eappacket.c

Timestamp:

Mar 15, 2013, 2:14:35 AM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR
(as far as sed could find them)
with manual fixing afterwards.

File:

• extensions/app_diameap/diameap_eappacket.c (modified) (2 diffs)

extensions/app_diameap/diameap_eappacket.c

@@ -186 +186 @@
                 return;
 
-        fd_log_debug("------------- Dump EAP Packet-------------\n");
+        fd_log_debug("------------- Dump EAP Packet-------------");
         int i;
         fd_log_debug("\t -Code       : ");
@@ -194 +194 @@
         {
         case 1:
-                fd_log_debug("Request\n");
+                fd_log_debug("Request");
                 break;
         case 2:
-                fd_log_debug("Response\n");
+                fd_log_debug("Response");
                 break;
         case 3:
-                fd_log_debug("Success\n");
+                fd_log_debug("Success");
                 break;
         case 4:
-                fd_log_debug("Failure\n");
+                fd_log_debug("Failure");
                 break;
         default:
-                fd_log_debug("Error (EAP Code value [%d] not allowed)\n",code);
+                fd_log_debug("Error (EAP Code value [%d] not allowed)",code);
                 break;
         }
         u8 id;
         CHECK_FCT_DO(diameap_eap_get_identifier(eappacket,&id),return);
-        fd_log_debug("\t -Identifier : %x \n", id);
+        fd_log_debug("\t -Identifier : %x ", id);
         u16 length;
         CHECK_FCT_DO(diameap_eap_get_length(eappacket,&length),return);
-        fd_log_debug("\t -Length     : %d \n", (unsigned int)length);
+        fd_log_debug("\t -Length     : %d ", (unsigned int)length);
         if (eappacket.length > 4)
         {
                 eap_type type;
                 CHECK_FCT_DO(diameap_eap_get_type(eappacket,&type),return);
-                fd_log_debug("\t -Type       : %d \n", type);
+                fd_log_debug("\t -Type       : %d ", type);
         }
         if (eappacket.length > 5)
         {
-                fd_log_debug("\t -Data       : ");
+                char buf[1024];
+                snprintf(buf, sizeof(buf), "\t -Data       : ");
                 for (i = 5; i < eappacket.length && i < 30; i++)
                 {
-                        fd_log_debug("%02x ", G8(eappacket.data + i));
+                        snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%02x ", G8(eappacket.data + i));
                 }
                 if(i+1<eappacket.length)
-                        fd_log_debug("[...] (len=%d)",(unsigned int) length);
-                fd_log_debug("\n");
-        }
-        fd_log_debug("-------------End Dump EAP Packet-------------\n");
+                        snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "[...] (len=%d)",(unsigned int) length);
+                fd_log_debug("%s", buf);
+        }
+        fd_log_debug("-------------End Dump EAP Packet-------------");
 }