From aeb57781a8ab387218092f02001db9d651e38f05 Mon Sep 17 00:00:00 2001 From: stefan schippers Date: Fri, 10 Jan 2025 16:14:24 +0100 Subject: [PATCH] fix some c89 violations (warnings) --- scconfig/hooks.c | 12 ++++++------ src/save.c | 9 +++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/scconfig/hooks.c b/scconfig/hooks.c index 0abf7148..0a2e7d22 100644 --- a/scconfig/hooks.c +++ b/scconfig/hooks.c @@ -253,12 +253,12 @@ int hook_detect_target() append("cc/cflags", " "); append("cc/cflags", get("cc/argstd/Wall")); } - /* - * if (require("cc/argstd/std_c89", 0, 0) == 0) { - * append("cc/cflags", " "); - * append("cc/cflags", get("cc/argstd/std_c89")); - * } - */ + + if (require("cc/argstd/std_c89", 0, 0) == 0) { + append("cc/cflags", " "); + append("cc/cflags", get("cc/argstd/std_c89")); + } + if (require("cc/argstd/pedantic", 0, 0) == 0) { append("cc/cflags", " "); append("cc/cflags", get("cc/argstd/pedantic")); diff --git a/src/save.c b/src/save.c index bd211510..4bff253d 100644 --- a/src/save.c +++ b/src/save.c @@ -1551,15 +1551,16 @@ int raw_get_pos(const char *node, double value, int dset, int from_start, int to if(idx >= 0) { double vx; int start, end; - int lastpoint = raw->npoints[dset] - 1; + int sign, lastpoint = raw->npoints[dset] - 1; + double vstart, vend; start = from_start >= 0 ? from_start : 0; end = to_end >= 0 ? to_end : lastpoint; if(start > lastpoint) start = lastpoint; if(end > lastpoint) end = lastpoint; - double vstart = get_raw_value(dset, idx, start); - double vend = get_raw_value(dset, idx, end); - int sign = (vend > vstart) ? 1 : -1; + vstart = get_raw_value(dset, idx, start); + vend = get_raw_value(dset, idx, end); + sign = (vend > vstart) ? 1 : -1; if( sign * value >= sign * vstart && sign * value <= sign * vend) { while(1) { x = (start + end ) / 2;