src/common.c: Move read_file_contents() to here.

src/common.c: move read_file_contents() from thermal plugin

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>

diff --git a/src/common.c b/src/common.c
index 39436178b65d736cbce4de17b5a7b741020a446c..bdab108c7baa270d8dff98639182be2747481b9b 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -893,4 +893,18 @@ int walk_directory (const char *dir, dirwalk_callback_f callback)
        return ok ? 0 : -1;
 }
 
+int read_file_contents (const char *filename, char *buf, int bufsize)
+{
+       FILE *fh;
+       int n;
+
+       if ((fh = fopen (filename, "r")) == NULL)
+               return -1;
+
+       n = fread(buf, 1, bufsize, fh);
+       fclose(fh);
+
+       return n;
+}
+
 

diff --git a/src/common.h b/src/common.h
index ca34e7817b372be61cd486f031a94ad169c37879..a5e2167b6c1e3565a96d2e399aee0616923f3133 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -203,5 +203,6 @@ int notification_init (notification_t *n, int severity, const char *message,
 
 typedef int (*dirwalk_callback_f)(const char *filename);
 int walk_directory (const char *dir, dirwalk_callback_f callback);
+int read_file_contents (const char *filename, char *buf, int bufsize);
 
 #endif /* COMMON_H */

diff --git a/src/thermal.c b/src/thermal.c
index 29ea05f5d18641b261e731295ae70c79996017fc..93781328be182879748a7d23965f152ba37720a3 100644 (file)
--- a/src/thermal.c
+++ b/src/thermal.c
@@ -61,20 +61,6 @@ static void thermal_submit (const char *plugin_instance, enum dev_type dt,
        plugin_dispatch_values (&vl);
 }
 
-static int read_file_contents (const char *filename, char *buf, int bufsize)
-{
-       FILE *fh;
-       int n;
-
-       if ((fh = fopen (filename, "r")) == NULL)
-               return -1;
-
-       n = fread(buf, 1, bufsize, fh);
-       fclose(fh);
-
-       return n;
-}
-
 static int thermal_sysfs_device_read (const char *name)
 {
        char filename[256];