mirrors/ympd
1
0
Fork 0
mirror of https://github.com/SuperBFG7/ympd synced 2024-06-22 21:03:13 +00:00
Code Issues Releases Wiki Activity

Fix: compiler warnings on 64bit arch

Browse Source
This commit is contained in:
jcorporation 2019-01-20 23:08:10 +00:00
parent 044456cbba
commit 0681386eb8
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/global.h.in
View File

@ -52,7 +52,7 @@
//check and return buffer size
#define CHECK_RETURN_LEN() do { \
if (len > MAX_SIZE) \
printf("Buffer truncated: %d, %d\n", len, MAX_SIZE); \
printf("ERROR: Buffer truncated\n"); \
return len; \
} while (0)

2
src/mpd_client.c
View File

@ -1140,7 +1140,7 @@ static void mpd_client_idle(t_config *config, t_mpd_state *mpd_state) {
printf("MPD connection failed.\n");
len = snprintf(buffer, MAX_SIZE, "{\"type\": \"disconnected\"}");
mpd_client_notify(buffer, len);
// fall through
case MPD_DISCONNECT:
case MPD_RECONNECT:
if (mpd_state->conn != NULL)

23
src/tiny_queue.c
View File

@ -79,6 +79,7 @@ int tiny_queue_push(tiny_queue_t *queue, void *data) {
}
int tiny_queue_length(tiny_queue_t *queue, int timeout) {
timeout = timeout * 1000;
int rc = pthread_mutex_lock(&queue->mutex);
if (rc != 0) {
printf("Error in pthread_mutex_lock: %d\n", rc);
@ -88,9 +89,14 @@ int tiny_queue_length(tiny_queue_t *queue, int timeout) {
struct timespec max_wait = {0, 0};
clock_gettime(CLOCK_REALTIME, &max_wait);
//timeout in ms
max_wait.tv_nsec += timeout * 1000;
if (max_wait.tv_nsec <= (999999999 - timeout)) {
max_wait.tv_nsec += timeout;
} else {
max_wait.tv_sec += 1;
max_wait.tv_nsec = timeout - (999999999 - max_wait.tv_nsec);
}
rc = pthread_cond_timedwait(&queue->wakeup, &queue->mutex, &max_wait);
if (rc != 0) {
if (rc != 0 && rc != ETIMEDOUT) {
printf("Error in pthread_cond_timedwait: %d\n", rc);
}
}
@ -103,6 +109,7 @@ int tiny_queue_length(tiny_queue_t *queue, int timeout) {
}
void *tiny_queue_shift(tiny_queue_t *queue, int timeout) {
timeout = timeout * 1000;
int rc = pthread_mutex_lock(&queue->mutex);
if (rc != 0) {
printf("Error in pthread_mutex_lock: %d\n", rc);
@ -113,10 +120,18 @@ void *tiny_queue_shift(tiny_queue_t *queue, int timeout) {
struct timespec max_wait = {0, 0};
clock_gettime(CLOCK_REALTIME, &max_wait);
//timeout in ms
max_wait.tv_nsec += timeout * 1000;
if (max_wait.tv_nsec <= (999999999 - timeout)) {
max_wait.tv_nsec += timeout;
} else {
max_wait.tv_sec += 1;
max_wait.tv_nsec = timeout - (999999999 - max_wait.tv_nsec);
}
rc = pthread_cond_timedwait(&queue->wakeup, &queue->mutex, &max_wait);
if (rc != 0) {
printf("Error in pthread_cond_timedwait: %d\n", rc);
if (rc != ETIMEDOUT) {
printf("Error in pthread_cond_timedwait: %d\n", rc);
printf("nsec: %ld\n", max_wait.tv_nsec);
}
rc = pthread_mutex_unlock(&queue->mutex);
if (rc != 0) {
printf("Error in pthread_mutex_unlock: %d\n", rc);