From 405822cdf62f51b29035b6b64d56b2a217b648e0 Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Fri, 19 Apr 2019 21:34:25 -0400 Subject: [PATCH] Cleaning up build on gcc --- src/inpfile.c | 14 +++++++++----- tests/test_demand_data.cpp | 6 +++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/inpfile.c b/src/inpfile.c index 6df3d2c..6e668e9 100644 --- a/src/inpfile.c +++ b/src/inpfile.c @@ -332,8 +332,8 @@ int saveinpfile(Project *pr, const char *fname) fprintf(f, s_DEMANDS); ucf = pr->Ucf[DEMAND]; - list_t *dlist; - list_node_t *lnode; + list_t *dlist = NULL; + list_node_t *lnode = NULL; char *temp = NULL; for (i = 1; i <= net->Njuncs; i++) @@ -341,11 +341,15 @@ int saveinpfile(Project *pr, const char *fname) node = &net->Node[i]; if (dlist = node->D) { for (lnode = first_list(dlist); done_list(lnode); lnode = next_list(lnode)) { - sprintf(s, " %-31s %14.6f", node->ID, ucf * get_base_demand(lnode)); - if ((j = get_pattern_index(lnode)) > 0) sprintf(s1, " %-31s", net->Pattern[j].ID); - else strcpy(s1, " "); + + if + ((j = get_pattern_index(lnode)) > 0) sprintf(s1, " %-31s", net->Pattern[j].ID); + else + strcpy(s1, " "); + fprintf(f, "\n%s %-31s", s, s1); + if (temp = get_category_name(lnode)) { fprintf(f, " ;%s", temp); free(temp); diff --git a/tests/test_demand_data.cpp b/tests/test_demand_data.cpp index 80b6cb0..616dc6f 100644 --- a/tests/test_demand_data.cpp +++ b/tests/test_demand_data.cpp @@ -128,12 +128,12 @@ BOOST_FIXTURE_TEST_CASE(test_category_getset, Fixture) char *name = NULL; name = get_category_name(lnode); - BOOST_CHECK(check_string(name, "CUB_SCOUT_BASE_CAMP")); + BOOST_CHECK(check_string(name, (char *)"CUB_SCOUT_BASE_CAMP")); free(name); name = NULL; - set_category_name(lnode, "CUB_SCOUT_COMMAND"); + set_category_name(lnode, (char *)"CUB_SCOUT_COMMAND"); name = get_category_name(lnode); BOOST_CHECK(check_string(name, "CUB_SCOUT_COMMAND")); @@ -258,7 +258,7 @@ BOOST_FIXTURE_TEST_CASE(test_pattern_edits, FixtureSingleNode) error = EN_addpattern(ph, (char *)"Pat3"); BOOST_REQUIRE(error == 0); - error = EN_getpatternindex(ph, "Pat3", &pat3_idx); + error = EN_getpatternindex(ph, (char *)"Pat3", &pat3_idx); BOOST_REQUIRE(error == 0); double f2[] = { 2.1, 2.2 };