Changeset 4521:4277b6a0c8a1 in roaraudio for roard/req.c

Timestamp:

10/16/10 17:09:23 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed a lot compiler warnings

File:

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

roard/req.c

@@ -149 +149 @@
 
  ROAR_DBG("req_on_new_stream(client=%i, ...): getting stream...", client);
- if ( streams_get(stream, (struct roar_stream_server **)&s) == -1 ) {
+ if ( streams_get_clientobj(stream, &s) == -1 ) {
   streams_delete(stream);
   return -1;
@@ -235 +235 @@
     }
 
-    if ( streams_get(ROAR_STREAM(s)->pos_rel_id, (struct roar_stream_server **)&source_stream) == -1 ) {
+    if ( streams_get_clientobj(ROAR_STREAM(s)->pos_rel_id, &source_stream) == -1 ) {
      streams_delete(stream);
      return -1;
@@ -256 +256 @@
      source_info = g_sa;
     } else {
-     if ( streams_get(ROAR_STREAM(s)->pos_rel_id, (struct roar_stream_server **)&source_stream) == -1 ) {
+     if ( streams_get_clientobj(ROAR_STREAM(s)->pos_rel_id, &source_stream) == -1 ) {
       streams_delete(stream);
       return -1;
@@ -606 +606 @@
    *data = NULL;
 
-   if ( roar_server_info_to_mes(mes, &info, data) == -1 )
+   if ( roar_server_info_to_mes(mes, &info, (void**)data) == -1 )
     return -1;
 
@@ -1421 +1421 @@
 int req_on_add_data (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
  struct roar_buffer * b;
- char               * buf;
-
- if ( roar_buffer_new_data(&b, mes->datalen, (void **)&buf) == -1 ) {
+ void               * buf;
+
+ if ( roar_buffer_new_data(&b, mes->datalen, &buf) == -1 ) {
   ROAR_ERR("req_on_add_data(*): Can not alloc buffer space!");
   ROAR_DBG("req_on_add_data(*) = -1");