Rename abs to ABS to avoid clash with standard definitions. Fixes #10353. (#10354)
Tomáš Kopal committed
Mar 17, 2021 at 11:18 UTC
757e418090e1038b183d3776aa8a3c55260369ca
8 files changed
+13
-17
daemon/unit_test.c
+1
-1
@@ -371,7 +371,7 @@ int unit_test_str2ld() {
371
return -1;
372
}
373
}
374
- else if(mine != sys && abs(mine-sys) > 0.000001) {
374
+ else if(mine != sys && ABS(mine-sys) > 0.000001) {
375
fprintf(stderr, "Value '%s' is parsed as %" LONG_DOUBLE_MODIFIER ", but system believes it is %" LONG_DOUBLE_MODIFIER ", delta %" LONG_DOUBLE_MODIFIER ".\n", values[i], mine, sys, sys-mine);
376
return -1;
377
}
database/rrddim.c
+1
-1
@@ -423,7 +423,7 @@ RRDDIM *rrddim_add_custom(RRDSET *st, const char *id, const char *name, collecte
423
else {
424
RRDDIM *td = st->dimensions;
425
426
- if(td->algorithm != rd->algorithm || abs(td->multiplier) != abs(rd->multiplier) || abs(td->divisor) != abs(rd->divisor)) {
426
+ if(td->algorithm != rd->algorithm || ABS(td->multiplier) != ABS(rd->multiplier) || ABS(td->divisor) != ABS(rd->divisor)) {
427
if(!rrdset_flag_check(st, RRDSET_FLAG_HETEROGENEOUS)) {
428
#ifdef NETDATA_INTERNAL_CHECKS
429
info("Dimension '%s' added on chart '%s' of host '%s' is not homogeneous to other dimensions already present (algorithm is '%s' vs '%s', multiplier is " COLLECTED_NUMBER_FORMAT " vs " COLLECTED_NUMBER_FORMAT ", divisor is " COLLECTED_NUMBER_FORMAT " vs " COLLECTED_NUMBER_FORMAT ").",
database/rrdset.c
+3
-3
@@ -219,11 +219,11 @@ inline void rrdset_update_heterogeneous_flag(RRDSET *st) {
219
rrdset_flag_clear(st, RRDSET_FLAG_HOMOGENEOUS_CHECK);
220
221
RRD_ALGORITHM algorithm = st->dimensions->algorithm;
222
- collected_number multiplier = abs(st->dimensions->multiplier);
223
- collected_number divisor = abs(st->dimensions->divisor);
222
+ collected_number multiplier = ABS(st->dimensions->multiplier);
223
+ collected_number divisor = ABS(st->dimensions->divisor);
224
225
rrddim_foreach_read(rd, st) {
226
- if(algorithm != rd->algorithm || multiplier != abs(rd->multiplier) || divisor != abs(rd->divisor)) {
226
+ if(algorithm != rd->algorithm || multiplier != ABS(rd->multiplier) || divisor != ABS(rd->divisor)) {
227
if(!rrdset_flag_check(st, RRDSET_FLAG_HETEROGENEOUS)) {
228
#ifdef NETDATA_INTERNAL_CHECKS
229
info("Dimension '%s' added on chart '%s' of host '%s' is not homogeneous to other dimensions already present (algorithm is '%s' vs '%s', multiplier is " COLLECTED_NUMBER_FORMAT " vs " COLLECTED_NUMBER_FORMAT ", divisor is " COLLECTED_NUMBER_FORMAT " vs " COLLECTED_NUMBER_FORMAT ").",
health/health_config.c
+1
-1
@@ -384,7 +384,7 @@ static inline int health_parse_db_lookup(
384
}
385
386
// sane defaults
387
- *every = abs(*after);
387
+ *every = ABS(*after);
388
389
// now we may have optional parameters
390
while(*s) {
libnetdata/eval/eval.c
+1
-1
@@ -296,7 +296,7 @@ calculated_number eval_abs(EVAL_EXPRESSION *exp, EVAL_NODE *op, int *error) {
296
calculated_number n1 = eval_value(exp, &op->ops[0], error);
297
if(isnan(n1)) return NAN;
298
if(isinf(n1)) return INFINITY;
299
- return abs(n1);
299
+ return ABS(n1);
300
}
301
calculated_number eval_if_then_else(EVAL_EXPRESSION *exp, EVAL_NODE *op, int *error) {
302
if(is_true(eval_value(exp, &op->ops[0], error)))
libnetdata/libnetdata.h
+1
-5
@@ -205,11 +205,7 @@ extern "C" {
205
#define WARNUNUSED
206
#endif
207
208
-#ifdef abs
209
-#undef abs
210
-#endif
211
-#define abs(x) (((x) < 0)? (-(x)) : (x))
212
-
208
+#define ABS(x) (((x) < 0)? (-(x)) : (x))
209
#define MIN(a,b) (((a)<(b))?(a):(b))
210
#define MAX(a,b) (((a)>(b))?(a):(b))
211
libnetdata/tests/test_str2ld.c
+1
-1
@@ -32,7 +32,7 @@ static void test_str2ld(void **state)
32
else if (isinf(mine))
33
assert_true(isinf(sys));
34
else if (mine != sys)
35
- assert_false(abs(mine - sys) > 0.000001);
35
+ assert_false(ABS(mine - sys) > 0.000001);
36
37
assert_ptr_equal(e_mine, e_sys);
38
}
web/api/queries/query.c
+4
-4
@@ -758,8 +758,8 @@ static int rrdr_convert_before_after_to_absolute(
758
}
759
760
// allow relative for before (smaller than API_RELATIVE_TIME_MAX)
761
- if(abs(before_requested) <= API_RELATIVE_TIME_MAX) {
762
- if(abs(before_requested) % update_every) {
761
+ if(ABS(before_requested) <= API_RELATIVE_TIME_MAX) {
762
+ if(ABS(before_requested) % update_every) {
763
// make sure it is multiple of st->update_every
764
if(before_requested < 0) before_requested = before_requested - update_every -
765
before_requested % update_every;
@@ -772,9 +772,9 @@ static int rrdr_convert_before_after_to_absolute(
772
}
773
774
// allow relative for after (smaller than API_RELATIVE_TIME_MAX)
775
- if(abs(after_requested) <= API_RELATIVE_TIME_MAX) {
775
+ if(ABS(after_requested) <= API_RELATIVE_TIME_MAX) {
776
if(after_requested == 0) after_requested = -update_every;
777
- if(abs(after_requested) % update_every) {
777
+ if(ABS(after_requested) % update_every) {
778
// make sure it is multiple of st->update_every
779
if(after_requested < 0) after_requested = after_requested - update_every - after_requested % update_every;
780
else after_requested = after_requested + update_every - after_requested % update_every;