Changeset 5162:85c55ccd12a9 in roaraudio for roard/midi.c

Timestamp:

10/16/11 20:12:40 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed some compiler warnings

File:

• roard/midi.c (modified) (5 diffs)

roard/midi.c

@@ -158 +158 @@
 
  if ( roar_buffer_new_data(&b, MIDI_READ_SIZE, &buf) == -1 ) {
-  ROAR_ERR("midi_check_stream(*): Can not alloc buffer space!");
-  ROAR_DBG("midi_check_stream(*) = -1");
+  ROAR_ERR("midi_check_stream(id=%i): Can not alloc buffer space!", id);
+  ROAR_DBG("midi_check_stream(id=%i) = -1", id);
   return -1;
  }
@@ -169 +169 @@
  }
 
- roar_buffer_set_len(b, len);
+ if ( roar_buffer_set_len(b, len) == -1 ) {
+  ROAR_WARN("midi_check_stream(id=%i): Can not set buffer size. BAD.", id);
+  roar_buffer_free(b);
+  streams_delete(id);
+  return -1;
+ }
 
  if ( stream_add_buffer(id, b) == -1 ) {
@@ -348 +353 @@
   }
 
-  roar_buffer_next(&(ss->buffer));
+  if ( roar_buffer_next(&(ss->buffer)) == -1 ) {
+   ROAR_WARN("midi_conv_midi2mes(id=%i): Can not move to next buffer segment. BAD.", id);
+   break;
+  }
  }
 
@@ -672 +680 @@
 
 int midi_add_buf       (int id, struct roar_buffer * buf) {
+#ifdef DEBUG
  struct midi_message * mes;
  void * bufdata;
+#endif
 
  if ( id == -1 || buf == NULL )
   return -1;
 
+#ifdef DEBUG
  if ( roar_buffer_get_data(buf, &bufdata) == -1 )
   return -1;
@@ -688 +699 @@
  ROAR_DBG("midi_add_buf(*): flags=0x%.2X", mes->flags);
  ROAR_DBG("midi_add_buf(*): kk=0x%.2X, vv=0x%.2X", mes->kk, mes->vv);
+#endif
 
  if ( g_midi_mess.buf == NULL ) {
   g_midi_mess.buf = buf;
  } else {
-  roar_buffer_add(g_midi_mess.buf, buf);
+  if ( roar_buffer_add(g_midi_mess.buf, buf) == -1 ) {
+   ROAR_DBG("midi_add_buf(*) = -1");
+   return -1;
+  }
  }