Re: [Bluez-devel] Little Hexdump-Patch for hcidump

[Till Harbaum <till@harbaum.org>]

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

On Thursday 26 August 2004 19:03, Marcel Holtmann wrote:
> please send me a patch (diff -u) and adjust a little bit your coding
> style to match the other sources of hcidump.
Sorry ... of course .. here you go

Ciao,
  Till

-- 
Dr.Ing. Till Harbaum, till@harbaum.org

[-- Attachment #2: hexdump.patch --]
[-- Type: text/x-diff, Size: 1199 bytes --]

--- bluez-hcidump-1.10/parser/parser.c	2004-08-26 20:22:06.000000000 +0200
+++ bluez-hcidump-1.10-t/parser/parser.c	2004-08-26 20:23:45.000000000 +0200
@@ -99,23 +99,36 @@
 
 void hex_dump(int level, struct frame *frm, int num)
 {
-	unsigned char *buf = frm->ptr;
-	register int i,n;
+        unsigned char *buf = frm->ptr;
+        register int i,n,b2c;
 
-	if ((num < 0) || (num > frm->len))
-		num = frm->len;
+        if ((num < 0) || (num > frm->len))
+                num = frm->len;
+
+        n = 0;
+        while(num>0) {
+                p_indent(level, frm);
+                printf("%04x: ", n);
+
+                b2c = (num>16)?16:num;
+
+		for(i=0;i<b2c;i++) 
+		        printf("%02x ", buf[i]);
+
+		for(i=0;i<(16-b2c);i++) 
+		        printf("   ");
+
+		printf("  ");
+
+		for(i=0;i<b2c;i++) 
+		        printf("%c", isprint(buf[i])?buf[i]:'.');
 
-	for (i = 0, n = 1; i < num; i++, n++) {
-		if (n == 1)
-			p_indent(level, frm);
-		printf("%2.2X ", buf[i]);
-		if (n == DUMP_WIDTH) {
-			printf("\n");
-			n = 0;
-		}
-	}
-	if (i && n!=1)
 		printf("\n");
+
+		buf  += b2c;
+		num  -= b2c;
+		n    += b2c;
+        }
 }
 
 void ascii_dump(int level, struct frame *frm, int num)