Changeset 5270:e25346c13638 in roaraudio for libroar/stream.c

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

fixed some gcc -Wextra warnings

File:

• libroar/stream.c (modified) (11 diffs)

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;