X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fentropy.c;h=02f56e0f447ab15fde978e818985ecb6b1f4501a;hb=5521e08eb7a233129208a1c04ee11a0599f25879;hp=b844d64aeee03617791e663469e2eb427ad4e052;hpb=e251c8d0050acf8d3f35c91b6d2708fab5314ce7;p=sliver-openvswitch.git

diff --git a/lib/entropy.c b/lib/entropy.c
index b844d64ae..02f56e0f4 100644
--- a/lib/entropy.c
+++ b/lib/entropy.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2009, 2010 Nicira Networks
+/* Copyright (c) 2008, 2009, 2010, 2011, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 #include "socket-util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(entropy)
+VLOG_DEFINE_THIS_MODULE(entropy);
 
 static const char urandom[] = "/dev/urandom";
 
@@ -39,7 +39,7 @@ get_entropy(void *buffer, size_t n)
 
     fd = open(urandom, O_RDONLY);
     if (fd < 0) {
-        VLOG_ERR("%s: open failed (%s)", urandom, strerror(errno));
+        VLOG_ERR("%s: open failed (%s)", urandom, ovs_strerror(errno));
         return errno ? errno : EINVAL;
     }
 
@@ -47,8 +47,7 @@ get_entropy(void *buffer, size_t n)
     close(fd);
 
     if (error) {
-        VLOG_ERR("%s: read error (%s)", urandom,
-                 error == EOF ? "unexpected end of file" : strerror(error));
+        VLOG_ERR("%s: read error (%s)", urandom, ovs_retval_to_string(error));
     }
     return error;
 }
@@ -60,6 +59,7 @@ get_entropy_or_die(void *buffer, size_t n)
 {
     int error = get_entropy(buffer, n);
     if (error) {
-        ovs_fatal(error, "%s: read error", urandom);
+        VLOG_FATAL("%s: read error (%s)",
+                   urandom, ovs_retval_to_string(error));
     }
 }