Fix up portability of memory pool handling a bit.

[pulseaudio] / src / pulsecore / random.c

diff --git a/src/pulsecore/random.c b/src/pulsecore/random.c
index 3d3357a5ed330714c25a5b4f8be518be185dff39..7908e87d86ef548d19fef481a23ae3b8a3c5c383 100644 (file)
--- a/src/pulsecore/random.c
+++ b/src/pulsecore/random.c
@@ -61,7 +61,7 @@ static int random_proper(void *ret_data, size_t length) {
 
         if ((fd = open(*device, O_RDONLY)) >= 0) {
 
-            if ((r = pa_loop_read(fd, ret_data, length)) < 0 || (size_t) r != length)
+            if ((r = pa_loop_read(fd, ret_data, length, NULL)) < 0 || (size_t) r != length)
                 ret = -1;
 
             close(fd);
@@ -81,7 +81,7 @@ void pa_random_seed(void) {
 
     if (random_proper(&seed, sizeof(unsigned int)) < 0) {
         if (!has_whined)
-            pa_log_warn(__FILE__": failed to get proper entropy. Falling back to seeding with current time.");
+            pa_log_warn("failed to get proper entropy. Falling back to seeding with current time.");
         has_whined = 1;
 
         seed = (unsigned int) time(NULL);
@@ -100,7 +100,7 @@ void pa_random(void *ret_data, size_t length) {
         return;
 
     if (!has_whined)
-        pa_log_warn(__FILE__": failed to get proper entropy. Falling back to unsecure pseudo RNG.");
+        pa_log_warn("failed to get proper entropy. Falling back to unsecure pseudo RNG.");
     has_whined = 1;
 
     for (p = ret_data, l = length; l > 0; p++, l--)