Merge tag 'upstream/1.2.0'

[psensor-pkg-debian.git] / src / notify_cmd.c

diff --git a/src/notify_cmd.c b/src/notify_cmd.c
index dd42e92..89f8b50 100644 (file)
--- a/src/notify_cmd.c
+++ b/src/notify_cmd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2013 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -17,17 +17,16 @@
  * 02110-1301 USA
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "notify_cmd.h"
-#include "cfg.h"
+#include <notify_cmd.h>
+#include <cfg.h>
 
 void notify_cmd(struct psensor *s)
 {
-       char *script;
-       char *v;
-       char *cmd;
+       char *script, *v, *cmd;
        int ret;
 
        script = config_get_notif_script();
@@ -35,14 +34,22 @@ void notify_cmd(struct psensor *s)
        if (script) {
                v = psensor_current_value_to_str(s, 1);
 
-               cmd = malloc(strlen(script)+1+1+strlen(s->id)+1+strlen(v)+1);
+               cmd = malloc(strlen(script)
+                            + 1
+                            + 1
+                            + strlen(s->id)
+                            + 1
+                            + 1
+                            + strlen(v)
+                            + 1);
+
                sprintf(cmd, "%s \"%s\" %s", script, s->id, v);
 
-               log_debug("execute cmd: %s", cmd);
+               log_fct("execute cmd: %s", cmd);
 
                ret = system(cmd);
 
-               log_debug("cmd returns: %d", ret);
+               log_fct("cmd returns: %d", ret);
 
                free(cmd);
                free(v);