Changeset 5357:f3c705877ceb in roaraudio for libroar

Timestamp:

12/15/11 18:13:47 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed some compiler warnings

Location:

libroar

Files:

• config.c (modified) (5 diffs)
• ctl.c (modified) (3 diffs)
• hash.c (modified) (4 diffs)
• ltm.c (modified) (1 diff)
• vio_bio.c (modified) (2 diffs)
• vio_cmd.c (modified) (1 diff)
• vio_rtp.c (modified) (4 diffs)
• vs.c (modified) (6 diffs)

libroar/config.c

@@ -37 +37 @@
 
 static struct roar_libroar_config_codec *
-           roar_libroar_config_codec_get_conf(uint32_t codec, int create, struct roar_libroar_config * config);
+           roar_libroar_config_codec_get_conf(int32_t codec, int create, struct roar_libroar_config * config);
 
 
@@ -104 +104 @@
 static int roar_libroar_config_parse_codec(struct roar_libroar_config * config, char * txt) {
  struct roar_libroar_config_codec * codec_cfg;
- int codec;
+ int32_t codec;
  char * codec_str, * option_str, * value_str;
  char * toksave = NULL;
@@ -312 +312 @@
 }
 
-struct roar_libroar_config_codec * roar_libroar_config_codec_get(int codec, int create) {
+struct roar_libroar_config_codec * roar_libroar_config_codec_get(int32_t codec, int create) {
  struct roar_libroar_config * config = roar_libroar_get_config();
  return roar_libroar_config_codec_get_conf(codec, create, config);
@@ -318 +318 @@
 
 static struct roar_libroar_config_codec *
-           roar_libroar_config_codec_get_conf(uint32_t codec, int create, struct roar_libroar_config * config) {
+           roar_libroar_config_codec_get_conf(int32_t codec, int create, struct roar_libroar_config * config) {
  size_t i;
  int need_new = 1;
@@ -335 +335 @@
  } else {
   for (i = 0; i < config->codecs.num; i++) {
-   if ( config->codecs.codec[i].codec == codec )
+   if ( config->codecs.codec[i].codec == (uint32_t)codec )
     return &(config->codecs.codec[i]);
    if ( config->codecs.codec[i].codec == (uint32_t)-1 )

libroar/ctl.c

@@ -347 +347 @@
 }
 
-int roar_ctl_ia2m     (struct roar_message * m, int * data, int len) {
- int i;
+int roar_ctl_ia2m     (struct roar_message * m, int * data, size_t len) {
+ size_t i;
 
  if ( len > LIBROAR_BUFFER_MSGDATA ) {
@@ -362 +362 @@
  return 0;
 }
-int roar_ctl_m2ia     (struct roar_message * m, int * data, int len) {
- int i;
+int roar_ctl_m2ia     (struct roar_message * m, int * data, size_t len) {
+ size_t i;
 
  if ( m->datalen > len ) {
@@ -448 +448 @@
 
 int roar_ctl_m2c      (struct roar_message * m, struct roar_client * c) {
- int i;
- int cur;
  uint32_t pid;
  size_t len;
+ size_t cur;
+ int i;
 
  if ( m == NULL || c == NULL ) {

libroar/hash.c

@@ -89 +89 @@
  {ROAR_HT_ISBN13,      "ISBN13",      8   },
  {ROAR_HT_ADLER32,     "ADLER32",     4   },
- {-1, NULL}
+ {-1, NULL, -1}
 };
 
@@ -211 +211 @@
  }
 
- if ( !(slen == -1 || digestlen == slen) ) {
+ if ( !(slen == -1 || (ssize_t)digestlen == slen) ) {
   roar_err_set(ROAR_ERROR_INVAL);
   return -1;
@@ -410 +410 @@
 
  algo = roar_ht2gcrypt_tested(algo);
- if ( algo == -1 )
+ if ( algo == (roar_hash_t)-1 )
   return -1;
 
@@ -447 +447 @@
 
  len = roar_ht_digestlen(algo);
- if ( len == -1 )
+ if ( len == (size_t)-1 ) /* this is a hack to avoid len to be of type ssize_t which breaks following code */
   return -1;
 

libroar/ltm.c

@@ -267 +267 @@
  ROAR_DBG("roar_ltm_get_streamptr(res=%p, streamidx=%i) = ?", res, streamidx);
 
- if ( res == NULL || streamidx < 0 || streamidx >= res->streams ) {
+ if ( res == NULL || streamidx >= res->streams ) {
   roar_err_set(ROAR_ERROR_FAULT);
   return NULL;

libroar/vio_bio.c

@@ -53 +53 @@
  return 0;
 #else
+ (void)calls, (void)bio;
+ roar_err_set(ROAR_ERROR_NOSYS);
  return -1;
 #endif
@@ -58 +60 @@
 
 BIO *   roar_vio_to_bio        (struct roar_vio_calls * calls) {
+ roar_err_set(ROAR_ERROR_NOSYS);
  return NULL;
 }

libroar/vio_cmd.c

@@ -297 +297 @@
  int max_fh;
  int ret;
- char   tbuf[ROAR_VIO_CMD_BUFSIZE];
- char * tp   = NULL;
- size_t tlen = 0;
- int    nonblock = state->options & ROAR_VIO_CMD_OPTS_NONBLOCK;
- int    in, out;
- int    eating = 1;
+ char    tbuf[ROAR_VIO_CMD_BUFSIZE];
+ char  * tp   = NULL;
+ ssize_t tlen = 0;
+ int     nonblock = state->options & ROAR_VIO_CMD_OPTS_NONBLOCK;
+ int     in, out;
+ int     eating = 1;
 
  ROAR_DBG("roar_vio_cmd_read(*) = ?");

libroar/vio_rtp.c

@@ -44 +44 @@
  {ROAR_RTP_PT_A_L16_441_2, {.codec = ROAR_CODEC_PCM_S_BE, .bits = 16, .rate = 44100, .channels = 2}},
  {ROAR_RTP_PT_A_L16_441_1, {.codec = ROAR_CODEC_PCM_S_BE, .bits = 16, .rate = 44100, .channels = 1}},
- {-1, {-1, -1, -1}}
+ {-1, {-1, -1, -1, -1}}
 };
 
@@ -127 +127 @@
  size_t len_need = self->mtu * 4 + sizeof(struct roar_rtp_header); // we hope to never get pkgs with size > 4*mtu
  size_t len_have;
- size_t have = 0;
+ ssize_t have = 0;
  ssize_t ret;
  union {
@@ -202 +202 @@
  data.vp += dataoffset;
 
- if ( ret <= count ) {
+ if ( ret <= (ssize_t)count ) {
   memcpy(buf, data.vp, ret);
   ROAR_DBG("roar_vio_rtp_read(vio=%p, buf=%p, count=?) = %llu", vio, buf, (long long unsigned)(have+ret));
@@ -251 +251 @@
   }
 
-  return len_have ? len_have : ret;
+  return len_have ? (ssize_t)len_have : ret;
  }
 

libroar/vs.c

@@ -1288 +1288 @@
  struct roar_vio_selecttv rtv = {.sec = 0, .nsec = 1};
  size_t len = 0;
- ssize_t i;
+ size_t i;
  ssize_t ret;
  int can_read = 0, can_write = 0;
@@ -1399 +1399 @@
   if ( ret == -1 ) {
    return -1;
-  } else if ( ret == len ) {
+  } else if ( ret == (ssize_t)len ) {
    roar_buffer_free(vss->writebuffer);
    vss->writebuffer = NULL;
@@ -1419 +1419 @@
   if ( ret == -1 ) {
    return -1;
-  } else if ( ret == len ) {
+  } else if ( ret == (ssize_t)len ) {
    roar_buffer_free(vss->readbuffer);
    vss->readbuffer = NULL;
@@ -1462 +1462 @@
    if ( ret == -1 ) {
     return -1;
-   } else if ( ret == len ) {
+   } else if ( ret == (ssize_t)len ) {
     roar_buffer_free(vss->readbuffer);
     vss->readbuffer = NULL;
@@ -1504 +1504 @@
    ROAR_DBG("roar_vs_iterate(vss=%p, wait=%i, error=%p) = ?", vss, wait, error);
 
-   if ( len != ret ) {
+   if ( (ssize_t)len != ret ) {
     len = ret;
     if ( roar_buffer_set_len(vss->writebuffer, len) == -1 )
@@ -1516 +1516 @@
    if ( ret == -1 ) {
     return -1;
-   } else if ( ret == len ) {
+   } else if ( ret == (ssize_t)len ) {
     roar_buffer_free(vss->writebuffer);
     vss->writebuffer = NULL;