diff options
| author | Maksim Yevmenkin <emax@FreeBSD.org> | 2004-04-09 23:26:16 +0000 |
|---|---|---|
| committer | Maksim Yevmenkin <emax@FreeBSD.org> | 2004-04-09 23:26:16 +0000 |
| commit | 2f122b6e8a568025fc6ff4db47814c0cb56f8822 (patch) | |
| tree | 19dc812c8544858dcc8dd6eba35adf8d15063fc4 /usr.bin/bluetooth | |
| parent | 4ae439a31633c0ded87bf778d8595f7da36dbc8a (diff) | |
| download | src-2f122b6e8a568025fc6ff4db47814c0cb56f8822.tar.gz src-2f122b6e8a568025fc6ff4db47814c0cb56f8822.zip | |
Use uint instead of u_int
Notes
Notes:
svn path=/head/; revision=128077
Diffstat (limited to 'usr.bin/bluetooth')
| -rw-r--r-- | usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c index ed6b82743b6c..587307153333 100644 --- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c +++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c @@ -40,7 +40,7 @@ #undef PROTOCOL_DESCRIPTOR_LIST_MINIMAL_SIZE #define PROTOCOL_DESCRIPTOR_LIST_MINIMAL_SIZE 12 -static int rfcomm_proto_list_parse (u_int8_t const *start, u_int8_t const *end, +static int rfcomm_proto_list_parse (uint8_t const *start, uint8_t const *end, int *channel, int *error); /* @@ -62,14 +62,14 @@ int rfcomm_channel_lookup(bdaddr_t const *local, bdaddr_t const *remote, int service, int *channel, int *error) { - u_int8_t buffer[PROTOCOL_DESCRIPTOR_LIST_BUFFER_SIZE]; - void *ss = NULL; - u_int16_t serv = (u_int16_t) service; - u_int32_t attr = SDP_ATTR_RANGE( + uint8_t buffer[PROTOCOL_DESCRIPTOR_LIST_BUFFER_SIZE]; + void *ss = NULL; + uint16_t serv = (uint16_t) service; + uint32_t attr = SDP_ATTR_RANGE( SDP_ATTR_PROTOCOL_DESCRIPTOR_LIST, SDP_ATTR_PROTOCOL_DESCRIPTOR_LIST); - sdp_attr_t proto = { SDP_ATTR_INVALID,0,sizeof(buffer),buffer }; - u_int32_t type, len; + sdp_attr_t proto = { SDP_ATTR_INVALID,0,sizeof(buffer),buffer }; + uint32_t type, len; if (local == NULL) local = NG_HCI_BDADDR_ANY; @@ -172,7 +172,7 @@ rfcomm_channel_lookup(bdaddr_t const *local, bdaddr_t const *remote, } static int -rfcomm_proto_list_parse(u_int8_t const *start, u_int8_t const *end, +rfcomm_proto_list_parse(uint8_t const *start, uint8_t const *end, int *channel, int *error) { int type, len, value; @@ -220,10 +220,10 @@ rfcomm_proto_list_parse(u_int8_t const *start, u_int8_t const *end, rfcomm_proto_list_parse_exit(EINVAL); /* Get protocol UUID */ - SDP_GET8(type, start); len -= sizeof(u_int8_t); + SDP_GET8(type, start); len -= sizeof(uint8_t); switch (type) { case SDP_DATA_UUID16: - SDP_GET16(value, start); len -= sizeof(u_int16_t); + SDP_GET16(value, start); len -= sizeof(uint16_t); if (value != SDP_UUID_PROTOCOL_RFCOMM) goto next_protocol; break; |