1.1 --- a/test/buffer_tests.c Thu Oct 11 16:29:30 2012 +0200
1.2 +++ b/test/buffer_tests.c Fri Oct 12 10:54:55 2012 +0200
1.3 @@ -5,7 +5,7 @@
1.4 #include "buffer_tests.h"
1.5
1.6 UCX_TEST_IMPLEMENT(test_ucx_buffer_seektell) {
1.7 - char *buffer = malloc(16);
1.8 + char *buffer = (char*) malloc(16);
1.9 memset(buffer, 32, 7);
1.10 buffer[7] = 0;
1.11
1.12 @@ -48,7 +48,7 @@
1.13 }
1.14
1.15 UCX_TEST_IMPLEMENT(test_ucx_buffer_putc) {
1.16 - char *buffer = malloc(16);
1.17 + char *buffer = (char*) malloc(16);
1.18 memset(buffer, 32, 16);
1.19
1.20 UcxBuffer *b = ucx_buffer_new(buffer, 16, UCX_BUFFER_DEFAULT);
1.21 @@ -74,7 +74,7 @@
1.22 }
1.23
1.24 UCX_TEST_IMPLEMENT(test_ucx_buffer_getc) {
1.25 - char *buffer = malloc(16);
1.26 + char *buffer = (char*) malloc(16);
1.27 memset(buffer, 32, 8);
1.28 for (int i = 8; i < 16 ; i++) {
1.29 buffer[i] = 40+i;
1.30 @@ -104,7 +104,7 @@
1.31 }
1.32
1.33 UCX_TEST_IMPLEMENT(test_ucx_buffer_write) {
1.34 - char *buffer = malloc(16);
1.35 + char *buffer = (char*) malloc(16);
1.36 memset(buffer, 32, 8);
1.37 for (int i = 8; i < 16 ; i++) {
1.38 buffer[i] = 40+i;
1.39 @@ -115,8 +115,8 @@
1.40
1.41 UCX_TEST_BEGIN
1.42
1.43 - char* teststring = "this is way too much";
1.44 - r = ucx_buffer_write(teststring, 1, 20, b);
1.45 + const char* teststring = "this is way too much";
1.46 + r = ucx_buffer_write((void*)teststring, 1, 20, b);
1.47 UCX_TEST_ASSERT(r == 16, "string not correctly trimed");
1.48 UCX_TEST_ASSERT(memcmp(buffer, teststring, 16) == 0,
1.49 "buffer data incorrect");
1.50 @@ -128,10 +128,10 @@
1.51 UCX_TEST_ASSERT(memcmp(buffer, "this is not too much", 16) == 0,
1.52 "modified buffer is incorrect");
1.53
1.54 - char* threebytestring = " t h r e e ";
1.55 + const char* threebytestring = " t h r e e ";
1.56 memset(buffer, 49, 16);
1.57 ucx_buffer_seek(b, 0, SEEK_SET);
1.58 - r = ucx_buffer_write(threebytestring, 3, 6, b);
1.59 + r = ucx_buffer_write((void*)threebytestring, 3, 6, b);
1.60 UCX_TEST_ASSERT(r == 15, "three byte string not correctly trimed");
1.61 UCX_TEST_ASSERT(b->pos == 15,
1.62 "position after write of three byte string incorrect");
1.63 @@ -146,7 +146,7 @@
1.64 }
1.65
1.66 UCX_TEST_IMPLEMENT(test_ucx_buffer_write_ax) {
1.67 - char *buffer = malloc(4);
1.68 + char *buffer = (char*) malloc(4);
1.69
1.70 UcxBuffer *b = ucx_buffer_new(buffer, 16,
1.71 UCX_BUFFER_AUTOEXTEND | UCX_BUFFER_AUTOFREE);
1.72 @@ -154,9 +154,9 @@
1.73
1.74 UCX_TEST_BEGIN
1.75
1.76 - char* teststring = "this is way too much";
1.77 - r = ucx_buffer_write(teststring, 1, 20, b);
1.78 - buffer = b->space; /* autoextend is enabled, so we MUST retrieve pointer */
1.79 + const char* teststring = "this is way too much";
1.80 + r = ucx_buffer_write((void*)teststring, 1, 20, b);
1.81 + buffer = (char*) b->space; /*autoextend enabled, we MUST retrieve pointer*/
1.82 UCX_TEST_ASSERT(r == 20, "not all characters written");
1.83 UCX_TEST_ASSERT(b->size == 32, "buffer not properly extended");
1.84 UCX_TEST_ASSERT(b->pos == 20, "position incorrect");
1.85 @@ -170,7 +170,7 @@
1.86 }
1.87
1.88 UCX_TEST_IMPLEMENT(test_ucx_buffer_read) {
1.89 - char *buffer = malloc(16);
1.90 + char *buffer = (char*) malloc(16);
1.91 memset(buffer, 56, 8);
1.92 for (int i = 8; i < 16 ; i++) {
1.93 buffer[i] = 40+i;
1.94 @@ -211,7 +211,7 @@
1.95 }
1.96
1.97 UCX_TEST_IMPLEMENT(test_ucx_buffer_extract) {
1.98 - char *buffer = malloc(16);
1.99 + char *buffer = (char*) malloc(16);
1.100 strcpy(buffer, "this is a test!");
1.101
1.102 UcxBuffer *src = ucx_buffer_new(buffer, 16, UCX_BUFFER_AUTOFREE),
