Fix various compiler warnings.

mittinatten · Sep 9, 2023 · 98690ef · 98690ef
1 parent ae84194
commit 98690ef
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 29 deletions.
diff --git a/src/main.cc b/src/main.cc
@@ -335,7 +335,7 @@ run_analysis(std::vector<freesasa_structure *> structures,
     for (auto structure : structures) {
         strcpy(name_i, name);
         if (structures.size() > 1 && (state->structure_options & FREESASA_SEPARATE_MODELS))
-            sprintf(name_i + strlen(name_i), ":%d", freesasa_structure_model(structure));
+            snprintf(name_i + strlen(name_i), 9, ":%d", freesasa_structure_model(structure));
 
         tmp_tree = freesasa_calc_tree(structure, &state->parameters, name_i);
         if (tmp_tree == NULL) abort_msg("can't calculate SASA");

diff --git a/src/structure.c b/src/structure.c
@@ -100,7 +100,7 @@ atom_free(struct atom *a)
 }
 
 struct atoms
-atoms_init()
+atoms_init(void)
 {
     struct atoms atoms;
     atoms.n = 0;
@@ -237,7 +237,7 @@ atom_new_from_line(const char *line,
 }
 
 static struct residues
-residues_init()
+residues_init(void)
 {
     struct residues res;
 
@@ -301,7 +301,7 @@ residues_dealloc(struct residues *residues)
 }
 
 static struct chains
-chains_init()
+chains_init(void)
 {
     struct chains ch;
 

diff --git a/tests/test_classifier.c b/tests/test_classifier.c
@@ -475,9 +475,9 @@ START_TEST(test_memerr)
 END_TEST
 
 
-extern TCase *test_classifier_static();
+extern TCase *test_classifier_static(void);
 
-Suite *classifier_suite()
+Suite *classifier_suite(void)
 {
     Suite *s = suite_create("Classify");
     TCase *tc_core = tcase_create("Core");

diff --git a/tests/test_coord.c b/tests/test_coord.c
@@ -111,7 +111,7 @@ START_TEST(test_memerr)
 }
 END_TEST
 
-Suite *coord_suite()
+Suite *coord_suite(void)
 {
     Suite *s = suite_create("Coord");
     TCase *tc_core = tcase_create("Core");

diff --git a/tests/test_freesasa.c b/tests/test_freesasa.c
@@ -513,9 +513,9 @@ START_TEST(test_memerr)
 }
 END_TEST
 
-extern TCase *test_LR_static();
+extern TCase *test_LR_static(void);
 
-Suite *sasa_suite()
+Suite *sasa_suite(void)
 {
     Suite *s = suite_create("SASA-calculation");
 

diff --git a/tests/test_json.c b/tests/test_json.c
@@ -232,7 +232,7 @@ START_TEST(test_json)
 }
 END_TEST
 
-Suite *json_suite()
+Suite *json_suite(void)
 {
     Suite *s = suite_create("JSON");
     TCase *tc_core = tcase_create("Core");

diff --git a/tests/test_main.c b/tests/test_main.c
@@ -6,20 +6,20 @@
 #include <config.h>
 #endif
 
-extern Suite *pdb_suite();
-extern Suite *classifier_suite();
-extern Suite *coord_suite();
-extern Suite *structure_suite();
-extern Suite *sasa_suite();
-extern Suite *nb_suite();
-extern Suite *selector_suite();
-extern Suite *result_node_suite();
+extern Suite *pdb_suite(void);
+extern Suite *classifier_suite(void);
+extern Suite *coord_suite(void);
+extern Suite *structure_suite(void);
+extern Suite *sasa_suite(void);
+extern Suite *nb_suite(void);
+extern Suite *selector_suite(void);
+extern Suite *result_node_suite(void);
 
 #ifdef USE_JSON
-extern Suite *json_suite();
+extern Suite *json_suite(void);
 #endif
 #ifdef USE_XML
-extern Suite *xml_suite();
+extern Suite *xml_suite(void);
 #endif
 
 int main(int argc, char **argv)

diff --git a/tests/test_nb.c b/tests/test_nb.c
@@ -43,9 +43,9 @@ START_TEST(test_memerr)
 }
 END_TEST
 
-extern TCase *test_nb_static();
+extern TCase *test_nb_static(void);
 
-Suite *nb_suite()
+Suite *nb_suite(void)
 {
     Suite *s = suite_create("Neighbor lists");
 

diff --git a/tests/test_node.c b/tests/test_node.c
@@ -121,7 +121,7 @@ START_TEST(test_memerr)
 }
 END_TEST
 
-Suite *result_node_suite()
+Suite *result_node_suite(void)
 {
     Suite *s = suite_create("Result-node");
 

diff --git a/tests/test_pdb.c b/tests/test_pdb.c
@@ -193,9 +193,9 @@ START_TEST(test_get_chains)
 }
 END_TEST
 
-extern TCase *test_pdb_static();
+extern TCase *test_pdb_static(void);
 
-Suite *pdb_suite()
+Suite *pdb_suite(void)
 {
     Suite *s = suite_create("PDB-parser");
     TCase *tc_core = tcase_create("Core");

diff --git a/tests/test_selection.c b/tests/test_selection.c
@@ -445,9 +445,9 @@ START_TEST(test_memerr)
 }
 END_TEST
 
-extern TCase *test_selection_static();
+extern TCase *test_selection_static(void);
 
-Suite *selector_suite()
+Suite *selector_suite(void)
 {
     Suite *s = suite_create("Selector");
 

diff --git a/tests/test_structure.c b/tests/test_structure.c
@@ -465,7 +465,7 @@ START_TEST(test_memerr)
 }
 END_TEST
 
-Suite *structure_suite()
+Suite *structure_suite(void)
 {
     // what goes in what Case is kind of arbitrary
     Suite *s = suite_create("Structure");

diff --git a/tests/test_xml.c b/tests/test_xml.c
@@ -168,7 +168,7 @@ START_TEST(test_memerr)
 }
 END_TEST
 
-Suite *xml_suite()
+Suite *xml_suite(void)
 {
     Suite *s = suite_create("XML");
     TCase *tc_core = tcase_create("Core");