Cleanup, added voids to functions without parameters, removed unused variables.

Author: jaakkojulin

gitwatcher/git.c.in

@@ -8,27 +8,27 @@
 #define FALSE 0
 #endif
 
-int git_populated() {
+int git_populated(void) {
     return @GIT_RETRIEVED_STATE@;
 }
 
-int git_dirty() {
+int git_dirty(void) {
     return @GIT_IS_DIRTY@;
 }
 
-const char *git_commit_sha1() {
+const char *git_commit_sha1(void) {
     return "@GIT_HEAD_SHA1@";
 }
 
-const char *git_commit_date() {
+const char *git_commit_date(void) {
     return "@GIT_COMMIT_DATE_ISO8601@";
 }
 
-const char *git_describe() {
+const char *git_describe(void) {
     return "@GIT_DESCRIBE@";
 }
 
-const char *git_branch() {
+const char *git_branch(void) {
     return "@GIT_BRANCH@";
 }
 

gitwatcher/git.h

@@ -1,10 +1,10 @@
 #ifndef JABS_GIT_H
 #define JABS_GIT_H
 
-int git_populated();
-int git_dirty();
-const char *git_commit_sha1();
-const char *git_commit_date();
-const char *git_describe();
-const char *git_branch();
+int git_populated(void);
+int git_dirty(void);
+const char *git_commit_sha1(void);
+const char *git_commit_date(void);
+const char *git_describe(void);
+const char *git_branch(void);
 #endif //JABS_GIT_H

src/aperture.c

@@ -15,7 +15,7 @@ void aperture_free(aperture *a) {
     free(a);
 }
 
-aperture *aperture_default() {
+aperture *aperture_default(void) {
     aperture *a = malloc(sizeof(aperture));
     a->type = APERTURE_NONE;
     a->width = 0.0;

src/aperture.h

@@ -42,7 +42,7 @@ typedef struct aperture {
 } aperture;
 
 const char *aperture_name(const aperture *a);
-aperture *aperture_default();
+aperture *aperture_default(void);
 aperture *aperture_clone(const aperture *a_orig);
 void aperture_free(aperture *a);
 double aperture_width_shape_product(const aperture *a, char direction);

src/brick.c

@@ -35,15 +35,11 @@ void bricks_convolute(jabs_histogram *h, const calibration *c, const brick *bric
             continue;
         }
         const brick *b_high = &bricks[i-1];
-        double E_high, E_low, E_cutoff_low, E_cutoff_high; /* Lower energy edge of brick, Low energy cutoff (gaussian), High energy cutoff (gaussian) */
+        double E_cutoff_low, E_cutoff_high; /* Low energy cutoff (gaussian), High energy cutoff (gaussian) */
         if(b_low->E < b_high->E) { /* Detected energy increasing as brick number increases */
-            E_low = b_low->E;
-            E_high = b_high->E;
             E_cutoff_low = b_low->E - b_low->S_sum * sigmas_cutoff;
             E_cutoff_high = b_high->E + b_high->S_sum * sigmas_cutoff;
         } else { /* Energy decreasing as brick number increases */
-            E_low = b_high->E;
-            E_high = b_low->E;
             E_cutoff_low = b_high->E - b_high->S_sum * sigmas_cutoff;
             E_cutoff_high = b_low->E + b_low->S_sum * sigmas_cutoff;
         }

src/calibration.c

@@ -12,7 +12,7 @@
 
 extern inline double calibration_eval(const calibration *c, size_t ch);
 
-calibration *calibration_init() {
+calibration *calibration_init(void) {
     calibration *c = calloc(1, sizeof(calibration));
     if(!c)
         return NULL;
@@ -53,7 +53,7 @@ void calibration_free(calibration *c) {
     free(c);
 }
 
-calibration *calibration_init_linear() {
+calibration *calibration_init_linear(void) {
     calibration *c = calibration_init();
     if(!c)
         return NULL;

src/calibration.h

@@ -59,10 +59,10 @@ typedef struct calibration_params_poly {
     double *a; /* Array, size n+1, polynomial is f(x) = a[0] + a[1] * x + a[2] * x^2 + ... + a[n] * x^n */
 } calibration_params_poly;
 
-calibration *calibration_init();
+calibration *calibration_init(void);
 void calibration_free(calibration *c);
 calibration *calibration_clone(const calibration *c_orig);
-calibration *calibration_init_linear();
+calibration *calibration_init_linear(void);
 calibration *calibration_init_poly(size_t n); /* n is the degree of the polynomial */
 double calibration_linear(const void *params, size_t x);
 double calibration_poly(const void *params, size_t x);

src/fit.c

@@ -783,7 +783,7 @@ size_t fit_data_ranges_calculate_number_of_channels(const struct fit_data *fit_d
     return sum;
 }
 
-struct fit_stats fit_stats_init() {
+struct fit_stats fit_stats_init(void) {
     struct fit_stats s;
     s.n_evals = 0;
     s.n_evals_iter = 0;

src/fit.h

@@ -145,7 +145,7 @@ void fit_data_spectra_free(fit_data *fit);
 int fit_data_add_det(struct fit_data *fit, detector *det);
 fit_data_det *fit_data_fdd(const fit_data *fit, size_t i_det);
 size_t fit_data_ranges_calculate_number_of_channels(const struct fit_data *fit_data);
-struct fit_stats fit_stats_init();
+struct fit_stats fit_stats_init(void);
 int fit(fit_data *fit);
 void fit_covar_print(const gsl_matrix *covar, jabs_msg_level msg_level);
 int fit_parameters_set_from_vector(struct fit_data *fit, const gsl_vector *x); /* Updates values in fit params as they are varied by the fit algorithm. */

src/fit_params.c

@@ -10,7 +10,7 @@
 #include "jibal_generic.h"
 
 
-fit_params *fit_params_new() {
+fit_params *fit_params_new(void) {
     fit_params *p = malloc(sizeof(fit_params));
     p->n = 0;
     p->n_active = 0;

src/fit_params.h

@@ -22,7 +22,7 @@ typedef struct fit_params {
     fit_variable *vars; /* Note that this is NOT an array of pointers. It has n elements. */
 } fit_params;
 
-fit_params *fit_params_new();
+fit_params *fit_params_new(void);
 void fit_params_free(fit_params *p);
 int fit_params_add_parameter(fit_params *p, fit_variable_type type, double *value, const char *name, const char *unit, double unit_factor, size_t i_det);  /* Pointer to parameter to be fitted (value) is accessed during fitting (read, write). No guarantees that it stays accessible after the fit is over and user decides to change something! */
 int fit_params_update(fit_params *p);

src/generic.c

@@ -309,7 +309,7 @@ int jabs_unit_sanity_check(double value, int type) {
 }
 
 
-double jabs_clock() {
+double jabs_clock(void) {
 #ifdef _OPENMP
     return omp_get_wtime();
 #else

src/generic.h

@@ -40,5 +40,5 @@ const char *jabs_file_extension_const(const char *filename);
 int jabs_unit_convert(const jibal_units *units, char type, const char *str, double *out); /* Wrapper for jibal_unit_convert with error reporting using jabs_message and sanity checker (jabs_unit_sanity_check()). Negative values are errors that should not be ignored. */
 int jabs_unit_sanity_check(double value, int type); /* returns 1 if no issue was found, returns 0 and prints a warning via jabs_message() if value is suspicious, and returns -1 for really crazy stuff */
 int jabs_str_to_size_t(const char *str, size_t *out);
-double jabs_clock();
+double jabs_clock(void);
 #endif //JABS_GENERIC_H

src/options.c

@@ -26,18 +26,18 @@
 
 #define USAGE_STRING "Usage: jabs [OPTION [<argument>]] [OPTION2 ...] ... [<FILE> [<FILE2>] ...] | \n\nRun without arguments or \"-i\" to use JaBS interactively.\n\nExample: jabs example.jbs\n"
 
-const char *jabs_version() {
+const char *jabs_version(void) {
     if(git_populated()) {
         return git_describe();
     }
     return jabs_version_simple();
 }
 
-const char *jabs_version_simple() {
+const char *jabs_version_simple(void) {
     return jabs_VERSION;
 }
 
-void usage() {
+void usage(void) {
     fprintf(stderr, USAGE_STRING);
 }
 
@@ -115,7 +115,7 @@ void read_options(cmdline_options *cmd_opt, int *argc, char *const **argv) {
     *argv += optind;
 }
 
-cmdline_options *cmdline_options_init() {
+cmdline_options *cmdline_options_init(void) {
     cmdline_options *cmd_opt = malloc(sizeof(cmdline_options));
     memset(cmd_opt, 0, sizeof(cmdline_options)); /* Everything not listed below are zero or NULL by default */
     cmd_opt->verbose = JABS_DEFAULT_VERBOSITY;

src/options.h

@@ -25,11 +25,11 @@ typedef struct {
 #include "simulation.h"
 
 void read_options(cmdline_options *cmd_opt, int *argc, char *const **argv);
-cmdline_options *cmdline_options_init();
+cmdline_options *cmdline_options_init(void);
 void cmdline_options_free(cmdline_options *cmd_opt);
-const char *jabs_version(); /* Returns "git describe" given version, fallback to jabs_version_simple() */
-const char *jabs_version_simple(); /* Returns directly the CMake project version */
-void usage();
+const char *jabs_version(void); /* Returns "git describe" given version, fallback to jabs_version_simple() */
+const char *jabs_version_simple(void); /* Returns directly the CMake project version */
+void usage(void);
 void greeting(int interactive);
 
 #endif // JABS_OPTIONS_H

src/plugin.c

@@ -18,9 +18,9 @@
 #include "generic.h"
 
 jabs_plugin *jabs_plugin_open(const char *filename) {
-    jabs_plugin_type (*typef)();
-    const char *(*namef)();
-    const char *(*versionf)();
+    jabs_plugin_type (*typef)(void);
+    const char *(*namef)(void);
+    const char *(*versionf)(void);
     if(!filename) {
         return NULL;
     }
@@ -34,9 +34,9 @@ jabs_plugin *jabs_plugin_open(const char *filename) {
     }
     plugin->handle = handle;
     plugin->filename = strdup(filename);
-    namef = (const char *(*)()) dlsym(handle, "name");
-    versionf = (const char *(*)()) dlsym(handle, "version");
-    typef = (jabs_plugin_type (*)()) dlsym(handle, "type");
+    namef = (const char *(*)(void)) dlsym(handle, "name");
+    versionf = (const char *(*)(void)) dlsym(handle, "version");
+    typef = (jabs_plugin_type (*)(void)) dlsym(handle, "type");
     if(!namef || !versionf || !typef) {
         DEBUGSTR("Plugin does not have name or version symbol.");
         jabs_plugin_close(plugin);

src/sample.c

@@ -620,9 +620,7 @@ sample_model *sample_model_from_file(const jibal *jibal, const char *filename) {
                 r->rough.model = ROUGHNESS_NONE;
                 roughness_reset(&r->rough);
                 sm->n_ranges++;
-#ifdef DEBUG
-                fprintf(stderr, "Sample from file: NEW POINT, n = %zu, n_ranges = %zu, n_materials=%zu\n", n, sm->n_ranges, sm->n_materials);
-#endif
+                DEBUGMSG("Sample from file: NEW POINT, n = %zu, n_ranges = %zu, n_materials=%zu", n, sm->n_ranges, sm->n_materials);
                 i_material = 0;
                 /* TODO: invalidate layer if not loaded properly */
             }
@@ -658,6 +656,9 @@ sample_model *sample_model_from_file(const jibal *jibal, const char *filename) {
         headers = 0;
     }
     free(line);
+    fclose(in);
+    jabs_message(MSG_VERBOSE, "Read %zu lines from \"%s\": got %zu ranges.\n", lineno, filename, sm->n_ranges);
+
     for(size_t i_range = 0; i_range < sm->n_ranges; i_range++) { /* Set defaults (roughness model) for roughness. */
         sample_range *r = &sm->ranges[i_range];
         if(r->rough.x > ROUGH_TOLERANCE) {

src/script_command.c

@@ -262,14 +262,13 @@ script_command_status script_fit(script_session *s, int argc, char *const *argv)
 }
 
 script_command_status script_save_simulation(script_session *s, int argc, char *const *argv) {
-    size_t i_det = 0;
     struct fit_data *fit = s->fit;
     const int argc_orig = argc;
     if(argc < 1) {
         jabs_message(MSG_ERROR, "Usage: save simulation <file>\n");
         return SCRIPT_COMMAND_FAILURE;
     }
-    if(simulation2idf(s->fit, argv[0])) {
+    if(simulation2idf(fit, argv[0])) {
         jabs_message(MSG_ERROR, "Could not save simulation to file %s.", argv[0]);
         return SCRIPT_COMMAND_FAILURE;
     }

src/simulation2idf.c

@@ -73,7 +73,7 @@ int simulation2idf(const struct fit_data *fit, const char *filename) {
     return EXIT_SUCCESS;
 }
 
-xmlNodePtr simulation2idf_notes() {
+xmlNodePtr simulation2idf_notes(void) {
     xmlNodePtr notes = xmlNewNode(NULL, BAD_CAST "notes");
     xmlNodePtr note = xmlNewChild(notes, NULL, BAD_CAST "note", NULL);
 
@@ -160,7 +160,7 @@ xmlNodePtr simulation2idf_spectra(const struct fit_data *fit) {
         xmlNodePtr spectrum = xmlNewNode(NULL, BAD_CAST "spectrum");
         xmlAddChild(spectrum, simulation2idf_beam(fit->sim));
         xmlAddChild(spectrum, simulation2idf_geometry(fit->sim, det));
-        xmlAddChild(spectrum, simulation2idf_detection(fit->sim, det));
+        xmlAddChild(spectrum, simulation2idf_detection(det));
         xmlAddChild(spectrum, simulation2idf_calibrations(fit->jibal->elements, fit->sim, det));
         xmlAddChild(spectrum, simulation2idf_reactions(fit->sim, det));
         if(i_det < fit->n_det_spectra) {
@@ -216,7 +216,7 @@ xmlNodePtr simulation2idf_geometry(const simulation *sim, const detector *det) {
     return geometry;
 }
 
-xmlNodePtr simulation2idf_detection(const simulation *sim, const detector *det) {
+xmlNodePtr simulation2idf_detection(const detector *det) {
     xmlNodePtr detection = xmlNewNode(NULL, BAD_CAST "detection");
     xmlNodePtr detector = xmlNewChild(detection, NULL, BAD_CAST "detector", NULL);
     char *detectortype = NULL;
@@ -260,7 +260,6 @@ xmlNodePtr simulation2idf_detection(const simulation *sim, const detector *det)
 xmlNodePtr simulation2idf_calibrations(const jibal_element *elements, const simulation *sim, const detector *det) {
     xmlNodePtr calibrations = xmlNewNode(NULL, BAD_CAST "calibrations");
     xmlNodePtr detectorresolutions = xmlNewChild(calibrations, NULL, BAD_CAST "detectorresolutions", NULL);
-    xmlNodePtr detectorresolution = simulation2idf_detectorresolution(det, det->calibration, NULL);
     xmlNodePtr energycalibrations = xmlNewChild(calibrations, NULL, BAD_CAST "energycalibrations", NULL);
     xmlAddChild(energycalibrations, simulation2idf_energycalibration(det, det->calibration, NULL));
     for(int Z = 0; Z <= det->cal_Z_max; Z++) {

src/simulation2idf.h

@@ -19,15 +19,15 @@
 #include <libxml/parser.h>
 
 int simulation2idf(const struct fit_data *fit, const char *filename);
-xmlNodePtr simulation2idf_notes();
+xmlNodePtr simulation2idf_notes(void);
 xmlNodePtr simulation2idf_attributes(const char *filename);
 xmlNodePtr simulation2idf_elementsandmolecules(const sample_model *sm);
 xmlNodePtr simulation2idf_structure(const sample_model *sm);
 xmlNodePtr simulation2idf_layers(const sample_model *sm);
 xmlNodePtr simulation2idf_spectra(const struct fit_data *fit);
 xmlNodePtr simulation2idf_beam(const simulation *sim);
 xmlNodePtr simulation2idf_geometry(const simulation *sim, const detector *det);
-xmlNodePtr simulation2idf_detection(const simulation *sim, const detector *det);
+xmlNodePtr simulation2idf_detection(const detector *det);
 xmlNodePtr simulation2idf_calibrations(const jibal_element *elements, const simulation *sim, const detector *det);
 xmlNodePtr simulation2idf_detectorresolution(const detector *det, const calibration *cal, const char  *ion_name);
 xmlNodePtr simulation2idf_energycalibration(const detector *det, const calibration *cal, const char *ion_name);