begin work on making xdifile Valgrind-clean

Author: bruceravel

c/Makefile.in

@@ -20,7 +20,7 @@ includedir = @includedir@
 # you may have to alter these settings
 #---------------------------------
 
-CCOPTS = -fPIC
+CCOPTS = -fPIC -g
 ## CCOPTS =  -arch i386 -arch x86_64
 
 # you shouldn't have to alter anything below this line

c/xdi_reader.c

@@ -82,6 +82,6 @@ int main(int argc, char **argv) {
     }
     printf("\n");
   }
-  free(xdifile);
+  XDI_cleanup(xdifile);
   return 0;
 }

c/xdifile.c

@@ -356,7 +356,7 @@ XDI_readfile(char *filename, XDIFile *xdifile) {
   for (i = nheader-2; i <= ilen; i++) {
     /* may find a header line interspersed in array data */
     COPY_STRING(line, textlines[i]);
-    xdifile->error_lineno = i; 
+    xdifile->error_lineno = i;
     COPY_STRING(xdifile->error_line, line);
 
     if (strncmp(textlines[i], TOK_COMM, 1) == 0)  {
@@ -426,3 +426,47 @@ _EXPORT(int) XDI_get_array_name(XDIFile *xdifile, char *name, double *out) {
   }
   return ERR_NOARR_NAME;
 }
+
+_EXPORT(void) XDI_cleanup(XDIFile *xdifile) {
+  /* one needs to explicitly free each part of the struct */
+  long j;
+  for (j = 0; j < xdifile->narrays; j++) {
+    free(xdifile->array[j]);
+    free(xdifile->array_labels[j]);
+    free(xdifile->array_units[j]);
+  }
+  free(xdifile->array);
+  free(xdifile->array_labels);
+  free(xdifile->array_units);
+
+  free(xdifile->xdi_libversion);
+  free(xdifile->xdi_version);
+  free(xdifile->extra_version);
+  free(xdifile->filename);
+  free(xdifile->element);
+  free(xdifile->edge);
+  free(xdifile->comments);
+  free(xdifile->error_line);
+
+  for (j = 0; j < xdifile->nmetadata; j++) {
+    free(xdifile->meta_families[j]);
+    free(xdifile->meta_keywords[j]);
+    free(xdifile->meta_values[j]);
+  }
+  free(xdifile->meta_families);
+  free(xdifile->meta_keywords);
+  free(xdifile->meta_values);
+
+  free(xdifile->outer_label);
+  /* for (j = 0; j < xdifile->nouter; j++) { */
+  /*   free(xdifile->outer_array[j]); */
+  /*   free(xdifile->outer_breakpts[j]); */
+  /* } */
+  free(xdifile->outer_array);
+  free(xdifile->outer_breakpts);
+
+
+
+
+  free(xdifile);
+}

c/xdifile.h

@@ -14,7 +14,7 @@ typedef struct {
   long npts;             /* number of data points for all arrays */
   long narray_labels;    /* number of labeled arrays (may be < narrays) */
   long nouter;           /* number of points in outer scan */
-  long error_lineno;    /* line numberfor any existing error */
+  long error_lineno;     /* line numberfor any existing error */
   double dspacing;       /* monochromator d spacing */
   char *xdi_libversion;  /* XDI version of library */
   char *xdi_version;     /* XDI version string from file*/
@@ -39,6 +39,7 @@ typedef struct {
 _EXPORT(int) XDI_readfile(char *filename, XDIFile *xdifile) ;
 _EXPORT(int) XDI_get_array_index(XDIFile *xdifile, long n, double *out);
 _EXPORT(int) XDI_get_array_name(XDIFile *xdifile, char *name, double *out);
+_EXPORT(void) XDI_cleanup(XDIFile *xdifile) ;
 
 
 /* Tokens used in XDI File */