From f05746cea21f0fe3c3f86d8a043f97d3c1cffa0e Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Fri, 19 Apr 2019 22:56:08 -0400 Subject: [PATCH] GCC Bug --- src/demand.c | 4 ++-- src/inpfile.c | 20 +++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/demand.c b/src/demand.c index eecec99..5c58712 100644 --- a/src/demand.c +++ b/src/demand.c @@ -24,7 +24,7 @@ #include "demand.h" -typedef struct demand_data_s +typedef struct demand_data_s { double base_demand; int pattern_index; @@ -60,7 +60,7 @@ demand_data_t *create_demand_data(double base_demand, int pattern_index, const c if (category_name) demand_data->category_name = strdup(category_name); else - demand_data->category_name = NULL; + demand_data->category_name = '\0'; return demand_data; } diff --git a/src/inpfile.c b/src/inpfile.c index a36bc67..a352e1d 100644 --- a/src/inpfile.c +++ b/src/inpfile.c @@ -142,20 +142,18 @@ void write_demands(Project *pr, FILE *f) { node = &net->Node[i]; if (node->D) { for (lnode = first_list(node->D); done_list(lnode); lnode = next_list(lnode)) { - if (lnode) { - sprintf(s, " %-31s %14.6f", node->ID, ucf * get_base_demand(lnode)); + sprintf(s, " %-31s %14.6f", node->ID, ucf * 100.0); // 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); + fprintf(f, "\n%s %-31s", s, s1); - if (temp = get_category_name(lnode)) { - fprintf(f, " ;%s", temp); - free(temp); - } + if (temp = get_category_name(lnode)) { + fprintf(f, " ;%s", temp); + free(temp); } } }