dav: comparison ucx/buffer.c

-:ae5a98f0545c
+:88625853ae74
+/*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+*
+* Copyright 2013 Olaf Wintermann. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+*   1. Redistributions of source code must retain the above copyright
+*      notice, this list of conditions and the following disclaimer.
+*
+*   2. Redistributions in binary form must reproduce the above copyright
+*      notice, this list of conditions and the following disclaimer in the
+*      documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*/
 #include "buffer.h"
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 UcxBuffer *ucx_buffer_new(void *space, size_t size, int flags) {
 UcxBuffer *buffer = (UcxBuffer*) malloc(sizeof(UcxBuffer));
 if (buffer) {
 buffer->flags = flags;
 if (!space) {
-buffer->space = malloc(size);
+buffer->space = (char*)malloc(size);
 if (!buffer->space) {
 free(buffer);
 return NULL;
 }
 memset(buffer->space, 0, size);
 buffer->flags |= UCX_BUFFER_AUTOFREE;
 } else {
-buffer->space = space;
+buffer->space = (char*)space;
 }
 buffer->capacity = size;
 buffer->size = 0;
 buffer->pos = 0;
 return NULL;
 }
 UcxBuffer *dst = (UcxBuffer*) malloc(sizeof(UcxBuffer));
 if (dst) {
-dst->space = malloc(length);
+dst->space = (char*)malloc(length);
 if (!dst->space) {
 free(dst);
 return NULL;
 }
 dst->capacity = length;
 }
 return dst;
 }
 int ucx_buffer_seek(UcxBuffer *buffer, off_t offset, int whence) {
-off_t npos;
+size_t npos = 0;
 switch (whence) {
 case SEEK_SET:
 npos = 0;
 break;
 case SEEK_CUR:
 break;
 }
 npos += offset;
-if (npos < 0 || npos > buffer->size) {
+if (npos > buffer->size) {
 return -1;
 } else {
 buffer->pos = npos;
 return 0;
 }
 int ucx_buffer_extend(UcxBuffer *buffer, size_t len) {
 size_t newcap = buffer->capacity;
 while (buffer->pos + len > newcap) newcap <<= 1;
-char *newspace = realloc(buffer->space, newcap);
+char *newspace = (char*)realloc(buffer->space, newcap);
 if (newspace) {
 memset(newspace+buffer->size, 0, newcap-buffer->size);
 buffer->space = newspace;
 buffer->capacity = newcap;
 } else {
 }
 size_t ucx_buffer_generic_copy(void *s1, void *s2,
 read_func readfnc, write_func writefnc, size_t bufsize) {
 size_t ncp = 0;
-char *buf = malloc(bufsize);
+char *buf = (char*)malloc(bufsize);
 if(buf == NULL) {
 return 0;
 }
 size_t r;
 }
 free(buf);
 return ncp;
 }
+size_t ucx_buffer_generic_ncopy(void *s1, void *s2,
+read_func readfnc, write_func writefnc, size_t bufsize, size_t n) {
+if(n == 0) {
+return 0;
+}
+size_t ncp = 0;
+char *buf = (char*)malloc(bufsize);
+if(buf == NULL) {
+return 0;
+}
+size_t r;
+size_t rn = bufsize > n ? n : bufsize;
+while((r = readfnc(buf, 1, rn, s1)) != 0) {
+r = writefnc(buf, 1, r, s2);
+ncp += r;
+n -= r;
+rn = bufsize > n ? n : bufsize;
+if(r == 0 || n == 0) {
+break;
+}
+}
+free(buf);
+return ncp;
+}

Mercurial > hg > dav / file comparison

comparison: ucx/buffer.c

ucx/buffer.c