git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include/openflow: Move union ofp_action away from headers.
[sliver-openvswitch.git]
/
lib
/
entropy.c
diff --git
a/lib/entropy.c
b/lib/entropy.c
index
1f1af50
..
02f56e0
100644
(file)
--- 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-39,7
+39,7
@@
get_entropy(void *buffer, size_t n)
fd = open(urandom, O_RDONLY);
if (fd < 0) {
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;
}
return errno ? errno : EINVAL;
}
@@
-59,6
+59,7
@@
get_entropy_or_die(void *buffer, size_t n)
{
int error = get_entropy(buffer, n);
if (error) {
{
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));
}
}
}
}