fixed some memory problems, more progress towards nc_inq_path

libdispatch/copy.c

@@ -127,17 +127,26 @@ NC_rec_find_nc_type(int ncid1, nc_type tid1, int ncid2, nc_type* tid2)
    int* ids = NULL;
 
    /* Get all types in grp ncid2 */
-   if(tid2) *tid2 = 0;
-   ret = nc_inq_typeids(ncid2,&nids,NULL);
-   if(ret) return ret;
-   ids = (int*)malloc(nids*sizeof(int));
-   if(ids == NULL) return NC_ENOMEM;
-   ret = nc_inq_typeids(ncid2,&nids,ids);
-   if(ret) return ret;
-   for(i=0;i<nids;i++) {
+   if(tid2) 
+      *tid2 = 0;
+   if ((ret = nc_inq_typeids(ncid2, &nids, NULL)))
+      return ret;
+   if (!(ids = (int *)malloc(nids * sizeof(int))))
+      return NC_ENOMEM;
+   if ((ret = nc_inq_typeids(ncid2, &nids, ids)))
+      return ret;
+   for(i = 0; i < nids; i++) 
+   {
       int equal = 0;
-      ret = NC_compare_nc_types(ncid1,tid1,ncid2,ids[i],&equal);
-      if(equal) {if(tid2) *tid2 = ids[i]; return NC_NOERR;}
+      if ((ret = NC_compare_nc_types(ncid1, tid1, ncid2, ids[i], &equal)))
+	 return ret;
+      if(equal) 
+      {
+	 if(tid2) 
+	    *tid2 = ids[i]; 
+	 free(ids);
+	 return NC_NOERR;
+      }
    }
    free(ids);
 

libdispatch/file.c

@@ -318,8 +318,7 @@ nc_inq_path(int ncid, size_t *pathlen, char *path)
 
    if ((stat = NC_check_id(ncid, &ncp)))
       return stat;
-
-   return NC_NOERR;
+   return ncp->dispatch->inq_path(ncid, pathlen, path);
 }
 
 int

libsrc/Makefile.am

@@ -31,10 +31,10 @@ netcdf.3: $(top_srcdir)/man4/netcdf.m4
 	m4 $(M4FLAGS) $(ARGS_MANPAGE) $? >$@  || rm $@
 
 # These files are part of the netCDF-3 library.
-libnetcdf3_la_SOURCES = nc.h string.c v1hpg.c fbits.h ncio.h	\
-onstack.h rnd.h utf8proc.c utf8proc.h utf8proc_data.h nclistmgr.c	\
-putget.m4 attr.m4 nc3dispatch.c nc3dispatch.h nc.c var.c dim.c ncx.m4	\
-ncx.h lookup3.c pstdint.h
+libnetcdf3_la_SOURCES = nc.h string.c v1hpg.c fbits.h ncio.h onstack.h	\
+rnd.h utf8proc.c utf8proc.h utf8proc_data.h nclistmgr.c putget.m4	\
+attr.m4 nc3dispatch.c nc3dispatch.h nc.c var.c dim.c ncx.m4 ncx.h	\
+lookup3.c pstdint.h
 
 # Does the user want to use ffio or posixio?
 if USE_FFIO

libsrc/nc.c

