[Getdata-commits] SF.net SVN: getdata:[871] trunk/getdata/test

[<ket...@us...>]

Revision: 871
          http://sourceforge.net/p/getdata/code/871
Author:   ketiltrout
Date:     2013-12-11 22:35:43 +0000 (Wed, 11 Dec 2013)
Log Message:
-----------
Close some memory leaks.

Modified Paths:
--------------
    trunk/getdata/test/alter_clincom.c
    trunk/getdata/test/entry_raw_scalar_code.c
    trunk/getdata/test/entry_raw_scalar_type.c
    trunk/getdata/test/get_linterp_abs.c
    trunk/getdata/test/open_sym_al.c
    trunk/getdata/test/open_sym_at.c
    trunk/getdata/test/open_sym_d.c
    trunk/getdata/test/open_sym_l.c
    trunk/getdata/test/tok_escape.c
    trunk/getdata/test/tok_quote.c

Modified: trunk/getdata/test/alter_clincom.c
===================================================================
--- trunk/getdata/test/alter_clincom.c	2013-12-11 05:04:11 UTC (rev 870)
+++ trunk/getdata/test/alter_clincom.c	2013-12-11 22:35:43 UTC (rev 871)
@@ -80,6 +80,7 @@
   CHECKC(E.EN(lincom,cb)[0], b[0]);
   CHECKC(E.EN(lincom,cb)[1], b[1]);
 #endif
+  gd_free_entry_strings(&E);
 
   gd_discard(D);
 

Modified: trunk/getdata/test/entry_raw_scalar_code.c
===================================================================
--- trunk/getdata/test/entry_raw_scalar_code.c	2013-12-11 05:04:11 UTC (rev 870)
+++ trunk/getdata/test/entry_raw_scalar_code.c	2013-12-11 22:35:43 UTC (rev 871)
@@ -48,7 +48,9 @@
   n = gd_entry(D, "data", &E);
   error = gd_error(D);
   CHECKI(error, 0);
+  CHECKI(E.flags, 0);
   CHECKI(n, 0);
+  gd_free_entry_strings(&E);
 
   gd_discard(D);
   unlink(format);

Modified: trunk/getdata/test/entry_raw_scalar_type.c
===================================================================
--- trunk/getdata/test/entry_raw_scalar_type.c	2013-12-11 05:04:11 UTC (rev 870)
+++ trunk/getdata/test/entry_raw_scalar_type.c	2013-12-11 22:35:43 UTC (rev 871)
@@ -31,7 +31,7 @@
 {
   const char *filedir = "dirfile";
   const char *format = "dirfile/format";
-  const char *format_data = "const RAW UINT32 8\ndata RAW UINT8 const\n";
+  const char *format_data = "const STRING 8\ndata RAW UINT8 const\n";
   int fd, n, error, r = 0;
   DIRFILE *D;
   gd_entry_t E;
@@ -48,7 +48,9 @@
   n = gd_entry(D, "data", &E);
   error = gd_error(D);
   CHECKI(error, 0);
+  CHECKI(E.flags, 0);
   CHECKI(n, 0);
+  gd_free_entry_strings(&E);
 
   gd_discard(D);
   unlink(format);

Modified: trunk/getdata/test/get_linterp_abs.c
===================================================================
--- trunk/getdata/test/get_linterp_abs.c	2013-12-11 05:04:11 UTC (rev 870)
+++ trunk/getdata/test/get_linterp_abs.c	2013-12-11 22:35:43 UTC (rev 871)
@@ -95,6 +95,8 @@
   CHECKI(n, 1);
   CHECKU(c, 10);
 
+  free(cwd);
+
   return r;
 #endif
 }

Modified: trunk/getdata/test/open_sym_al.c
===================================================================
--- trunk/getdata/test/open_sym_al.c	2013-12-11 05:04:11 UTC (rev 870)
+++ trunk/getdata/test/open_sym_al.c	2013-12-11 22:35:43 UTC (rev 871)
@@ -50,6 +50,7 @@
   sprintf(targ, "%s/dirfile/", cwd);
 
   symlink(targ, filedir);
+  free(targ);
 
   D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
   error = gd_error(D);

Modified: trunk/getdata/test/open_sym_at.c
===================================================================
--- trunk/getdata/test/open_sym_at.c	2013-12-11 05:04:11 UTC (rev 870)
+++ trunk/getdata/test/open_sym_at.c	2013-12-11 22:35:43 UTC (rev 871)
@@ -50,6 +50,7 @@
   sprintf(targ, "%s/dirfile", cwd);
 
   symlink(targ, "dirfile/link");
+  free(targ);
 
   D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
   error = gd_error(D);

Modified: trunk/getdata/test/open_sym_d.c
===================================================================
--- trunk/getdata/test/open_sym_d.c	2013-12-11 05:04:11 UTC (rev 870)
+++ trunk/getdata/test/open_sym_d.c	2013-12-11 22:35:43 UTC (rev 871)
@@ -18,6 +18,8 @@
  * along with GetData; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+/* this tests whether _GD_CanonicalPath can deal with bad intermediate
+ * symlinks */
 #include "test.h"
 
 #include <stdlib.h>
@@ -33,7 +35,6 @@
 #else
   const char *link = "dirfile/link";
   const char *filedir = "dirfile/link/dirfile";
-  char *targ;
   int error, r = 0;
   int cwd_size = 2048;
   char *ptr, *cwd = NULL;
@@ -45,23 +46,20 @@
   mkdir("dirfile", 0777);
 
   /* make a bad symlink */
-  targ = (char*)malloc(cwd_size + 8);
-  sprintf(targ, "%s/dirfile", cwd);
-
   symlink("non_existent", link);
 
