From e2e12fab229cbac4e3f544db02315836c584a1dc Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Fri, 19 Apr 2019 21:51:55 -0400 Subject: [PATCH] Cleaning up gcc build --- src/demand.c | 6 +++--- src/demand.h | 6 +++--- src/inpfile.c | 9 ++++----- tests/test_demand_data.cpp | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/demand.c b/src/demand.c index 48a7980..eecec99 100644 --- a/src/demand.c +++ b/src/demand.c @@ -33,7 +33,7 @@ typedef struct demand_data_s -list_t *create_demand_list(double base_demand, int pattern_index, char *category_name) +list_t *create_demand_list(double base_demand, int pattern_index, const char *category_name) { list_t *demand_list; demand_data_t *demand_data; @@ -50,7 +50,7 @@ list_t *create_demand_list(double base_demand, int pattern_index, char *category } -demand_data_t *create_demand_data(double base_demand, int pattern_index, char *category_name) +demand_data_t *create_demand_data(double base_demand, int pattern_index, const char *category_name) { demand_data_t *demand_data = (demand_data_t *)malloc(sizeof(demand_data_t)); @@ -122,7 +122,7 @@ char *get_category_name(list_node_t *lnode) return strdup(get_demand_data(lnode)->category_name); } -void set_category_name(list_node_t *lnode, char *category_name) +void set_category_name(list_node_t *lnode, const char *category_name) { free(get_demand_data(lnode)->category_name); get_demand_data(lnode)->category_name = strdup(category_name); diff --git a/src/demand.h b/src/demand.h index fcc7826..72dd3d8 100644 --- a/src/demand.h +++ b/src/demand.h @@ -29,10 +29,10 @@ typedef struct demand_data_s demand_data_t; // demand list gets declared in types.h struct Snode -list_t *create_demand_list(double base_demand, int pattern_index, char *category_name); +list_t *create_demand_list(double base_demand, int pattern_index, const char *category_name); -demand_data_t *create_demand_data(double base_demand, int pat_index, char *cat_name); +demand_data_t *create_demand_data(double base_demand, int pat_index, const char *cat_name); void delete_demand_data(void *data); @@ -49,7 +49,7 @@ int get_pattern_index(list_node_t *lnode); void set_pattern_index(list_node_t *lnode, int pattern_index); char *get_category_name(list_node_t *lnode); -void set_category_name(list_node_t *lnode, char *category_name); +void set_category_name(list_node_t *lnode, const char *category_name); // Make this private? demand_data_t *get_demand_data(list_node_t *lnode); diff --git a/src/inpfile.c b/src/inpfile.c index 6e668e9..3f6646f 100644 --- a/src/inpfile.c +++ b/src/inpfile.c @@ -332,15 +332,14 @@ int saveinpfile(Project *pr, const char *fname) fprintf(f, s_DEMANDS); ucf = pr->Ucf[DEMAND]; - list_t *dlist = NULL; + //list_t *dlist = NULL; list_node_t *lnode = NULL; char *temp = NULL; - for (i = 1; i <= net->Njuncs; i++) - { + for (i = 1; i <= net->Njuncs; i++) { node = &net->Node[i]; - if (dlist = node->D) { - for (lnode = first_list(dlist); done_list(lnode); lnode = next_list(lnode)) { + if (node->D) { + for (lnode = first_list(node->D); done_list(lnode); lnode = next_list(lnode)) { sprintf(s, " %-31s %14.6f", node->ID, ucf * get_base_demand(lnode)); if diff --git a/tests/test_demand_data.cpp b/tests/test_demand_data.cpp index 616dc6f..74cbf7a 100644 --- a/tests/test_demand_data.cpp +++ b/tests/test_demand_data.cpp @@ -253,7 +253,7 @@ BOOST_FIXTURE_TEST_CASE(test_pattern_edits, FixtureSingleNode) BOOST_REQUIRE(error == 0); error = EN_addpattern(ph, (char *)"Pat2"); BOOST_REQUIRE(error == 0); - error = EN_getpatternindex(ph, "Pat2", &pat2_idx); + error = EN_getpatternindex(ph, (char *)"Pat2", &pat2_idx); BOOST_REQUIRE(error == 0); error = EN_addpattern(ph, (char *)"Pat3");