projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-print: Add missing "break".
[openvswitch]
/
lib
/
entropy.c
diff --git
a/lib/entropy.c
b/lib/entropy.c
index b844d64aeee03617791e663469e2eb427ad4e052..f38655cd2e1971fe806562c099c839385fc267f4 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
Nicira Networks
*
* 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.
@@
-24,7
+24,7
@@
#include "socket-util.h"
#include "vlog.h"
#include "socket-util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(entropy)
+VLOG_DEFINE_THIS_MODULE(entropy)
;
static const char urandom[] = "/dev/urandom";
static const char urandom[] = "/dev/urandom";
@@
-47,8
+47,7
@@
get_entropy(void *buffer, size_t n)
close(fd);
if (error) {
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;
}
}
return error;
}
@@
-60,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));
}
}
}
}