Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-01 20:29:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

!apps: replace sclock_t with clock_t and drop redundant time_t/off_t casts

Browse source 
Align with the upstream nuttx change that drops the sclock_t alias now
that clock_t is itself a signed 64-bit type (int64_t).  Beyond the pure
sclock_t -> clock_t rename, this commit also removes the
now-unnecessary (time_t)-1 / (time_t)0 / (off_t)-1 casts that were
papering over the previously-unsigned time_t.

Files touched:

  - examples/alarm/alarm_main.c:        sclock_t -> clock_t
  - netutils/dhcpd/dhcpd.c:             sclock_t -> clock_t
  - netutils/ftpd/ftpd.c:               sclock_t -> clock_t
  - netutils/thttpd/libhttpd.c,
    netutils/thttpd/tdate_parse.c:      drop (time_t)-1 / (time_t)0 /
                                        (off_t)-1 sentinel casts
  - system/resmonitor/filldisk.c,
    system/zmodem/zm_receive.c:         sclock_t -> clock_t
  - testing/ostest/wdog.c:              sclock_t -> clock_t (the bulk
                                        of the rename, 30 sites)
  - testing/testsuites/kernel/syscall/cases/{clock_nanosleep_test,
    fsync_test,time_test}.c:            drop (time_t)-1 casts in the
                                        new signed-time_t world

No behavioural change.

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2026-05-03 17:17:05 +08:00 • committed by Xiang Xiao
parent 72837c8d26
commit a6477ec8dc
11 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

30
testing/ostest/wdog.c
View file

@ -56,7 +56,7 @@
typedef struct wdtest_param_s
{
FAR struct wdog_s *wdog;
sclock_t interval;
clock_t interval;
uint64_t callback_cnt;
clock_t triggered_tick;
} wdtest_param_t;
@ -79,7 +79,7 @@ static void wdtest_callback(wdparm_t param)
wdtest_param->callback_cnt += 1;
}
static void wdtest_checkdelay(sclock_t diff, sclock_t delay_tick)
static void wdtest_checkdelay(clock_t diff, clock_t delay_tick)
{
/* Ensure the watchdog trigger time is not earlier than expected. */
@ -97,13 +97,13 @@ static void wdtest_checkdelay(sclock_t diff, sclock_t delay_tick)
}
static void wdtest_once(FAR struct wdog_s *wdog, FAR wdtest_param_t *param,
sclock_t delay_ns)
clock_t delay_ns)
{
uint64_t cnt;
sclock_t diff;
clock_t diff;
clock_t wdset_tick;
irqstate_t flags;
sclock_t delay_tick = (sclock_t)NSEC2TICK((clock_t)delay_ns);
clock_t delay_tick = NSEC2TICK(delay_ns);
wdtest_printf("wdtest_once %lld ns\n", (long long)delay_ns);
@ -133,20 +133,20 @@ static void wdtest_once(FAR struct wdog_s *wdog, FAR wdtest_param_t *param,
/* Check if the delay is within the acceptable tolerance. */
diff = (sclock_t)(param->triggered_tick - wdset_tick);
diff = param->triggered_tick - wdset_tick;
wdtest_checkdelay(diff, delay_tick);
}
static void wdtest_rand(FAR struct wdog_s *wdog, FAR wdtest_param_t *param,
sclock_t rand_ns)
clock_t rand_ns)
{
uint64_t cnt;
int idx;
sclock_t delay_ns;
clock_t delay_ns;
clock_t wdset_tick;
sclock_t delay_tick;
sclock_t diff;
clock_t delay_tick;
clock_t diff;
irqstate_t flags = 0;
/* Perform multiple iterations with random delays. */
@ -190,7 +190,7 @@ static void wdtest_rand(FAR struct wdog_s *wdog, FAR wdtest_param_t *param,
if (cnt % 2)
{
diff = (sclock_t)(param->triggered_tick - wdset_tick);
diff = param->triggered_tick - wdset_tick;
wdtest_checkdelay(diff, delay_tick);
}
}
@ -204,7 +204,7 @@ static void wdtest_rand(FAR struct wdog_s *wdog, FAR wdtest_param_t *param,
static void wdtest_callback_recursive(wdparm_t param)
{
FAR wdtest_param_t *wdtest_param = (FAR wdtest_param_t *)param;
sclock_t interval = wdtest_param->interval;
clock_t interval = wdtest_param->interval;
wdtest_param->callback_cnt += 1;
wdtest_param->triggered_tick = clock_systime_ticks();
@ -215,7 +215,7 @@ static void wdtest_callback_recursive(wdparm_t param)
static void wdtest_recursive(FAR struct wdog_s *wdog,
FAR wdtest_param_t *param,
sclock_t delay_ns,
clock_t delay_ns,
unsigned int times)
{
uint64_t cnt;
@ -227,7 +227,7 @@ static void wdtest_recursive(FAR struct wdog_s *wdog,
cnt = param->callback_cnt;
param->wdog = wdog;
param->interval = (sclock_t)NSEC2TICK((clock_t)delay_ns);
param->interval = NSEC2TICK(delay_ns);
wdtest_assert(param->interval >= 0);
@ -253,7 +253,7 @@ static void wdtest_recursive(FAR struct wdog_s *wdog,
static void wdog_test_run(FAR wdtest_param_t *param)
{
uint64_t cnt;
sclock_t rest;
clock_t rest;
clock_t delay;
struct wdog_s test_wdog =
{

2
testing/testsuites/kernel/syscall/cases/clock_nanosleep_test.c
View file

@ -55,7 +55,7 @@ void test_nuttx_syscall_clocknanosleep01(FAR void **state)
ret = clock_nanosleep(type, 0, &t, NULL);
assert_int_equal(ret, 0);
end_time = clock();
assert_int_equal((time_t)(end_time - start_time) / CLOCKS_PER_SEC,
assert_int_equal((end_time - start_time) / CLOCKS_PER_SEC,
t.tv_sec);
}

2
testing/testsuites/kernel/syscall/cases/fsync_test.c
View file

@ -238,7 +238,7 @@ void test_nuttx_syscall_fsync03(FAR void **state)
ret = fsync(fd);
time_end = time(0);
assert_true(time_end != (time_t)-1);
assert_true(time_end != -1);
assert_int_not_equal(ret, -1);
assert_int_equal(ret, 0);
assert_false(time_end < time_start);

2
testing/testsuites/kernel/syscall/cases/time_test.c
View file

@ -57,7 +57,7 @@ void test_nuttx_syscall_time01(FAR void **state)
/* check return code */
assert_int_not_equal(ret, (time_t)-1);
assert_int_not_equal(ret, -1);
}
}