diskio: convert print functions to match common signature

[monky] / src / smapi.c

diff --git a/src/smapi.c b/src/smapi.c
index 25f3e45..aa2ea2f 100644 (file)
--- a/src/smapi.c
+++ b/src/smapi.c
@@ -1,7 +1,10 @@
-/* smapi.c:  conky support for IBM Thinkpad smapi
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ * smapi.c:  conky support for IBM Thinkpad smapi
  *
  * Copyright (C) 2007 Phil Sutter <Phil@nwl.cc>
- * 
+ *
  * This library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -17,12 +20,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  * USA.
  *
- * $Id$
- *
  */
-#include "conky.h"
+#define _GNU_SOURCE
+#include "conky.h"     /* text_buffer_size, PACKAGE_NAME, maybe more */
+#include "smapi.h"
+#include "logging.h"
 #include <stdio.h>
-#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #define SYS_SMAPI_PATH "/sys/devices/platform/smapi"
 
@@ -30,48 +37,40 @@ int smapi_bat_installed(int idx)
 {
        char path[128];
        struct stat sb;
-       char *str;
+       int ret = 0;
 
        snprintf(path, 127, SYS_SMAPI_PATH "/BAT%i", idx);
        if (!stat(path, &sb) && (sb.st_mode & S_IFMT) == S_IFDIR) {
                snprintf(path, 127, SYS_SMAPI_PATH "/BAT%i/installed", idx);
-               str = smapi_read_str(path);
-               if(str && ! strcmp(str, "1"))
-                       return 1;
+               ret = (smapi_read_int(path) == 1) ? 1 : 0;
        }
-       return 0;
+       return ret;
 
 }
 
-char *smapi_read_str(char *path)
+char *smapi_read_str(const char *path)
 {
        FILE *fp;
-       char *str;
-       if ((fp = fopen(path, "r")) == NULL)
-               return NULL;
-       if (fscanf(fp, "%as\n", &str) != 1) {
+       char str[256] = "failed";
+       if ((fp = fopen(path, "r")) != NULL) {
+               fscanf(fp, "%255s\n", str);
                fclose(fp);
-               return NULL;
        }
-       fclose(fp);
-       return str;
+       return strndup(str, text_buffer_size);
 }
 
-int smapi_read_int(char *path)
+int smapi_read_int(const char *path)
 {
        FILE *fp;
-       int i;
-       if ((fp = fopen(path, "r")) == NULL)
-               return 0;
-       if (fscanf(fp, "%i\n", &i) != 1) {
+       int i = 0;
+       if ((fp = fopen(path, "r")) != NULL) {
+               fscanf(fp, "%i\n", &i);
                fclose(fp);
-               return 0;
        }
-       fclose(fp);
        return i;
 }
 
-char *smapi_get_str(char *fname)
+char *smapi_get_str(const char *fname)
 {
        char path[128];
        if(snprintf(path, 127, SYS_SMAPI_PATH "/%s", fname) < 0)
@@ -80,7 +79,7 @@ char *smapi_get_str(char *fname)
        return smapi_read_str(path);
 }
 
-char *smapi_get_bat_str(int idx, char *fname)
+char *smapi_get_bat_str(int idx, const char *fname)
 {
        char path[128];
        if(snprintf(path, 127, SYS_SMAPI_PATH "/BAT%i/%s", idx, fname) < 0)
@@ -88,7 +87,7 @@ char *smapi_get_bat_str(int idx, char *fname)
        return smapi_read_str(path);
 }
 
-int smapi_get_bat_int(int idx, char *fname)
+int smapi_get_bat_int(int idx, const char *fname)
 {
        char path[128];
        if(snprintf(path, 127, SYS_SMAPI_PATH "/BAT%i/%s", idx, fname) < 0)
@@ -96,14 +95,14 @@ int smapi_get_bat_int(int idx, char *fname)
        return smapi_read_int(path);
 }
 
-char *smapi_get_bat_val(char *args)
+char *smapi_get_bat_val(const char *args)
 {
-       char *fname;
+       char fname[128];
        int idx, cnt;
 
        if(sscanf(args, "%i %n", &idx, &cnt) <= 0 ||
-          !(fname = strdup(args + cnt))) {
-               ERR("smapi: wrong arguments, should be 'bat,<int>,<str>'");
+          snprintf(fname, 127, "%s", (args + cnt)) < 0) {
+               NORM_ERR("smapi: wrong arguments, should be 'bat,<int>,<str>'");
                return NULL;
        }
 
@@ -113,11 +112,11 @@ char *smapi_get_bat_val(char *args)
        return smapi_get_bat_str(idx, fname);
 }
 
-char *smapi_get_val(char *args)
+char *smapi_get_val(const char *args)
 {
-       char *str;
+       char str[128];
 
-       if(!args || sscanf(args, "%as", &str) <= 0)
+       if(!args || sscanf(args, "%127s", str) <= 0)
                return NULL;
 
        if(!strcmp(str, "bat"))