X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fentropy.c;h=c1f08868795505b06a7bb76db6f36e9c3099d73a;hb=be812f2d2b0c948e5f52017c4df79645809fcb90;hp=b844d64aeee03617791e663469e2eb427ad4e052;hpb=e251c8d0050acf8d3f35c91b6d2708fab5314ce7;p=openvswitch diff --git a/lib/entropy.c b/lib/entropy.c index b844d64a..c1f08868 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 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"; @@ -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)); } }