remove a few compiler warnings in BlueZ code

This commit is contained in:
Lennart Poettering 2008-09-29 21:34:18 +02:00
parent 87971c8707
commit 60e9744f28
3 changed files with 5 additions and 6 deletions

View file

@ -40,7 +40,7 @@ static const char *strmsg[] = {
"BT_STREAMFD_IND", "BT_STREAMFD_IND",
}; };
int bt_audio_service_open() int bt_audio_service_open(void)
{ {
int sk; int sk;
int err; int err;
@ -88,7 +88,7 @@ int bt_audio_service_get_data_fd(int sk)
msgh.msg_control = &cmsg_b; msgh.msg_control = &cmsg_b;
msgh.msg_controllen = CMSG_LEN(sizeof(int)); msgh.msg_controllen = CMSG_LEN(sizeof(int));
ret = recvmsg(sk, &msgh, 0); ret = (int) recvmsg(sk, &msgh, 0);
if (ret < 0) { if (ret < 0) {
err = errno; err = errno;
fprintf(stderr, "%s: Unable to receive fd: %s (%d)\n", fprintf(stderr, "%s: Unable to receive fd: %s (%d)\n",
@ -111,9 +111,8 @@ int bt_audio_service_get_data_fd(int sk)
const char *bt_audio_strmsg(int type) const char *bt_audio_strmsg(int type)
{ {
if (type < 0 || type > (sizeof(strmsg) / sizeof(strmsg[0]))) if (type < 0 || (size_t) type > (sizeof(strmsg) / sizeof(strmsg[0])))
return NULL; return NULL;
return strmsg[type]; return strmsg[type];
} }

View file

@ -289,7 +289,7 @@ struct bt_control_ind {
/* Function declaration */ /* Function declaration */
/* Opens a connection to the audio service: return a socket descriptor */ /* Opens a connection to the audio service: return a socket descriptor */
int bt_audio_service_open(); int bt_audio_service_open(void);
/* Closes a connection to the audio service */ /* Closes a connection to the audio service */
int bt_audio_service_close(int sk); int bt_audio_service_close(int sk);

View file

@ -145,7 +145,7 @@ static uint8_t sbc_crc8(const uint8_t *data, size_t len)
octet = data[i]; octet = data[i];
for (i = 0; i < len % 8; i++) { for (i = 0; i < len % 8; i++) {
char bit = ((octet ^ crc) & 0x80) >> 7; unsigned char bit = ((octet ^ crc) & 0x80) >> 7;
crc = ((crc & 0x7f) << 1) ^ (bit ? 0x1d : 0); crc = ((crc & 0x7f) << 1) ^ (bit ? 0x1d : 0);