Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-09-30 05:59:07 +00:00
Code Issues Releases Activity

Make hddtemp_{host,port} lua settings

Browse Source
This commit is contained in:
Pavel Labath 2010-08-25 19:16:56 +02:00
parent 31cbd710a6
commit b863f216b8
3 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conky.cc
View File

@ -2918,14 +2918,6 @@ char load_config_file(const char *f)
} }
} }
#endif /* BUILD_X11 */ #endif /* BUILD_X11 */
#ifdef HDDTEMP
CONF("hddtemp_host") {
set_hddtemp_host(value);
}
CONF("hddtemp_port") {
set_hddtemp_port(value);
}
#endif /* HDDTEMP */
CONF("pad_percents") { CONF("pad_percents") {
pad_percents = atoi(value); pad_percents = atoi(value);
} }

27
src/hddtemp.cc
View File

@ -41,11 +41,9 @@
#include <netinet/in.h> #include <netinet/in.h>
#define BUFLEN 512 #define BUFLEN 512
#define DEFAULT_PORT "7634"
#define DEFAULT_HOST "127.0.0.1"
static char *hddtemp_host = NULL; static conky::simple_config_setting<std::string> hddtemp_host("hddtemp_host", "localhost", false);
static char *hddtemp_port = NULL; static conky::simple_config_setting<std::string> hddtemp_port("hddtemp_port", "7634", false);
struct hdd_info { struct hdd_info {
hdd_info() : next(0) {} hdd_info() : next(0) {}
@ -57,18 +55,6 @@ struct hdd_info {
struct hdd_info hdd_info_head; struct hdd_info hdd_info_head;
void set_hddtemp_host(const char *host)
{
free_and_zero(hddtemp_host);
hddtemp_host = strdup(host);
}
void set_hddtemp_port(const char *port)
{
free_and_zero(hddtemp_port);
hddtemp_port = strdup(port);
}
static void __free_hddtemp_info(struct hdd_info *hdi) static void __free_hddtemp_info(struct hdd_info *hdi)
{ {
if (hdi->next) if (hdi->next)
@ -104,20 +90,17 @@ static void add_hddtemp_info(char *dev, short temp, char unit)
static char *fetch_hddtemp_output(void) static char *fetch_hddtemp_output(void)
{ {
int sockfd; int sockfd;
const char *dst_host, *dst_port;
char *buf = NULL; char *buf = NULL;
int buflen, offset = 0, rlen; int buflen, offset = 0, rlen;
struct addrinfo hints, *result, *rp; struct addrinfo hints, *result, *rp;
int i; int i;
dst_host = hddtemp_host ? hddtemp_host : DEFAULT_HOST;
dst_port = hddtemp_port ? hddtemp_port : DEFAULT_PORT;
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET; /* XXX: hddtemp has no ipv6 support (yet?) */ hints.ai_family = AF_INET; /* XXX: hddtemp has no ipv6 support (yet?) */
hints.ai_socktype = SOCK_STREAM; hints.ai_socktype = SOCK_STREAM;
if ((i = getaddrinfo(dst_host, dst_port, &hints, &result))) { if ((i = getaddrinfo(hddtemp_host.get(*state).c_str(),
hddtemp_port.get(*state).c_str(), &hints, &result))) {
NORM_ERR("getaddrinfo(): %s", gai_strerror(i)); NORM_ERR("getaddrinfo(): %s", gai_strerror(i));
return NULL; return NULL;
} }
@ -236,8 +219,6 @@ int update_hddtemp(void) {
void free_hddtemp(struct text_object *obj) void free_hddtemp(struct text_object *obj)
{ {
free_hddtemp_info(); free_hddtemp_info();
free_and_zero(hddtemp_host);
free_and_zero(hddtemp_port);
free_and_zero(obj->data.s); free_and_zero(obj->data.s);
} }

2
src/hddtemp.h
View File

@ -27,8 +27,6 @@
#ifndef HDDTEMP_H_ #ifndef HDDTEMP_H_
#define HDDTEMP_H_ #define HDDTEMP_H_
void set_hddtemp_host(const char *);
void set_hddtemp_port(const char *);
int update_hddtemp(void); int update_hddtemp(void);
void free_hddtemp(struct text_object *); void free_hddtemp(struct text_object *);
void print_hddtemp(struct text_object *, char *, int); void print_hddtemp(struct text_object *, char *, int);