summaryrefslogtreecommitdiff
path: root/sysutils/netbt-hcidump/patches/patch-tools_parser_parser.h
blob: 7e081943494b95a73f04d03c35a243ff89466039 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
$NetBSD: patch-tools_parser_parser.h,v 1.2 2015/03/19 19:16:31 joerg Exp $

the device ID is a string on netbt stack

--- tools/parser/parser.h.orig	2014-03-25 20:53:42.000000000 +0000
+++ tools/parser/parser.h
@@ -37,7 +37,7 @@ struct frame {
 	uint32_t	data_len;
 	void		*ptr;
 	uint32_t	len;
-	uint16_t	dev_id;
+	char		*dev_id;
 	uint8_t		in;
 	uint8_t		master;
 	uint16_t	handle;
@@ -135,9 +135,9 @@ static inline void p_indent(int level, s
 				localtime_r(&t, &tm);
 				printf("%04d-%02d-%02d %02d:%02d:%02d.%06lu ",
 					tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-					tm.tm_hour, tm.tm_min, tm.tm_sec, f->ts.tv_usec);
+					tm.tm_hour, tm.tm_min, tm.tm_sec, (unsigned long)f->ts.tv_usec);
 			} else
-				printf("%8lu.%06lu ", f->ts.tv_sec, f->ts.tv_usec);
+				printf("%8ju.%06lu ", (uintmax_t)f->ts.tv_sec, (unsigned long)f->ts.tv_usec);
 		}
 		printf("%c ", (f->in ? '>' : '<'));
 		parser.state = 1;