Generated from configure.in

[swftools.git] / lib / q.c

diff --git a/lib/q.c b/lib/q.c
index 2c01d45..a997fdd 100644 (file)
--- a/lib/q.c
+++ b/lib/q.c
@@ -3,8 +3,22 @@
    Part of the swftools package.
    
    Copyright (c) 2001 Matthias Kramm <kramm@quiss.org>
+ 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
 
-   This file is distributed under the GPL, see file COPYING for details */
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -14,7 +28,7 @@
 // ------------------------------- malloc, alloc routines ---------------------
 
 #ifndef STRNDUP
-char* strndup(const char*str, int size)
+char* strdup_n(const char*str, int size)
 {
     char*m = (char*)malloc(size+1);
     memcpy(m, str, size);
@@ -52,7 +66,7 @@ char*qstrdup(const char*string)
 }
 char*qstrndup(const char*string, int len)
 {
-    return strndup(string, len);
+    return strdup_n(string, len);
 }
 
 // ------------------------------- mem_t --------------------------------------
@@ -63,7 +77,7 @@ void mem_init(mem_t*mem)
 }
 void mem_clear(mem_t*mem)
 {
-    free(mem->buffer);
+    free(mem->buffer);mem->buffer = 0;
 }
 void mem_destroy(mem_t*mem)
 {
@@ -177,7 +191,7 @@ void ringbuffer_put(ringbuffer_t*r, void*buf, int len)
 void ringbuffer_clear(ringbuffer_t*r)
 {
     ringbuffer_internal_t*i = (ringbuffer_internal_t*)r->internal;
-    free(i->buffer);
+    free(i->buffer);i->buffer = 0;
     free(i);
 }
 
@@ -196,7 +210,7 @@ void string_set(string_t*str, char*text)
 void string_dup2(string_t*str, const char*text, int len)
 {
     str->len = len;
-    str->str = strndup(text, len);
+    str->str = strdup_n(text, len);
 }
 void string_dup(string_t*str, const char*text)
 {
@@ -218,7 +232,7 @@ int string_equals2(string_t*str, string_t*str2)
 }
 char* string_cstr(string_t*str)
 {
-    return strndup(str->str, str->len);
+    return strdup_n(str->str, str->len);
 }
 
 // ------------------------------- stringarray_t ------------------------------