@@ -43,6 +43,8 @@ free_NC(NC *ncp)
 {
 	if(ncp == NULL)
 		return;
+/*	if (ncp->path)
+	free(ncp->path);*/
 	free_NC_dimarrayV(&ncp->dims);
 	free_NC_attrarrayV(&ncp->attrs);
 	free_NC_vararrayV(&ncp->vars);
@@ -869,7 +871,7 @@ void dispatch_free_NC(NC *ncp) {free_NC(ncp);}
 
 /* WARNING: SIGNATURE CHANGE */
 int
-NC3_create(const char * path, int ioflags,
+NC3_create(const char *path, int ioflags,
 		size_t initialsz, int basepe,
 		size_t *chunksizehintp,
 		int use_parallel, void* parameters,
@@ -888,6 +890,13 @@ NC3_create(const char * path, int ioflags,
 	if(ncp == NULL)
 		return NC_ENOMEM;
 
+/* 	if (path) */
+/* 	{ */
+/* 	   if (!(ncp->path = malloc(strlen(path)))) */
+/* 	      return NC_ENOMEM; */
+/* 	   strcpy(ncp->path, path); */
+/* 	} */
+
 #if defined(LOCKNUMREC) /* && _CRAYMPP */
 	if (status = NC_init_pe(ncp, basepe)) {
 		return status;
@@ -1007,6 +1016,14 @@ NC3_open(const char * path, int ioflags,
 	if(ncp == NULL)
 		return NC_ENOMEM;
 
+	/* Keep a copy of the path. */
+/* 	if (path) */
+/* 	{ */
+/* 	   if (!(ncp->path = malloc(strlen(path)))) */
+/* 	      return NC_ENOMEM; */
+/* 	   strcpy(ncp->path, path); */
+/* 	} */
+
 #if defined(LOCKNUMREC) /* && _CRAYMPP */
 	if (status = NC_init_pe(ncp, basepe)) {
 		return status;
@@ -1499,7 +1516,17 @@ NC3_inq_type(int ncid, nc_type typeid, char *name, size_t *size)
 int
 NC3_inq_path(int ncid, size_t *pathlen, char *path)
 {
+/*    int status; */
+/*    NC *ncp; */
 
+/*    if ((status = NC_check_id(ncid, &ncp))) */
+/*       return status; */
+
+/*    if (pathlen) */
+/*       *pathlen = strlen(ncp->path); */
+/*    if (path) */
+/*       strcpy(path, ncp->path); */
+   
    return NC_NOERR;
 }
 

libsrc4/nc4file.c

@@ -2603,6 +2603,10 @@ close_netcdf4_file(NC_HDF5_FILE_INFO_T *h5, int abort)
 	return NC_EHDFERR;	 */
    }
 
+   /* Delete the memory for the path, if it's been allocated. */
+   if (h5->path)
+      free(h5->path);
+
    /* Free the nc4_info struct. */
    free(h5);
    return NC_NOERR;

libsrc4/nc4internal.c

@@ -617,11 +617,6 @@ nc4_file_list_add(NC_FILE_INFO_T** ncp)
 void
 nc4_file_list_del(NC_FILE_INFO_T *nc)
 {
-   /* Delete the memory for the path, if it's been allocated. */
-   if (nc->nc4_info)
-      if (nc->nc4_info->path)
-	 free(nc->nc4_info->path);
-
    /* Remove file from master list. */
    del_from_NCList((NC *)nc);
    free(nc);
@@ -975,6 +970,11 @@ var_list_del(NC_VAR_INFO_T **list, NC_VAR_INFO_T *var)
       if (var->type_info->close_hdf_typeid || var->xtype == NC_STRING)
 	 if ((H5Tclose(var->type_info->hdf_typeid)) < 0)
 	    return NC_EHDFERR;
+
+      /* Free the name. */
+      if (var->type_info->name)
+	 free(var->type_info->name);
+
       free(var->type_info);
    }
    

nc_test4/run_valgrind_tests.sh

@@ -10,10 +10,10 @@ echo "Testing programs with valgrind..."
 
 # These are my test programs.
 list='tst_v2 '\
-'tst_vars2 tst_atts tst_atts2 tst_h_vl2'
+'tst_vars2 tst_atts tst_atts2 '
 
 # These don't work yet: tst_h_vars3 
-# tst_h_strings tst_h_atts3 tst_h_vars2 tst_vars tst_fills tst_chunks
+# tst_h_vl2 tst_h_strings tst_h_atts3 tst_h_vars2 tst_vars tst_fills tst_chunks
 # tst_coords tst_xplatform2
 
 for tst in $list; do