-  /* this tests whether _GD_CanonicalPath can deal with bad intermediate
-   * symlinks */
   D = gd_open(filedir, GD_RDONLY);
   error = gd_error(D);
   ptr = gd_error_string(D, NULL, 0);
+  CHECKI(error, GD_E_OPEN);
+  CHECKEOS(ptr, "dirfile/non_existent/dirfile");
+  free(ptr);
+
   gd_discard(D);
 
   unlink(link);
   rmdir("dirfile");
 
-  CHECKI(error, GD_E_OPEN);
-  CHECKEOS(ptr, "dirfile/non_existent/dirfile");
   free(cwd);
   return r;
 #endif

Modified: trunk/getdata/test/open_sym_l.c
===================================================================
--- trunk/getdata/test/open_sym_l.c	2013-12-11 05:04:11 UTC (rev 870)
+++ trunk/getdata/test/open_sym_l.c	2013-12-11 22:35:43 UTC (rev 871)
@@ -18,6 +18,7 @@
  * along with GetData; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+/* this tests whether _GD_CanonicalPath can deal with symlink loops */
 #include "test.h"
 
 #include <stdlib.h>
@@ -34,7 +35,6 @@
 #else
   const char *link = "dirfile/link";
   const char *filedir = "dirfile/link/dirfile";
-  char *targ;
   int error, r = 0;
   int cwd_size = 2048;
   char *ptr, *cwd = NULL;
@@ -46,12 +46,8 @@
   mkdir("dirfile", 0777);
 
   /* make a bad symlink */
-  targ = (char*)malloc(cwd_size + 8);
-  sprintf(targ, "%s/dirfile", cwd);
-
   symlink("link", link);
 
-  /* this tests whether _GD_CanonicalPath can deal with symlink loops */
   D = gd_open(filedir, GD_RDONLY);
   error = gd_error(D);
   gd_discard(D);

Modified: trunk/getdata/test/tok_escape.c
===================================================================
--- trunk/getdata/test/tok_escape.c	2013-12-11 05:04:11 UTC (rev 870)
+++ trunk/getdata/test/tok_escape.c	2013-12-11 22:35:43 UTC (rev 871)
@@ -18,7 +18,6 @@
  * along with GetData; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* Parser check */
 #include "test.h"
 
 #include <stdlib.h>
@@ -41,29 +40,35 @@
 
   D = gd_open(filedir, GD_RDWR | GD_CREAT | GD_EXCL | GD_VERBOSE);
   e1 = gd_error(D);
+  CHECKI(e1,GD_E_OK);
 
   tok1 = gd_strtok(D, spec);
   e2 = gd_error(D);
+  CHECKI(e2,GD_E_OK);
+  CHECKS(tok1,"string");
+  free(tok1);
+
   tok2 = gd_strtok(D, NULL);
   e3 = gd_error(D);
+  CHECKI(e3,GD_E_OK);
+  CHECKS(tok2,"STRING");
+  free(tok2);
+
   tok3 = gd_strtok(D, NULL);
   e4 = gd_error(D);
+  CHECKI(e4,GD_E_OK);
+  CHECKS(tok3," value");
+  free(tok3);
+
   tok4 = gd_strtok(D, NULL);
   e5 = gd_error(D);
+  CHECKI(e5,GD_E_OK);
+  CHECKP(tok4);
 
   gd_discard(D);
 
   unlink(format);
   rmdir(filedir);
 
-  CHECKI(e1,GD_E_OK);
-  CHECKI(e2,GD_E_OK);
-  CHECKI(e3,GD_E_OK);
-  CHECKI(e4,GD_E_OK);
-  CHECKI(e5,GD_E_OK);
-  CHECKS(tok1,"string");
-  CHECKS(tok2,"STRING");
-  CHECKS(tok3," value");
-  CHECKP(tok4);
   return r;
 }

Modified: trunk/getdata/test/tok_quote.c
===================================================================
--- trunk/getdata/test/tok_quote.c	2013-12-11 05:04:11 UTC (rev 870)
+++ trunk/getdata/test/tok_quote.c	2013-12-11 22:35:43 UTC (rev 871)
@@ -18,7 +18,6 @@
  * along with GetData; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* Parser check */
 #include "test.h"
 
 #include <stdlib.h>
@@ -41,29 +40,35 @@
 
   D = gd_open(filedir, GD_RDWR | GD_CREAT | GD_EXCL | GD_VERBOSE);
   e1 = gd_error(D);
+  CHECKI(e1,GD_E_OK);
 
   tok1 = gd_strtok(D, spec);
   e2 = gd_error(D);
+  CHECKI(e2,GD_E_OK);
+  CHECKS(tok1,"string");
+  free(tok1);
+
   tok2 = gd_strtok(D, NULL);
   e3 = gd_error(D);
+  CHECKI(e3,GD_E_OK);
+  CHECKS(tok2,"STRING");
+  free(tok2);
+
   tok3 = gd_strtok(D, NULL);
   e4 = gd_error(D);
+  CHECKI(e4,GD_E_OK);
+  CHECKS(tok3,"value");
+  free(tok3);
+
   tok4 = gd_strtok(D, NULL);
   e5 = gd_error(D);
+  CHECKI(e5,GD_E_OK);
+  CHECKP(tok4);
 
   gd_discard(D);
 
   unlink(format);
   rmdir(filedir);
 
-  CHECKI(e1,GD_E_OK);
-  CHECKI(e2,GD_E_OK);
-  CHECKI(e3,GD_E_OK);
-  CHECKI(e4,GD_E_OK);
-  CHECKI(e5,GD_E_OK);
-  CHECKS(tok1,"string");
-  CHECKS(tok2,"STRING");
-  CHECKS(tok3,"value");
-  CHECKP(tok4);
   return r;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.