Changeset 5270:e25346c13638 in roaraudio for libroar

Timestamp:

11/17/11 18:20:12 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed some gcc -Wextra warnings

Location:

libroar

Files:

• Makefile (modified) (1 diff)
• acl.c (modified) (1 diff)
• authfile.c (modified) (1 diff)
• config.c (modified) (5 diffs)
• debug.c (modified) (1 diff)
• enumdev.c (modified) (2 diffs)
• env.c (modified) (1 diff)
• error.c (modified) (1 diff)
• hash.c (modified) (3 diffs)
• hash_tiger.c (modified) (3 diffs)
• libroar.c (modified) (1 diff)
• ltm.c (modified) (4 diffs)
• memmgr.c (modified) (1 diff)
• meta.c (modified) (1 diff)
• pinentry.c (modified) (2 diffs)
• proto.c (modified) (4 diffs)
• roardl.c (modified) (2 diffs)
• serverinfo.c (modified) (1 diff)
• slp.c (modified) (1 diff)
• socket.c (modified) (1 diff)
• stream.c (modified) (11 diffs)
• trap.c (modified) (4 diffs)
• vio.c (modified) (2 diffs)
• vio_dstr.c (modified) (1 diff)
• vio_jumbo.c (modified) (1 diff)
• vio_misc.c (modified) (7 diffs)
• vio_pipe.c (modified) (1 diff)
• vio_stdio.c (modified) (2 diffs)
• vio_tantalos.c (modified) (1 diff)
• vio_zlib.c (modified) (5 diffs)
• vs.c (modified) (2 diffs)

libroar/Makefile

@@ -17 +17 @@
 INCLUDE = -I../include -I../include/libroar
 CFLAGS += -g -Wall $(OPTI_O) $(DEFINES) $(INCLUDE) $(INCPATH) $(SHARED_CF) $(fPIC)
-LDFLAGS+= -g $(SHARED) $(LDPATH)
+LDFLAGS+= -g -Wall $(SHARED) $(LDPATH)
 LIBS    = $(LIBROAR_NS)
 

libroar/acl.c

@@ -44 +44 @@
   return 0;
 
- if ( rule->addr && !addr )
+ if ( rule->addr && addr != NULL )
   return 0;
 

libroar/authfile.c

@@ -223 +223 @@
     if ( roar_vio_lseek(&(authfile->vio), 0, SEEK_SET) != 0 )
      return -1;
-    if ( roar_vio_write(&(authfile->vio), key->data, key->len) != key->len )
+    if ( roar_vio_write(&(authfile->vio), key->data, key->len) != (ssize_t)key->len )
      return -1;
     if ( roar_authfile_unlock(authfile) == -1 )

libroar/config.c

@@ -37 +37 @@
 
 static struct roar_libroar_config_codec *
-           roar_libroar_config_codec_get_conf(int codec, int create, struct roar_libroar_config * config);
+           roar_libroar_config_codec_get_conf(uint32_t codec, int create, struct roar_libroar_config * config);
 
 
@@ -318 +318 @@
 
 static struct roar_libroar_config_codec *
