Vector fix (#73)

* Fix qvector->clear()

* Add examples/vector.c

Co-authored-by: Steve <[email protected]>

examples/Makefile.in

@@ -40,9 +40,9 @@ CPPFLAGS	= @CPPFLAGS@ -I${QLIBC_INCDIR}
 RM		= @RM@
 DEPLIBS		= @DEPLIBS@
 
-TARGETS1	= list listtbl hashtbl hasharr grow grow_obj queue stack \
-			  config apacheconf
-TARGETS2	= list listtbl hashtbl hasharr grow grow_obj queue stack
+TARGETS1	= list listtbl hashtbl hasharr grow grow_obj queue stack vector \
+		  config apacheconf
+TARGETS2	= list listtbl hashtbl hasharr grow grow_obj queue stack vector
 TARGETS		= ${@EXAMPLES_TARGETS@}
 LIBQLIBC	= ${QLIBC_LIBDIR}/libqlibc.a ${DEPLIBS}
 LIBQLIBCEXT	= ${QLIBC_LIBDIR}/libqlibcext.a
@@ -74,6 +74,9 @@ queue: queue.o
 stack: stack.o
 	${CC} ${CFLAGS} ${CPPFLAGS} -o $@ stack.o ${LIBQLIBC}
 
+vector: vector.o
+	${CC} ${CFLAGS} ${CPPFLAGS} -o $@ vector.o ${LIBQLIBC}
+
 config: config.o
 	${CC} ${CFLAGS} ${CPPFLAGS} -o $@ config.o ${LIBQLIBCEXT} ${LIBQLIBC}
 

examples/vector.c

@@ -0,0 +1,54 @@
+/******************************************************************************
+ * qLibc
+ *
+ * Copyright (c) 2010-2015 Seungyoung Kim.
+ * 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 OWNER 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 <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include "qlibc.h"
+
+int main(void) {
+    // create a vector
+    qvector_t *v = qvector(10, sizeof(int), 0);
+
+    int d = 1;
+    v->addfirst(v, &d);
+    v->addlast(v, &d);
+    v->addat(v, 0, &d);
+
+    // empty
+    v->clear(v);
+
+    v->addlast(v, &d);
+    v->addlast(v, &d);
+    v->addlast(v, &d);
+
+    // release
+    v->free(v);
+
+    return 0;
+}

src/containers/qvector.c

@@ -674,11 +674,7 @@ void qvector_unlock(qvector_t *vector) {
  */
 void qvector_clear(qvector_t *vector) {
     vector->lock(vector);
-    free(vector->data);
-    vector->data = NULL;
     vector->num = 0;
-    vector->objsize = 0;
-    vector->max = 0;
     vector->unlock(vector);
 }