From 6a2dbfa47f6df7d9dda9aac2dc6345fb6fe5cefa Mon Sep 17 00:00:00 2001 From: Maksim Yevmenkin Date: Tue, 4 Jan 2005 20:13:48 +0000 Subject: [PATCH] Rename 'class' field to 'uclass' in the ng_hci_inquiry_response structure. class is a reserved word in C++ Submitted by: Markus Brueffer < markus AT brueffer DOT de > MFC after: 3 days --- sys/netgraph/bluetooth/include/ng_hci.h | 2 +- usr.sbin/bluetooth/hccontrol/link_control.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/bluetooth/include/ng_hci.h b/sys/netgraph/bluetooth/include/ng_hci.h index a304d04e036..1fed7590041 100644 --- a/sys/netgraph/bluetooth/include/ng_hci.h +++ b/sys/netgraph/bluetooth/include/ng_hci.h @@ -1444,7 +1444,7 @@ typedef struct { u_int8_t page_scan_rep_mode; /* page scan rep. mode */ u_int8_t page_scan_period_mode; /* page scan period mode */ u_int8_t page_scan_mode; /* page scan mode */ - u_int8_t class[NG_HCI_CLASS_SIZE]; /* unit class */ + u_int8_t uclass[NG_HCI_CLASS_SIZE];/* unit class */ u_int16_t clock_offset; /* clock offset */ } __attribute__ ((packed)) ng_hci_inquiry_response; diff --git a/usr.sbin/bluetooth/hccontrol/link_control.c b/usr.sbin/bluetooth/hccontrol/link_control.c index 7d01f045610..1558cc5adbd 100644 --- a/usr.sbin/bluetooth/hccontrol/link_control.c +++ b/usr.sbin/bluetooth/hccontrol/link_control.c @@ -157,7 +157,7 @@ hci_inquiry_response(int n, uint8_t **b) fprintf(stdout, "\tPage Scan Mode: %#02x\n", ir->page_scan_mode); fprintf(stdout, "\tClass: %02x:%02x:%02x\n", - ir->class[2], ir->class[1], ir->class[0]); + ir->uclass[2], ir->uclass[1], ir->uclass[0]); fprintf(stdout, "\tClock offset: %#04x\n", le16toh(ir->clock_offset));