Changeset 5603:0577a2d5a9a6 in roaraudio

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

Added roar_buffer_moveintoqueue() (Closes: #283)

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/buffer.h (modified) (1 diff)
• include/libroar/roarfeatures.h (modified) (1 diff)
• libroar/buffer.c (modified) (1 diff)
• plugins/universal/protocol-daytime.c (modified) (1 diff)
• plugins/universal/protocol-echo.c (modified) (1 diff)
• plugins/universal/tic-tac-toe.c (modified) (3 diffs)

ChangeLog

@@ -15 +15 @@
         * Updated manpages.
         * moved strselcmp() and strseltok() to libroar (Closes: #285) (pr1)
+        * Added roar_buffer_moveintoqueue() (Closes: #283) (pr1)
 
 v. 1.0beta3 - Sun Jul 15 2012 26:08 CEST

include/libroar/buffer.h

@@ -72 +72 @@
 int roar_buffer_add      (struct roar_buffer *  buf, struct roar_buffer *  next) _LIBROAR_BUFFER_STDATTRS;
 int roar_buffer_moveinto (struct roar_buffer *  buf, struct roar_buffer ** next) _LIBROAR_BUFFER_STDATTRS;
+int roar_buffer_moveintoqueue(struct roar_buffer ** buf, struct roar_buffer ** next) _LIBROAR_BUFFER_STDATTRS;
 
 int roar_buffer_ref      (struct roar_buffer *  buf) _LIBROAR_ATTR_NONNULL_ALL;

include/libroar/roarfeatures.h

@@ -50 +50 @@
 #define ROAR_FT_FUNC_RESET
 #define ROAR_FT_FUNC_CLOCK_GETTIME
+#define ROAR_FT_FUNC_BUFFER_MOVEINTOQUEUE
 #define ROAR_FT_FEATURE_VS
 #define ROAR_FT_FEATURE_VS_FILE

libroar/buffer.c

@@ -297 +297 @@
 }
 
+int roar_buffer_moveintoqueue(struct roar_buffer ** buf, struct roar_buffer ** next) {
+ if ( buf == NULL || next == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ if ( *buf == NULL ) {
+  *buf = *next;
+  *next = NULL;
+  return 0;
+ } else {
+  return roar_buffer_moveinto(*buf, next);
+ }
+}
+
 int roar_buffer_get_next (struct roar_buffer *  buf, struct roar_buffer ** next) {
  _ckbuf(0)

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));
 }