Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-04 13:08:31 +00:00
Code Issues Releases Activity

Fix compilation errors.

Browse Source 
I hope I didn't break the alias stuff.
This commit is contained in:
Brenden Matthews 2009-03-15 18:34:40 -06:00
parent 1f51863616
commit 513752626e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/conky.c
View File

@ -2719,6 +2719,8 @@ static int extract_variable_text_internal(struct text_object *retval, const char
char *p, *s, *orig_p; char *p, *s, *orig_p;
long line; long line;
void *ifblock_opaque = NULL; void *ifblock_opaque = NULL;
char *tmp_p;
char *arg = 0;
p = strndup(const_p, max_user_text - 1); p = strndup(const_p, max_user_text - 1);
while (text_contains_templates(p)) { while (text_contains_templates(p)) {
@ -2799,8 +2801,7 @@ static int extract_variable_text_internal(struct text_object *retval, const char
strncpy(buf, var, 255); strncpy(buf, var, 255);
} }
char *tmp_p; arg = 0;
char *arg = 0;
/* split arg */ /* split arg */
if (strchr(buf, ' ')) { if (strchr(buf, ' ')) {
@ -7228,7 +7229,7 @@ static void load_config_file(const char *f)
CONF("temperature_unit") { CONF("temperature_unit") {
if (!value) { if (!value) {
ERR("config option 'temperature_unit' needs an argument"); ERR("config option 'temperature_unit' needs an argument, either 'celsius' or 'fahrenheit'");
} else if (set_temp_output_unit(value)) { } else if (set_temp_output_unit(value)) {
ERR("temperature_unit: incorrect argument"); ERR("temperature_unit: incorrect argument");
} }
@ -7236,13 +7237,12 @@ static void load_config_file(const char *f)
CONF("alias") { CONF("alias") {
if (value) { if (value) {
char *skey, *svalue, *oldvalue; char skey[256], svalue[256];
if (sscanf(value, "%a[0-9a-zA-Z_] %a[^\n]", &skey, &svalue) == 2) { char *oldvalue;
if (sscanf(value, "%255[0-9a-zA-Z_] %255[^\n]", skey, svalue) == 2) {
oldvalue = getenv(skey); oldvalue = getenv(skey);
if(oldvalue == NULL) { if (oldvalue == NULL) {
setenv(skey, svalue, 0); setenv(skey, svalue, 0);
free(skey);
free(svalue);
} }
//PS: Don't free oldvalue, it's the real envvar, not a copy //PS: Don't free oldvalue, it's the real envvar, not a copy
} else { } else {