nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Changes from review of clock_nanosleep(): Misplaced right bracket, but return value in one failure case.

Browse source
This commit is contained in:
Gregory Nutt 2017-11-11 18:01:28 -06:00
parent 35ee844590
commit b9fa3e167e
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sched/signal/sig_nanosleep.c
View file

@ -296,13 +296,19 @@ int clock_nanosleep(clockid_t clockid, int flags,
irqstate = enter_critical_section();
ret = clock_gettime(clockid, &now);
if (ret >= 0)
if (ret < 0)
{
clock_timespec_subtract(rqtp, &now, &reltime);
/* clock_gettime() sets the errno variable */
leave_critical_section(irqstate);
leave_cancellation_point();
return ERROR;
}
/* Now that we have the relative time, the remaining operations are
* equivalent to nxsig_nanosleep().
clock_timespec_subtract(rqtp, &now, &reltime);
/* Now that we have the relative time, the remaining operations
* are equivalent to nxsig_nanosleep().
*/
ret = nxsig_nanosleep(&reltime, rmtp);
@ -322,6 +328,8 @@ int clock_nanosleep(clockid_t clockid, int flags,
if (ret < 0)
{
/* If not set the errno variable and return -1 */
set_errno(-ret);
ret = ERROR;
}