fix a few compiler warnings on older gcc

This commit is contained in:
Lennart Poettering 2008-08-29 23:53:55 +02:00
parent 506eacc922
commit 13018d62c1
10 changed files with 19 additions and 19 deletions

View file

@ -201,7 +201,7 @@ pa_context *pa_context_new_with_proplist(pa_mainloop_api *mainloop, const char *
if (!(c->mempool = pa_mempool_new(!c->conf->disable_shm))) { if (!(c->mempool = pa_mempool_new(!c->conf->disable_shm))) {
if (!c->conf->disable_shm) if (!c->conf->disable_shm)
c->mempool = pa_mempool_new(0); c->mempool = pa_mempool_new(FALSE);
if (!c->mempool) { if (!c->mempool) {
context_free(c); context_free(c);

View file

@ -272,7 +272,7 @@ int pa_simple_write(pa_simple *p, const void*data, size_t length, int *rerror) {
if (l > length) if (l > length)
l = length; l = length;
r = pa_stream_write(p->stream, data, l, NULL, 0, PA_SEEK_RELATIVE); r = pa_stream_write(p->stream, data, l, NULL, 0LL, PA_SEEK_RELATIVE);
CHECK_SUCCESS_GOTO(p, rerror, r >= 0, unlock_and_fail); CHECK_SUCCESS_GOTO(p, rerror, r >= 0, unlock_and_fail);
data = (const uint8_t*) data + l; data = (const uint8_t*) data + l;

View file

@ -64,24 +64,24 @@
#define FILTER_CHAR '_' #define FILTER_CHAR '_'
static inline int is_unicode_valid(uint32_t ch) { static inline pa_bool_t is_unicode_valid(uint32_t ch) {
if (ch >= 0x110000) /* End of unicode space */ if (ch >= 0x110000) /* End of unicode space */
return 0; return FALSE;
if ((ch & 0xFFFFF800) == 0xD800) /* Reserved area for UTF-16 */ if ((ch & 0xFFFFF800) == 0xD800) /* Reserved area for UTF-16 */
return 0; return FALSE;
if ((ch >= 0xFDD0) && (ch <= 0xFDEF)) /* Reserved */ if ((ch >= 0xFDD0) && (ch <= 0xFDEF)) /* Reserved */
return 0; return FALSE;
if ((ch & 0xFFFE) == 0xFFFE) /* BOM (Byte Order Mark) */ if ((ch & 0xFFFE) == 0xFFFE) /* BOM (Byte Order Mark) */
return 0; return FALSE;
return 1; return TRUE;
} }
static inline int is_continuation_char(uint8_t ch) { static inline pa_bool_t is_continuation_char(uint8_t ch) {
if ((ch & 0xc0) != 0x80) /* 10xxxxxx */ if ((ch & 0xc0) != 0x80) /* 10xxxxxx */
return 0; return FALSE;
return 1; return TRUE;
} }
static inline void merge_continuation_char(uint32_t *u_ch, uint8_t ch) { static inline void merge_continuation_char(uint32_t *u_ch, uint8_t ch) {

View file

@ -122,7 +122,7 @@ double pa_sw_volume_to_linear(pa_volume_t v) {
if (v == PA_VOLUME_MUTED) if (v == PA_VOLUME_MUTED)
return 0; return 0;
return pow(10, pa_sw_volume_to_dB(v)/20); return pow(10.0, pa_sw_volume_to_dB(v)/20.0);
} }
char *pa_cvolume_snprint(char *s, size_t l, const pa_cvolume *c) { char *pa_cvolume_snprint(char *s, size_t l, const pa_cvolume *c) {

View file

@ -42,7 +42,7 @@
#error "Please include config.h before including this file!" #error "Please include config.h before including this file!"
#endif #endif
#if HAVE_ATOMIC_BUILTINS #ifdef HAVE_ATOMIC_BUILTINS
/* __sync based implementation */ /* __sync based implementation */

View file

@ -54,8 +54,8 @@ static int generate(int fd, void *ret_data, size_t length) {
pa_random(ret_data, length); pa_random(ret_data, length);
lseek(fd, 0, SEEK_SET); lseek(fd, (off_t) 0, SEEK_SET);
(void) ftruncate(fd, 0); (void) ftruncate(fd, (off_t) 0);
if ((r = pa_loop_write(fd, ret_data, length, NULL)) < 0 || (size_t) r != length) { if ((r = pa_loop_write(fd, ret_data, length, NULL)) < 0 || (size_t) r != length) {
pa_log("Failed to write cookie file: %s", pa_cstrerror(errno)); pa_log("Failed to write cookie file: %s", pa_cstrerror(errno));

View file

@ -155,7 +155,7 @@ void pa_memblockq_set_maxlength(pa_memblockq *memblockq, size_t maxlength); /* m
void pa_memblockq_set_tlength(pa_memblockq *memblockq, size_t tlength); /* might modify minreq, too */ void pa_memblockq_set_tlength(pa_memblockq *memblockq, size_t tlength); /* might modify minreq, too */
void pa_memblockq_set_prebuf(pa_memblockq *memblockq, size_t prebuf); /* might modify minreq, too */ void pa_memblockq_set_prebuf(pa_memblockq *memblockq, size_t prebuf); /* might modify minreq, too */
void pa_memblockq_set_minreq(pa_memblockq *memblockq, size_t minreq); void pa_memblockq_set_minreq(pa_memblockq *memblockq, size_t minreq);
void pa_memblockq_set_maxrewind(pa_memblockq *memblockq, size_t rewind); /* Set the maximum history size */ void pa_memblockq_set_maxrewind(pa_memblockq *memblockq, size_t maxrewind); /* Set the maximum history size */
void pa_memblockq_set_silence(pa_memblockq *memblockq, pa_memchunk *silence); void pa_memblockq_set_silence(pa_memblockq *memblockq, pa_memchunk *silence);
/* Call pa_memchunk_willneed() for every chunk in the queue from the current read pointer to the end */ /* Call pa_memchunk_willneed() for every chunk in the queue from the current read pointer to the end */

View file

@ -105,7 +105,7 @@ int pa_shm_create_rw(pa_shm *m, size_t size, pa_bool_t shared, mode_t mode) {
m->size = size; m->size = size;
#ifdef MAP_ANONYMOUS #ifdef MAP_ANONYMOUS
if ((m->ptr = mmap(NULL, m->size, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { if ((m->ptr = mmap(NULL, m->size, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1, (off_t) 0)) == MAP_FAILED) {
pa_log("mmap() failed: %s", pa_cstrerror(errno)); pa_log("mmap() failed: %s", pa_cstrerror(errno));
goto fail; goto fail;
} }

View file

@ -437,7 +437,7 @@ static void start_timeout(pa_socket_client *c) {
pa_assert(!c->timeout_event); pa_assert(!c->timeout_event);
pa_gettimeofday(&tv); pa_gettimeofday(&tv);
pa_timeval_add(&tv, CONNECT_TIMEOUT * 1000000); pa_timeval_add(&tv, CONNECT_TIMEOUT * PA_USEC_PER_SEC);
c->timeout_event = c->mainloop->time_new(c->mainloop, &tv, timeout_cb, c); c->timeout_event = c->mainloop->time_new(c->mainloop, &tv, timeout_cb, c);
} }

View file

@ -864,7 +864,7 @@ static int fd_info_copy_data(fd_info *i, int force) {
return -1; return -1;
} }
if (pa_stream_write(i->play_stream, i->buf, (size_t) r, free, 0, PA_SEEK_RELATIVE) < 0) { if (pa_stream_write(i->play_stream, i->buf, (size_t) r, free, 0LL, PA_SEEK_RELATIVE) < 0) {
debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_write(): %s\n", pa_strerror(pa_context_errno(i->context))); debug(DEBUG_LEVEL_NORMAL, __FILE__": pa_stream_write(): %s\n", pa_strerror(pa_context_errno(i->context)));
return -1; return -1;
} }