From 863996228b1bc58e4f3c4152fbfa9aa32eec5642 Mon Sep 17 00:00:00 2001 From: rlar Date: Fri, 7 Jun 2013 22:23:53 +0200 Subject: [PATCH] inpcom.c, cleanup `inp_add_params_to_subckt()' --- src/frontend/inpcom.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index c633bd479..3578700cd 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -3760,9 +3760,12 @@ inp_add_params_to_subckt(struct names *subckt_w_params, struct line *subckt_card char *new_line, *param_ptr, *subckt_name, *end_ptr; for (; card; card = card->li_next) { + char *curr_line = card->li_line; + if (!ciprefix(".param", curr_line)) break; + param_ptr = strchr(curr_line, ' '); param_ptr = skip_ws(param_ptr); @@ -3770,7 +3773,7 @@ inp_add_params_to_subckt(struct names *subckt_w_params, struct line *subckt_card new_line = TMALLOC(char, strlen(subckt_line) + strlen("params: ") + strlen(param_ptr) + 2); sprintf(new_line, "%s params: %s", subckt_line, param_ptr); - subckt_name = skip_non_ws(subckt_card->li_line); + subckt_name = skip_non_ws(subckt_line); subckt_name = skip_ws(subckt_name); end_ptr = skip_non_ws(subckt_name); add_name(subckt_w_params, copy_substring(subckt_name, end_ptr)); @@ -3780,10 +3783,12 @@ inp_add_params_to_subckt(struct names *subckt_w_params, struct line *subckt_card } tfree(subckt_line); - subckt_card->li_line = subckt_line = new_line; + subckt_line = new_line; *curr_line = '*'; } + + subckt_card->li_line = subckt_line; }