Skip to content

Commit dafb65c

Browse files
committed
Fix warnings
1 parent 3e118e2 commit dafb65c

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

cli/chanloop.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ suscli_frequency_format(char *obuf, size_t osize, SUFREQ freq, const char *unit)
3737
if (unit == NULL)
3838
unit = "Hz";
3939

40-
for (i = 1; SU_ABS(freq) >= 1e3 && i < 5; ++i) {
40+
for (i = 1; fabs(freq) >= 1e3 && i < 5; ++i) {
4141
freq *= 1e-3;
4242
pfx = prefixes[i - 1];
4343
}

cli/datasavers/csv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ suscli_csv_datasaver_write_cb(
105105
SU_TRYCATCH(
106106
fprintf(
107107
fp,
108-
"%ld,%ld,%.9e,%g\n",
108+
"%ld,%d,%.9e,%g\n",
109109
samples[i].timestamp.tv_sec,
110-
samples[i].timestamp.tv_usec,
110+
(int) samples[i].timestamp.tv_usec,
111111
samples[i].value,
112112
SU_POWER_DB_RAW(samples[i].value)) > 0,
113113
return SU_FALSE);

sgdp4/predict.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ sgdp4_prediction_find_aos(
260260
&& (window <= 0 || timeval_elapsed(&t, tv) < window)) {
261261
delta_t = -30 * (
262262
SU_RAD2DEG(self->pos_azel.elevation) * (self->alt / 8400. + .46) - 2.0);
263-
if (SU_ABS(delta_t) > max_delta_t)
264-
delta_t = max_delta_t * (delta_t / SU_ABS(delta_t));
263+
if (fabs(delta_t) > max_delta_t)
264+
delta_t = max_delta_t * (delta_t / fabs(delta_t));
265265

266266
timeval_add_double(&t, delta_t);
267267
sgdp4_prediction_update(self, &t);
@@ -277,13 +277,13 @@ sgdp4_prediction_find_aos(
277277
* SU_RAD2DEG(self->pos_azel.elevation)
278278
* sqrt(self->alt);
279279

280-
if (sufeq(self->pos_azel.elevation, 0, 8.7e-5) || SU_ABS(delta_t) < 1) {
280+
if (sufeq(self->pos_azel.elevation, 0, 8.7e-5) || fabs(delta_t) < 1) {
281281
*aos = t;
282282
return SU_TRUE;
283283
}
284284

285-
if (SU_ABS(delta_t) > max_delta_t)
286-
delta_t = max_delta_t * (delta_t / SU_ABS(delta_t));
285+
if (fabs(delta_t) > max_delta_t)
286+
delta_t = max_delta_t * (delta_t / fabs(delta_t));
287287

288288
if (iters > 0) {
289289
/* Flipping signs? Overshoot detected. */
@@ -336,8 +336,8 @@ sgdp4_prediction_find_los(
336336
delta_t = 3.456
337337
* cos(self->pos_azel.elevation - .017)
338338
* sqrt(self->alt);
339-
if (SU_ABS(delta_t) > max_delta_t)
340-
delta_t = max_delta_t * (delta_t / SU_ABS(delta_t));
339+
if (fabs(delta_t) > max_delta_t)
340+
delta_t = max_delta_t * (delta_t / fabs(delta_t));
341341

342342
timeval_add_double(&t, delta_t);
343343
sgdp4_prediction_update(self, &t);
@@ -354,8 +354,8 @@ sgdp4_prediction_find_los(
354354
* SU_RAD2DEG(self->pos_azel.elevation)
355355
* sqrt(self->alt);
356356

357-
if (SU_ABS(delta_t) > max_delta_t)
358-
delta_t = max_delta_t * (delta_t / SU_ABS(delta_t));
357+
if (fabs(delta_t) > max_delta_t)
358+
delta_t = max_delta_t * (delta_t / fabs(delta_t));
359359

360360
if (iters > 0) {
361361
/* Flipping signs? Overshoot detected. */
@@ -367,7 +367,7 @@ sgdp4_prediction_find_los(
367367
sgdp4_prediction_update(self, &t);
368368

369369
/* delta_t below 1 µs cannot be rendered with struct timeval */
370-
if (sufeq(self->pos_azel.elevation, 0, 8.7e-5) || SU_ABS(delta_t) < 1) {
370+
if (sufeq(self->pos_azel.elevation, 0, 8.7e-5) || fabs(delta_t) < 1) {
371371
*los = t;
372372
return SU_TRUE;
373373
}

util/compat.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
1818
*/
1919

20-
#ifndef _COMPAT_H
21-
#define _COMPAT_H
20+
#ifndef _SUSCAN_COMPAT_H
21+
#define _SUSCAN_COMPAT_H
2222

2323
#include <stdint.h>
2424
#include <sigutils/util/util.h>
@@ -66,5 +66,5 @@ SUBOOL suscan_vm_circbuf_allowed(SUSCOUNT);
6666
SUCOMPLEX *suscan_vm_circbuf_new(const char *name, void **state, SUSCOUNT size);
6767
void suscan_vm_circbuf_destroy(void *state);
6868

69-
#endif /* _COMPAT_H */
69+
#endif /* _SUSCAN_COMPAT_H */
7070

0 commit comments

Comments
 (0)