-           roar_libroar_config_codec_get_conf(int codec, int create, struct roar_libroar_config * config) {
- int i;
+           roar_libroar_config_codec_get_conf(uint32_t codec, int create, struct roar_libroar_config * config) {
+ size_t i;
  int need_new = 1;
 
@@ -337 +337 @@
    if ( config->codecs.codec[i].codec == codec )
     return &(config->codecs.codec[i]);
-   if ( config->codecs.codec[i].codec == -1 )
+   if ( config->codecs.codec[i].codec == (uint32_t)-1 )
     need_new = 0;
   }
@@ -349 +349 @@
  if ( !need_new ) {
   for (i = 0; i < config->codecs.num; i++) {
-   if ( config->codecs.codec[i].codec == -1 ) {
+   if ( config->codecs.codec[i].codec == (uint32_t)-1 ) {
     memset(&(config->codecs.codec[i]), 0, sizeof(struct roar_libroar_config_codec));
     config->codecs.codec[i].codec = codec;
@@ -368 +368 @@
  memset(&(config->codecs.codec[config->codecs.num]), 0, 16);
  for (i = config->codecs.num; i < (config->codecs.num+16); i++) {
-  config->codecs.codec[i].codec = -1;
+  config->codecs.codec[i].codec = (uint32_t)-1;
  }
 

libroar/debug.c

@@ -184 +184 @@
  ret = snprintf(buf, sizeof(buf), "(%s: %s:%lu): %s: ", prefix, file, line, typename);
 
- if ( ret > 0 && ret < sizeof(buf) ) {
+ if ( ret > 0 && ret < (int)sizeof(buf) ) {
   bufp += ret;
  } else {

libroar/enumdev.c

@@ -101 +101 @@
  int i;
 #endif
+
+ (void)flags, (void)dir, (void)socktype;
 
  if ( maxlen < 10 )
@@ -207 +209 @@
  };
 
+ (void)flags, (void)dir, (void)socktype;
+
  for (f = &(files[0]); f->file != NULL; f++) {
   if ( (inp = fopen(f->file, "r")) == NULL )

libroar/env.c

@@ -60 +60 @@
 const char * roar_env_get_home(int level) {
  const char * home = getenv("HOME");
+
+ (void)level;
 
  return home;

libroar/error.c

@@ -918 +918 @@
  static char buf[1024] = "";
  int num[8];
- int i;
+ size_t i;
  int _ra_err = roar_error;
  int _sys_err = errno;

libroar/hash.c

@@ -146 +146 @@
  int i;
 
- for (i = 0; _libroar_hashes[i].id != -1; i++)
+ for (i = 0; _libroar_hashes[i].id != (uint_least32_t)-1; i++)
   if ( _libroar_hashes[i].id == ht )
    return _libroar_hashes[i].name;
@@ -157 +157 @@
  int i;
 
- for (i = 0; _libroar_hashes[i].id != -1; i++)
+ for (i = 0; _libroar_hashes[i].id != (uint_least32_t)-1; i++)
   if ( !strcasecmp(_libroar_hashes[i].name, ht) )
    return _libroar_hashes[i].id;
@@ -168 +168 @@
  int i;
 
- for (i = 0; _libroar_hashes[i].id != -1; i++)
+ for (i = 0; _libroar_hashes[i].id != (uint_least32_t)-1; i++)
   if ( _libroar_hashes[i].id == ht )
    return _libroar_hashes[i].dlen;

libroar/hash_tiger.c

@@ -580 +580 @@
 
 int roar_hash_tiger_uninit(struct roar_hash_tiger * state) {
+ (void)state;
  return 0;
 }
@@ -667 +668 @@
 
 ssize_t roar_hash_tiger_statelen(struct roar_hash_tiger * state) {
+ (void)state;
  return PSTATE_LEN;
 }
@@ -827 +829 @@
 
 ssize_t roar_hash_tiger_blocklen(struct roar_hash_tiger * state) {
+ (void)state;
  return BLOCK_LEN;
 }

libroar/libroar.c

@@ -216 +216 @@
 //#define ROAR_ERR(format, args...)  roar_debug_msg(ROAR_DEBUG_TYPE_ERROR, __LINE__, __FILE__, ROAR_DBG_PREFIX, format, ## args)
 
+ // we do not support info-text at the moment.
+ (void)info;
+
  if ( func == NULL )
   func = "<unknown>";

libroar/ltm.c

@@ -175 +175 @@
  char * buf = NULL;
  int    ret;
- int    i;
+ size_t i;
 
  if ( con == NULL ) {
@@ -260 +260 @@
 }
 
-static int64_t * roar_ltm_get_streamptr(struct roar_ltm_result * res, int streamidx) {
+static int64_t * roar_ltm_get_streamptr(struct roar_ltm_result * res, size_t streamidx) {
  int64_t * ptr;
  int numchans;
- int i;
+ size_t i;
 
  ROAR_DBG("roar_ltm_get_streamptr(res=%p, streamidx=%i) = ?", res, streamidx);
@@ -289 +289 @@
 }
 
-int roar_ltm_get_numchans(struct roar_ltm_result * res, int streamidx) {
+int roar_ltm_get_numchans(struct roar_ltm_result * res, size_t streamidx) {
  int64_t * ptr = roar_ltm_get_streamptr(res, streamidx);
 
@@ -298 +298 @@
 }
 
-int64_t roar_ltm_extract(struct roar_ltm_result * res, int mt, int streamidx, int channel) {
+int64_t roar_ltm_extract(struct roar_ltm_result * res, int mt, size_t streamidx, int channel) {
  int64_t * ptr = roar_ltm_get_streamptr(res, streamidx);
  int numchans;

libroar/memmgr.c

@@ -366 +366 @@
   memcpy(dst+dlen, src, slen);
   dst[dlen+slen] = 0;
- } else if ( dlen != size ) {
+ } else if ( dlen != (ssize_t)size ) {
   memcpy(dst+dlen, src, size-dlen-1);
   dst[size-1] = 0;

libroar/meta.c

@@ -520 +520 @@
 
 int roar_stream_meta_list (struct roar_connection * con, struct roar_stream * s, int * types, size_t len) {
- int i;
+ size_t i;
  struct roar_message m;
 

libroar/pinentry.c

@@ -177 +177 @@
  len = strlen(cmd);
 
- if ( write(pe->out, cmd, len) != len )
+ if ( write(pe->out, cmd, len) != (ssize_t)len )
   return -1;
 
@@ -186 +186 @@
   len = strlen(args);
 
-  if ( write(pe->out, args, len) != len )
+  if ( write(pe->out, args, len) != (ssize_t)len )
    return -1;
  }

libroar/proto.c

@@ -111 +111 @@
  }
 
- if ( roar_vio_write(vio, buf, headerlen) != headerlen ) {
+ if ( roar_vio_write(vio, buf, headerlen) != (ssize_t)headerlen ) {
   return -1;
  }
 
  if ( mes->datalen != 0 ) {
-  if ( roar_vio_write(vio, data == NULL ? mes->data : data, mes->datalen) != mes->datalen ) {
+  if ( roar_vio_write(vio, data == NULL ? mes->data : data, mes->datalen) != (ssize_t)mes->datalen ) {
    return -1;
   }
@@ -122 +122 @@
 
  if ( crclen != 0 ) {
-  if ( roar_vio_write(vio, crc, crclen) != crclen ) {
+  if ( roar_vio_write(vio, crc, crclen) != (ssize_t)crclen ) {
    return -1;
   }
@@ -253 +253 @@
 
  if ( mes->datalen <= LIBROAR_BUFFER_MSGDATA ) {
-  if ( roar_vio_read(vio, mes->data, mes->datalen) == mes->datalen ) {
+  if ( roar_vio_read(vio, mes->data, mes->datalen) == (ssize_t)mes->datalen ) {
    ROAR_DBG("roar_vrecv_message2(*): Got data!");
    roar_err_clear();
@@ -285 +285 @@
   }
 
-  if ( roar_vio_read(vio, *data, mes->datalen) == mes->datalen ) {
+  if ( roar_vio_read(vio, *data, mes->datalen) == (ssize_t)mes->datalen ) {
    ROAR_DBG("roar_vrecv_message2(*): Got data!");
 

libroar/roardl.c

@@ -119 +119 @@
  void * ret = dlsym(_roardl2ldl(lhandle), sym);
 
+ (void)type;
+
  ROAR_DBG("roar_dl_getsym(lhandle=%p, sym='%s', type=%i) = %p", lhandle, sym, type, ret);
 
@@ -181 +183 @@
 char *                   roar_dl_errstr(struct roar_dl_lhandle * lhandle) {
 #if defined(ROAR_HAVE_LIBDL)
+ (void)lhandle;
  return dlerror();
 #else

libroar/serverinfo.c

@@ -155 +155 @@
  struct roar_server_info * ret = NULL;
  uint16_t * d16, * dptr;
- int idx;
- int i;
+ size_t idx;
+ size_t i;
  size_t needlen = 4;
  char * textpart;

libroar/slp.c

@@ -48 +48 @@
  struct roar_slp_cookie * self = cookie;
 
+ (void)hslp;
+
  ROAR_DBG("roar_slp_url_callback(*) = ?");
 

libroar/socket.c

@@ -1088 +1088 @@
 
  if ( app_len > 0 )
-  if ( write(fh, app, app_len) != app_len )
+  if ( write(fh, app, app_len) != (ssize_t)app_len )
    return -1;
 

libroar/stream.c

@@ -510 +510 @@
  }
 
- if ( data[1] != ROAR_STREAM_PARA_NAME ) {
+ if ( data[1] != (uint16_t)ROAR_STREAM_PARA_NAME ) {
   roar_err_set(ROAR_ERROR_TYPEMM);
   return -1;
@@ -815 +815 @@
 */
 
-static struct {
+static const struct {
  int    dir;
  const char * name;
@@ -870 +870 @@
 */
 
-static struct {
- int    codec;
- const char * name;
- const char * mime;
+static const struct {
+ const uint32_t codec;
+ const char   * name;
+ const char   * mime;
 } _libroar_codec[] = {
  // PCM:
@@ -975 +975 @@
 };
 
-int roar_str2codec(const char * codec) {
- int i;
+int32_t roar_str2codec(const char * codec) {
+ size_t i;
  int guess;
 
@@ -985 +985 @@
   return guess;
 
- for (i = 0; _libroar_codec[i].codec != -1; i++)
+ for (i = 0; _libroar_codec[i].codec != (uint32_t)-1; i++)
   if ( strcasecmp(_libroar_codec[i].name, codec) == 0 )
    return _libroar_codec[i].codec;
@@ -994 +994 @@
 
 
-const char * roar_codec2str (const int codec) {
+const char * roar_codec2str (const uint32_t codec) {
  int i;
 
- for (i = 0; _libroar_codec[i].codec != -1; i++)
+ for (i = 0; _libroar_codec[i].codec != (uint32_t)-1; i++)
   if ( _libroar_codec[i].codec == codec )
    return _libroar_codec[i].name;
@@ -1004 +1004 @@
 }
 
-int    roar_mime2codec (const char * mime) {
- int i;
+int32_t  roar_mime2codec (const char * mime) {
+ size_t i;
 
  if ( mime == NULL ) {
@@ -1017 +1017 @@
  }
 
- for (i = 0; _libroar_codec[i].codec != -1; i++)
+ for (i = 0; _libroar_codec[i].codec != (uint32_t)-1; i++)
   if ( _libroar_codec[i].mime != NULL )
    if ( strcasecmp(_libroar_codec[i].mime, mime) == 0 )
@@ -1026 +1026 @@
 }
 
-const char * roar_codec2mime (const int    codec) {
- int i;
-
- for (i = 0; _libroar_codec[i].codec != -1; i++)
+const char * roar_codec2mime (const uint32_t   codec) {
+ size_t i;
+
+ for (i = 0; _libroar_codec[i].codec != (uint32_t)-1; i++)
   if ( _libroar_codec[i].codec == codec )
    return _libroar_codec[i].mime;
@@ -1110 +1110 @@
 }
 
-static struct {
+static const struct {
  int    role;
  const char * name;
@@ -1209 +1209 @@
 }
 
-static struct {
+static const struct {
  const char * name;
  struct roar_audio_info info;

libroar/trap.c

@@ -54 +54 @@
  size_t i;
 
- for (i = 0; i < (sizeof(_libroar_trap_groups)/sizeof(*_libroar_trap_groups)) && _libroar_trap_groups[i].id != -1; i++);
+ for (i = 0;
+      i < (sizeof(_libroar_trap_groups)/sizeof(*_libroar_trap_groups)) && _libroar_trap_groups[i].id != (unsigned int)-1;
+      i++);
  if ( i == (sizeof(_libroar_trap_groups)/sizeof(*_libroar_trap_groups)) )
   return -1;
@@ -68 +70 @@
  size_t i;
 
- for (i = 0; i < (sizeof(_libroar_trap_groups)/sizeof(*_libroar_trap_groups)) && _libroar_trap_groups[i].id != -1; i++) {
+ for (i = 0;
+      i < (sizeof(_libroar_trap_groups)/sizeof(*_libroar_trap_groups)) && _libroar_trap_groups[i].id != (unsigned int)-1;
+      i++) {
   if ( _libroar_trap_groups[i].id == group )
    return _libroar_trap_groups[i].name;
@@ -79 +83 @@
  size_t i;
 
- for (i = 0; i < (sizeof(_libroar_trap_groups)/sizeof(*_libroar_trap_groups)) && _libroar_trap_groups[i].id != -1; i++) {
+ for (i = 0;
+      i < (sizeof(_libroar_trap_groups)/sizeof(*_libroar_trap_groups)) && _libroar_trap_groups[i].id != (unsigned int)-1;
+      i++) {
   if ( !strcasecmp(_libroar_trap_groups[i].name, name) )
    return _libroar_trap_groups[i].id;
@@ -128 +134 @@
  }
 #else
+ (void)group, (void)name, (void)line, (void)file, (void)prefix;
  return;
 #endif

libroar/vio.c

@@ -686 +686 @@
 // null
 ssize_t roar_vio_null_rw    (struct roar_vio_calls * vio, void *buf, size_t count) {
+ (void)count;
+
  if ( vio == NULL || buf == NULL ) {
   roar_err_set(ROAR_ERROR_FAULT);
@@ -695 +697 @@
 
 int     roar_vio_null_sync    (struct roar_vio_calls * vio) {
+ (void)vio;
  return 0;
 }

libroar/vio_dstr.c

@@ -37 +37 @@
 
 #ifndef ROAR_WITHOUT_VIO_DSTR
-struct _roar_vio_dstr_type {
+static struct _roar_vio_dstr_type {
  const int    id;
  const char * name;

libroar/vio_jumbo.c

@@ -147 +147 @@
 
  // TODO: do this a bit more intelergent (RE?)
- if ( roar_vio_write(self->backend, data, self->pos) != self->pos )
+ if ( roar_vio_write(self->backend, data, self->pos) != (ssize_t)self->pos )
   return -1;
 

libroar/vio_misc.c

@@ -55 +55 @@
 
 static off_t   roar_vio_misc_lseek   (struct roar_vio_calls * vio, off_t offset, int whence) {
+ (void)vio, (void)offset, (void)whence;
  return 0;
 }
@@ -71 +72 @@
 
 static int     roar_vio_misc_sync    (struct roar_vio_calls * vio) {
+ (void)vio;
  return 0;
 }
@@ -98 +100 @@
 
 static int     roar_vio_misc_close   (struct roar_vio_calls * vio) {
+ (void)vio;
  return 0;
 }
@@ -119 +122 @@
 
 static ssize_t roar_vio_misc_op_return_len (void * buf, size_t len, struct roar_vio_calls * vio, struct roar_vio_misc * callbacks) {
+ (void)buf, (void)vio, (void)callbacks;
  return len;
 }
 
 static ssize_t roar_vio_misc_op_return_zero(void * buf, size_t len, struct roar_vio_calls * vio, struct roar_vio_misc * callbacks) {
+ (void)buf, (void)len, (void)vio, (void)callbacks;
  return 0;
 }
 
 static ssize_t roar_vio_misc_op_zero(void * buf, size_t len, struct roar_vio_calls * vio, struct roar_vio_misc * callbacks) {
+ (void)vio, (void)callbacks;
  memset(buf, 0, len);
  return len;
@@ -133 +139 @@
 static ssize_t roar_vio_misc_op_full(void * buf, size_t len, struct roar_vio_calls * vio, struct roar_vio_misc * callbacks)
 {
+ (void)buf, (void)len, (void)vio, (void)callbacks;
  roar_err_set(ROAR_ERROR_NOSPC);
  return -1;
@@ -138 +145 @@
 
 static ssize_t roar_vio_misc_op_random_nonce(void * buf, size_t len, struct roar_vio_calls * vio, struct roar_vio_misc * callbacks) {
+ (void)vio, (void)callbacks;
+
  if ( roar_random_gen_nonce(buf, len) == -1 )
   return -1;
@@ -145 +154 @@
 
 static ssize_t roar_vio_misc_op_random_salt_nonce(void * buf, size_t len, struct roar_vio_calls * vio, struct roar_vio_misc * callbacks) {
+ (void)vio, (void)callbacks;
+
  if ( roar_random_salt_nonce(buf, len) == -1 )
   return -1;

libroar/vio_pipe.c

@@ -215 +215 @@
  // we may add fdatasync() calls here depending on the type
  // but in general they should not be needed on pipes.
+ (void)vio;
  return 0;
 }

libroar/vio_stdio.c

@@ -62 +62 @@
 #endif
 
+ // (void)flags is the the individual sections because later added APIs
+ // may require those flags.
+
  if ( calls == NULL )
   return NULL;
 
 #if defined(ROAR_HAVE_FOPENCOOKIE)
+ (void)flags;
+
  memset(&foc_funcs, 0, sizeof(cookie_io_functions_t));
 
@@ -74 +79 @@
  return fopencookie((void*) calls, "rw", foc_funcs);
 #elif defined(ROAR_HAVE_FUNOPEN)
+ (void)flags;
+
  return funopen((void*) calls, roar_vio_to_stdio_read,  roar_vio_to_stdio_write,
                                roar_vio_to_stdio_lseek, roar_vio_to_stdio_close);

libroar/vio_tantalos.c

@@ -62 +62 @@
  time_t now = time(NULL);
 
+ (void)dst;
+
  if ( (cookie = roar_vio_open_get_cookie(0)) == NULL )
   return -1;

libroar/vio_zlib.c

@@ -51 +51 @@
 
 static void * _zalloc(voidpf opaque, uInt items, uInt size) {
+ (void)opaque;
  return roar_mm_calloc(items, size);
 }
 
 static void _zfree(voidpf opaque, voidpf address) {
+ (void)opaque;
  roar_mm_free(address);
 }
@@ -220 +222 @@
   count -= len;
 
-  if ( len == buflen ) {
+  if ( len == (ssize_t)buflen ) {
    ret = roar_buffer_next(&(self->inbuf));
   } else {
@@ -342 +344 @@
   if ( len == -1 ) {
    return -1;
-  } else if ( len == buflen ) {
+  } else if ( len == (ssize_t)buflen ) {
    if ( roar_buffer_next(&(self->outbuf)) == -1 ) {
     roar_err_set((self->compressor_error = ROAR_ERROR_LOSTSYNC));
@@ -389 +391 @@
    len = roar_vio_write(self->next, outbuf, outlen);
 
-   if ( len < outlen ) {
+   if ( len < (ssize_t)outlen ) {
     if ( roar_buffer_new_data(&leftbuf, outlen - len, &leftbufdata) == -1 ) {
      roar_err_set((self->compressor_error = ROAR_ERROR_LOSTSYNC));
@@ -428 +430 @@
 
 static off_t   roar_vio_zlib_lseek   (struct roar_vio_calls * vio, off_t offset, int whence) {
+ (void)vio, (void)offset, (void)whence;
  roar_err_set(ROAR_ERROR_NOSYS);
  return (off_t)-1;

libroar/vs.c

@@ -160 +160 @@
  ssize_t offset;
  int cmd, subcmd;
- int i;
+ size_t i;
 
  if ( roar_recv_message(vss->con, &mes, &data) == -1 ) {
@@ -1154 +1154 @@
  }
 
- if ( channels != oldchannels )
+ if ( channels != (size_t)oldchannels )
   mode = ROAR_SET_VOL_UNMAPPED;