Changeset 5603:0577a2d5a9a6 in roaraudio for plugins

Timestamp:

07/30/12 17:32:22 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added roar_buffer_moveintoqueue() (Closes: #283)

Location:

plugins/universal

Files:

• protocol-daytime.c (modified) (1 diff)
• protocol-echo.c (modified) (1 diff)
• tic-tac-toe.c (modified) (3 diffs)

plugins/universal/protocol-daytime.c

@@ -42 +42 @@
  memcpy(data, date, len);
 
- if ( *obuffer == NULL ) {
-  *obuffer = buf;
- } else {
-  if ( roar_buffer_moveinto(*obuffer, &buf) == -1 )
-   return -1;
- }
+ if ( roar_buffer_moveintoqueue(obuffer, &buf) == -1 )
+  return -1;
 
  return 0;

plugins/universal/protocol-echo.c

@@ -50 +50 @@
  }
 
- if ( *obuffer == NULL ) {
-  *obuffer = buf;
- } else {
-  if ( roar_buffer_moveinto(*obuffer, &buf) == -1 ) {
-   ROAR_DBG("_handle(client=%i, vio=%p) = -1 // error=%s(%i)", client, vio, roar_errorstring, roar_error);
-   return -1;
-  }
- }
+ if ( roar_buffer_moveintoqueue(obuffer, &buf) == -1 )
+  return -1;
 
  ROAR_DBG("_handle(client=%i, vio=%p) = 0", client, vio);

plugins/universal/tic-tac-toe.c

@@ -89 +89 @@
 };
 
-static inline int __movein(struct roar_buffer ** buf, struct roar_buffer ** next) {
- if ( *buf == NULL ) {
-  *buf = *next;
-  *next = NULL;
-  return 0;
- } else {
-  return roar_buffer_moveinto(*buf, next);
- }
-}
-
 static void new_game(game_state * state) {
  memset(state, _FREE, sizeof(game_state));
@@ -237 +227 @@
  }
 
- __movein(obuffer, &buf);
+ _LIBROAR_IGNORE_RET(roar_buffer_moveintoqueue(obuffer, &buf));
 }
 
@@ -260 +250 @@
  }
 
- __movein(obuffer, &buf);
+ _LIBROAR_IGNORE_RET(roar_buffer_moveintoqueue(obuffer, &buf));
 }