Cleanup LogHex, just print 16 bytes per line

git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@401 400ebc74-4327-4243-bc38-086b20814532

diff --git a/librtmp/handshake.h b/librtmp/handshake.h
index 316c143872789c37761f3dd90b29277e894a3e64..07b376953ccce79681e00e1ab64f955da07b0420 100644 (file)
--- a/librtmp/handshake.h
+++ b/librtmp/handshake.h
@@ -728,7 +728,7 @@ SHandShake(RTMP * r)
     return false;
 
   RTMP_Log(RTMP_LOGDEBUG, "%s: Type Requested : %02X", __FUNCTION__, type);
-  RTMP_LogHexString(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE);
+  RTMP_LogHex(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE);
 
   if (type == 3)
     {
@@ -824,7 +824,7 @@ SHandShake(RTMP * r)
     }
 
   RTMP_Log(RTMP_LOGDEBUG2, "Serversig: ");
-  RTMP_LogHexString(RTMP_LOGDEBUG2, serversig, RTMP_SIG_SIZE);
+  RTMP_LogHex(RTMP_LOGDEBUG2, serversig, RTMP_SIG_SIZE);
 
   if (!WriteN(r, serversig-1, RTMP_SIG_SIZE + 1))
     return false;
@@ -948,7 +948,7 @@ SHandShake(RTMP * r)
 
   RTMP_Log(RTMP_LOGDEBUG2, "%s: Sending handshake response: ",
     __FUNCTION__);
-  RTMP_LogHexString(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE);
+  RTMP_LogHex(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE);
 
   if (!WriteN(r, clientsig, RTMP_SIG_SIZE))
     return false;
@@ -958,7 +958,7 @@ SHandShake(RTMP * r)
     return false;
 
   RTMP_Log(RTMP_LOGDEBUG2, "%s: 2nd handshake: ", __FUNCTION__);
-  RTMP_LogHexString(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE);
+  RTMP_LogHex(RTMP_LOGDEBUG2, clientsig, RTMP_SIG_SIZE);
 
   if (FP9HandShake)
     {

diff --git a/librtmp/log.c b/librtmp/log.c
index 433ac80aacf395bdb193d5e3cd08b673dbdd0fa0..b03f91dc314d933f0edfa27e04f07cdf30bc4216 100644 (file)
--- a/librtmp/log.c
+++ b/librtmp/log.c
@@ -132,9 +132,11 @@ void RTMP_LogHex(int level, const char *data, unsigned long len)
        if ( level > RTMP_debuglevel )
                return;
        for(i=0; i<len; i++) {
-               RTMP_LogPrintf("%02X ", (unsigned char)data[i]);
+               RTMP_LogPrintf("%02X%c", (unsigned char)data[i],
+                 ((i & 0x0f) == 0x0f) ? '\n': ' ');
        }
-       RTMP_LogPrintf("\n");
+       if (i & 0x0f)
+         RTMP_LogPrintf("\n");
 }
 
 void RTMP_LogHexString(int level, const char *data, unsigned long len)