Merge pull request #2088 from willend/main

Debugging fixes, removal of warnings

Author: willend

common/lib/share/mccode-r.c

@@ -2378,9 +2378,8 @@ FILE *siminfo_init(FILE *f)
     siminfo_out("end simulation\n");
 
   }
-  return (siminfo_file);
-
   ); /* MPI_MASTER */
+  return (siminfo_file);
 
 } /* siminfo_init */
 

common/lib/share/read_table-lib.c

@@ -428,7 +428,7 @@ void *Table_File_List_store(t_Table *tab){
       s     = (float*)data;
       dataf = (double*)malloc(sizeof(double)*nelements);
       if (!dataf) {
-	fprintf(stderr, "Could not allocate data block of size %i\n", nelements);
+	fprintf(stderr, "Could not allocate data block of size %ld\n", nelements);
 	exit(-1);
       }
       for (i=0; i<nelements; i++)
@@ -723,7 +723,7 @@ void *Table_File_List_store(t_Table *tab){
       }
       New_Table    = (double*)malloc(Length_Table*Table->columns*sizeof(double));
       if (!New_Table) {
-	fprintf(stderr,"Could not allocate New_Table of size %i x %i\n", Length_Table, Table->columns);
+	fprintf(stderr,"Could not allocate New_Table of size %ld x %ld\n", Length_Table, Table->columns);
 	exit(-1);
       }
       for (i=0; i < Length_Table; i++)

mcstas-comps/samples/PowderN.comp

@@ -304,13 +304,25 @@ struct line_info_struct
       && strcasecmp(ext, "res")) return infile;
 
     OUTFILE = malloc(1024);
-    if (!OUTFILE) return infile;
+    if (!OUTFILE) {
+      free(OUTFILE);
+      return infile;
+    }
     inpath = malloc(1024);
-    if (!inpath) return infile;
+    if (!inpath) {
+      free(OUTFILE);
+      free(inpath);
+      return infile;
+    }
 
     // get input file path from read-table:Open_File
     FILE *f_infile = Open_File(infile, "r", inpath);
-    if (!f_infile) return infile;
+    if (!f_infile) {
+      free(OUTFILE);
+      free(inpath);
+      free(f_infile);
+      return infile;
+    }
     fclose(f_infile);
 
     strncpy(OUTFILE, tmpnam(NULL), 1024); // create an output temporary file name

mcstas-comps/samples/Single_crystal.comp

@@ -413,13 +413,25 @@ struct hkl_data
       && strcasecmp(ext, "res")) return infile;
 
     OUTFILE = malloc(1024);
-    if (!OUTFILE) return infile;
+    if (!OUTFILE) {
+      free(OUTFILE);
+      return infile;
+    }
     inpath = malloc(1024);
-    if (!inpath) return infile;
+    if (!inpath) {
+      free(OUTFILE);
+      free(inpath);
+      return infile;
+    }
 
     // get input file path from read-table:Open_File
     FILE *f_infile = Open_File(infile, "r", inpath);
-    if (!f_infile) return infile;
+    if (!f_infile) {
+      free(OUTFILE);
+      free(inpath);
+      free(f_infile);
+      return infile;
+    }
     fclose(f_infile);
 
     strncpy(OUTFILE, tmpnam(NULL), 1024); // create an output temporary file name