Merge remote-tracking branch 'github/pr/387'

[collectd.git] / src / entropy.c

diff --git a/src/entropy.c b/src/entropy.c
index 7e903953bc10a55dad0f01d17fe231e37d8f4496..d56be6dc1df8f4645eb7c4f04a820ee978d87a8b 100644 (file)
--- a/src/entropy.c
+++ b/src/entropy.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/entropy.c
- * Copyright (C) 2005,2006  Florian octo Forster
+ * Copyright (C) 2007  Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -23,15 +23,12 @@
 #include "common.h"
 #include "plugin.h"
 
-#if KERNEL_LINUX
-# define ENTROPY_HAVE_READ 1
-#else
-# define ENTROPY_HAVE_READ 0
+#if !KERNEL_LINUX
+# error "No applicable input method."
 #endif
 
 #define ENTROPY_FILE "/proc/sys/kernel/random/entropy_avail"
 
-#if ENTROPY_HAVE_READ
 static void entropy_submit (double entropy)
 {
        value_t values[1];
@@ -41,18 +38,15 @@ static void entropy_submit (double entropy)
 
        vl.values = values;
        vl.values_len = 1;
-       vl.time = time (NULL);
-       strcpy (vl.host, hostname_g);
-       strcpy (vl.plugin, "entropy");
-       strcpy (vl.plugin_instance, "");
-       strcpy (vl.type_instance, "");
+       sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+       sstrncpy (vl.plugin, "entropy", sizeof (vl.plugin));
+       sstrncpy (vl.type, "entropy", sizeof (vl.type));
 
-       plugin_dispatch_values ("entropy", &vl);
+       plugin_dispatch_values (&vl);
 }
 
 static int entropy_read (void)
 {
-#if KERNEL_LINUX
        double entropy;
        FILE *fh;
        char buffer[64];
@@ -72,15 +66,11 @@ static int entropy_read (void)
        
        if (entropy > 0.0)
                entropy_submit (entropy);
-#endif /* KERNEL_LINUX */
 
        return (0);
 }
-#endif /* ENTROPY_HAVE_READ */
 
 void module_register (void)
 {
-#if ENTROPY_HAVE_READ
        plugin_register_read ("entropy", entropy_read);
-#endif
 } /* void module_register */