From 31b996e36947d05b76a36f63ed7c20374187b574 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Fri, 19 Sep 2014 09:29:17 +0200
Subject: [PATCH] cleanup logging

---
 src/lib/hdd_atasmart.c | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/lib/hdd_atasmart.c b/src/lib/hdd_atasmart.c
index 7920d93..051e09c 100644
--- a/src/lib/hdd_atasmart.c
+++ b/src/lib/hdd_atasmart.c
@@ -74,43 +74,34 @@ static void analyze_disk(const char *dname)
 	struct stat st;
 	uint64_t size;
 
-	log_debug("analyze_disk(hdd_atasmart): %s", dname);
+	log_fct("Analyze %s", dname);
 
 	f = open(dname, O_RDONLY|O_NOCTTY|O_NONBLOCK|O_CLOEXEC);
 
 	if (f < 0) {
-		log_debug("analyze_disk(hdd_atasmart): Could not open file %s: %s",
-			  dname,
-			  strerror(errno));
+		log_fct("Could not open file %s: %s", dname, strerror(errno));
 		goto fail;
 	}
 
 	if (fstat(f, &st) < 0) {
-		log_debug("analyze_disk(hdd_atasmart): fstat fails %s: %s",
-			  dname,
-			  strerror(errno));
+		log_fct("fstat fails %s: %s", dname, strerror(errno));
 		goto fail;
 	}
 
 	if (!S_ISBLK(st.st_mode)) {
-		log_debug("analyze_disk(hdd_atasmart): !S_ISBLK fails %s",
-			  dname);
+		log_fct("!S_ISBLK fails %s", dname);
 		goto fail;
 	}
 
 	size = (uint64_t)-1;
 	/* So, it's a block device. Let's make sure the ioctls work */
 	if (ioctl(f, BLKGETSIZE64, &size) < 0) {
-		log_debug("analyze_disk(hdd_atasmart): ioctl fails %s: %s",
-			  dname,
-			  strerror(errno));
+		log_fct("ioctl fails %s: %s", dname, strerror(errno));
 		goto fail;
 	}
 
 	if (size <= 0 || size == (uint64_t) -1) {
-		log_debug("analyze_disk(hdd_atasmart): ioctl wrong size %s: %ld",
-			  dname,
-			  size);
+		log_fct("ioctl wrong size %s: %ld", dname, size);
 		goto fail;
 	}
 
@@ -125,14 +116,14 @@ struct psensor **hdd_psensor_list_add(struct psensor **sensors,
 	SkDisk *disk;
 	struct psensor *sensor, **tmp_sensors, **result;
 
-	log_debug("hdd_psensor_list_add(hdd_atasmart)");
+	log_fct_enter();
 
 	paths = dir_list("/dev", filter_sd);
 
 	result = sensors;
 	tmp = paths;
 	while (*tmp) {
-		log_debug("hdd_psensor_list_add(hdd_atasmart) open %s", *tmp);
+		log_fct("Open %s", *tmp);
 
 		if (!sk_disk_open(*tmp, &disk)) {
 			id = malloc(strlen(PROVIDER_NAME)
@@ -153,7 +144,8 @@ struct psensor **hdd_psensor_list_add(struct psensor **sensors,
 
 			result = tmp_sensors;
 		} else {
-			log_err(_("atasmart: sk_disk_open() failure: %s."),
+			log_err(_("%s: sk_disk_open() failure: %s."),
+				PROVIDER_NAME,
 				*tmp);
 			analyze_disk(*tmp);
 		}
@@ -163,6 +155,8 @@ struct psensor **hdd_psensor_list_add(struct psensor **sensors,
 
 	paths_free(paths);
 
+	log_fct_exit();
+
 	return result;
 }
 
@@ -187,9 +181,7 @@ void hdd_psensor_list_update(struct psensor **sensors)
 				if (!ret) {
 					c = (kelvin - 273150) / 1000;
 					psensor_set_current_value(s, c);
-					log_debug("hdd_psensor_list_update(hdd_atasmart): %s %.2f",
-						  s->id,
-						  c);
+					log_fct("%s %.2f", s->id, c);
 				}
 			}
 		}
-- 
2.7.4