diff options
| author | Joel Sherrill <joel@rtems.org> | 2021-03-24 07:57:43 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2021-03-24 08:03:07 -0500 |
| commit | 62bbb0cc46f5015e757bae866e0b1aedd33d7d9d (patch) | |
| tree | 3ab17e60a5b6c003d932339de0e0b3f9c19a946b /cpukit/libmisc/uuid/gen_uuid.c | |
| parent | pwdgrp.c: Remove _Assert. /etc may already exist (diff) | |
| download | rtems-62bbb0cc46f5015e757bae866e0b1aedd33d7d9d.tar.bz2 | |
gen_uuid.c: Revert previous patch (597e4f476568a225d14dfaff02074cf269ad62ac)
The patch was:
gen_uuid.c: Fix two Unchecked return value from library errors
CID 1049146: Unchecked return value from library in get_clock().
CID 1049147: Unchecked return value from library in get_random_fd().
Reopen #4280
Diffstat (limited to '')
| -rw-r--r-- | cpukit/libmisc/uuid/gen_uuid.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cpukit/libmisc/uuid/gen_uuid.c b/cpukit/libmisc/uuid/gen_uuid.c index 5bb34c0b09..3ca75a08ce 100644 --- a/cpukit/libmisc/uuid/gen_uuid.c +++ b/cpukit/libmisc/uuid/gen_uuid.c @@ -155,7 +155,6 @@ static int get_random_fd(void) struct timeval tv; static int fd = -2; int i; - int sc; if (fd == -2) { gettimeofday(&tv, 0); @@ -165,10 +164,8 @@ static int get_random_fd(void) fd = open("/dev/random", O_RDONLY | O_NONBLOCK); if (fd >= 0) { i = fcntl(fd, F_GETFD); - if (i >= 0) { - sc = fcntl(fd, F_SETFD, i | FD_CLOEXEC); - _Assert_Unused_variable_unequal(sc, -1); - } + if (i >= 0) + fcntl(fd, F_SETFD, i | FD_CLOEXEC); } #endif srand((getpid() << ((sizeof(pid_t)*CHAR_BIT)>>1)) ^ getuid() ^ tv.tv_sec ^ tv.tv_usec); @@ -337,7 +334,6 @@ static int get_clock(uint32_t *clock_high, uint32_t *clock_low, uint64_t clock_reg; mode_t save_umask; int len; - int sc; if (state_fd == -2) { save_umask = umask(0); @@ -430,8 +426,7 @@ try_again: } rewind(state_f); fl.l_type = F_UNLCK; - sc = fcntl(state_fd, F_SETLK, &fl); - _Assert_Unused_variable_unequal(sc, -1); + fcntl(state_fd, F_SETLK, &fl); } *clock_high = clock_reg >> 32; |