Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 20:31:17 +00:00
Code Issues Releases Activity

ISO C++ forbids variable length arrays

Browse Source
This commit is contained in:
Phil Sutter 2009-12-17 22:19:58 +01:00
parent de049dcbde
commit 1724a1fe49
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/conky.cc
View File

@ -721,8 +721,10 @@ void generate_text_internal(char *p, int p_max_size, struct text_object root)
struct text_object *obj;
size_t a;
#ifdef HAVE_ICONV
char buff_in[p_max_size];
buff_in[0] = 0;
char *buff_in;
buff_in = (char *)malloc(p_max_size);
memset(buff_in, 0, p_max_size);
#endif /* HAVE_ICONV */
p[0] = 0;
@ -766,6 +768,9 @@ void generate_text_internal(char *p, int p_max_size, struct text_object root)
/* load any new fonts we may have had */
load_fonts();
#endif /* X11 */
#ifdef HAVE_ICONV
free(buff_in);
#endif /* HAVE_ICONV */
}
void evaluate(const char *text, char *p, int p_max_size)
@ -1863,9 +1868,9 @@ static void main_loop(void)
info.looped = 0;
while (terminate == 0 && (total_run_times == 0 || info.looped < total_run_times)) {
if(update_interval_bat != NOBATTERY && update_interval_bat != update_interval_old) {
char buf[max_user_text];
char buf[64];
get_battery_short_status(buf, max_user_text, "BAT0");
get_battery_short_status(buf, 64, "BAT0");
if(buf[0] == 'D') {
update_interval = update_interval_bat;
} else {
@ -2570,7 +2575,7 @@ static void set_default_configurations(void)
mpd_set_host(mpd_env_host);
} else {
/* MPD_HOST contains a password */
char mpd_password[mpd_hostpart - mpd_env_host + 1];
char *mpd_password = (char *)malloc(mpd_hostpart - mpd_env_host + 1);
snprintf(mpd_password, mpd_hostpart - mpd_env_host + 1, "%s", mpd_env_host);
if (!strlen(mpd_hostpart + 1)) {
@ -2580,6 +2585,7 @@ static void set_default_configurations(void)
}
mpd_set_password(mpd_password, 1);
free(mpd_password);
}
}

7
src/core.cc
View File

@ -1588,11 +1588,12 @@ struct text_object *construct_text_object(const char *s, const char *arg, long
obj->callbacks.print = &print_apcupsd_lastxfer;
#endif /* APCUPSD */
END {
char buf[text_buffer_size];
char *buf = (char *)malloc(text_buffer_size);
NORM_ERR("unknown variable %s", s);
snprintf(buf, text_buffer_size, "${%s}", s);
obj_be_plain_text(obj, buf);
free(buf);
}
#undef OBJ
#undef OBJ_IF
@ -1685,7 +1686,7 @@ int extract_variable_text_internal(struct text_object *retval, const char *const
s = p;
if (*p != '$') {
char buf[text_buffer_size];
char *buf = (char *)malloc(text_buffer_size);
const char *var;
/* variable is either $foo or ${foo} */
@ -1732,6 +1733,7 @@ int extract_variable_text_internal(struct text_object *retval, const char *const
if (obj) {
append_object(retval, obj);
}
free(buf);
continue;
}
@ -1764,6 +1766,7 @@ int extract_variable_text_internal(struct text_object *retval, const char *const
if (obj != NULL) {
append_object(retval, obj);
}
free(buf);
continue;
} else {
obj = create_plain_text("$");