Changeset 3764:2a2b1eb426c4 in roaraudio for libroar

Timestamp:

05/03/10 14:30:48 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added new buffer function roar_buffer_new_data() to make common alloc case more easy

Location:

libroar

Files:

• buffer.c (modified) (2 diffs)
• vio_pipe.c (modified) (1 diff)
• vio_proto.c (modified) (1 diff)

libroar/buffer.c

@@ -36 +36 @@
 #include "libroar.h"
 
+// TODO: convert this to a macro.
+// TODO: but still provide a function->symbol
+// TODO: so we do not need to change SONAME-Version
+// TODO: Clean this up in next SONAME-Version
 int roar_buffer_new      (struct roar_buffer ** buf, size_t len) {
- void * data;
-
- if ((data = roar_mm_malloc(len)) == NULL) {
-  return -1;
- }
-
- if ( roar_buffer_new_no_ma(buf, len, data) == -1 ) {
-  roar_mm_free(data);
+ return roar_buffer_new_data(buf, len, NULL);
+}
+
+int roar_buffer_new_data (struct roar_buffer ** buf, size_t len, void ** data) {
+ void * bufdata;
+
+ if ((bufdata = roar_mm_malloc(len)) == NULL) {
+  return -1;
+ }
+
+ if ( roar_buffer_new_no_ma(buf, len, bufdata) == -1 ) {
+  roar_mm_free(bufdata);
   return -1;
  }
@@ -50 +58 @@
  if ( roar_buffer_set_flag(*buf, ROAR_BUFFER_FLAG_NOFREE, ROAR_BUFFER_RESET) == -1 ) {
   roar_buffer_free(*buf);
-  roar_mm_free(data);
-  return -1;
- }
+  roar_mm_free(bufdata);
+  return -1;
+ }
+
+ if ( data != NULL )
+  *data = bufdata;
 
  return 0;

libroar/vio_pipe.c

@@ -326 +326 @@
     }
 
-    if ( roar_buffer_new(&next, count) == -1 )
-     return -1;
-
-    if ( roar_buffer_get_data(next, &data) == -1 ) {
-     roar_buffer_free(next);
-     return -1;
-    }
+    if ( roar_buffer_new_data(&next, count, &data) == -1 )
+     return -1;
 
     memcpy(data, buf, count);

libroar/vio_proto.c

@@ -274 +274 @@
  calls->write = NULL; // Disable write as we do not support this
 
- if ( roar_buffer_new(&bufbuf, 1024) == -1 )
-  return -1;
-
- if ( roar_buffer_get_data(bufbuf, &buf) == -1 ) {
-  roar_buffer_free(bufbuf);
-  return -1;
- }
+ if ( roar_buffer_new_data(&bufbuf, 1024, &buf) == -1 )
+  return -1;
 
  ROAR_DBG("roar_vio_open_proto_http(calls=%p, dst=%p, host='%s', file='%s') = ?", calls, dst, host, file);