[git commit] libbb: code shrink

Denys Vlasenko vda.linux at googlemail.com
Sun Nov 29 13:24:14 UTC 2020


commit: https://git.busybox.net/busybox/commit/?id=eb773054e47a30c78a82ed80ad4da7abe9bfb09b
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
generate_uuid                                        124     103     -21

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 libbb/xfuncs_printf.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index f1cf7aeed..fcc798662 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -633,14 +633,11 @@ void FAST_FUNC generate_uuid(uint8_t *buf)
 	pid_t pid;
 	int i;
 
-	i = open("/dev/urandom", O_RDONLY);
-	if (i >= 0) {
-		read(i, buf, 16);
-		close(i);
-	}
+	open_read_close("/dev/urandom", buf, 16);
 	/* Paranoia. /dev/urandom may be missing.
 	 * rand() is guaranteed to generate at least [0, 2^15) range,
-	 * but lowest bits in some libc are not so "random".  */
+	 * but lowest bits in some libc are not so "random".
+	 */
 	srand(monotonic_us()); /* pulls in printf */
 	pid = getpid();
 	while (1) {


More information about the busybox-cvs mailing list