break;
}
- selitems = smalloc(selcount * sizeof(int));
+ selitems = snewn(selcount, int);
if (selitems) {
int count = SendDlgItemMessage(hwnd, IDN_LIST,
LB_GETSELITEMS,
size +=
strlen(events[selitems[i]]) + sizeof(sel_nl);
- clipdata = smalloc(size);
+ clipdata = snewn(size, char);
if (clipdata) {
char *p = clipdata;
for (i = 0; i < count; i++) {
ctrlbox = ctrl_new_box();
setup_config_box(ctrlbox, &sesslist, FALSE, 0);
win_setup_config_box(ctrlbox, &dp.hwnd, (help_path != NULL), FALSE);
+ dp_init(&dp);
winctrl_init(&ctrls_base);
winctrl_init(&ctrls_panel);
- dp.controltrees[0] = &ctrls_base;
- dp.controltrees[1] = &ctrls_panel;
- dp.nctrltrees = 2;
+ dp_add_tree(&dp, &ctrls_base);
+ dp_add_tree(&dp, &ctrls_panel);
dp.errtitle = "PuTTY Error";
dp.data = &cfg;
- dp.ended = FALSE;
- dp.lastfocused = NULL;
- memset(dp.shortcuts, 0, sizeof(dp.shortcuts));
dp.shortcuts['g'] = TRUE; /* the treeview: `Cate&gory' */
get_sesslist(&sesslist, TRUE);
get_sesslist(&sesslist, FALSE);
ctrl_free_box(ctrlbox);
- winctrl_cleanup(&ctrls_base);
winctrl_cleanup(&ctrls_panel);
+ winctrl_cleanup(&ctrls_base);
+ dp_cleanup(&dp);
return ret;
}
ctrlbox = ctrl_new_box();
setup_config_box(ctrlbox, NULL, TRUE, cfg.protocol);
win_setup_config_box(ctrlbox, &dp.hwnd, (help_path != NULL), TRUE);
+ dp_init(&dp);
winctrl_init(&ctrls_base);
winctrl_init(&ctrls_panel);
- dp.controltrees[0] = &ctrls_base;
- dp.controltrees[1] = &ctrls_panel;
- dp.nctrltrees = 2;
+ dp_add_tree(&dp, &ctrls_base);
+ dp_add_tree(&dp, &ctrls_panel);
dp.errtitle = "PuTTY Error";
dp.data = &cfg;
- dp.ended = FALSE;
- dp.lastfocused = NULL;
- memset(dp.shortcuts, 0, sizeof(dp.shortcuts));
dp.shortcuts['g'] = TRUE; /* the treeview: `Cate&gory' */
ret =
ctrl_free_box(ctrlbox);
winctrl_cleanup(&ctrls_base);
winctrl_cleanup(&ctrls_panel);
+ dp_cleanup(&dp);
if (!ret)
cfg = backup_cfg; /* structure copy */
if (nevents >= negsize) {
negsize += 64;
- events = srealloc(events, negsize * sizeof(*events));
+ events = sresize(events, negsize, char *);
}
time(&t);
strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S\t",
localtime(&t));
- events[nevents] = smalloc(strlen(timebuf) + strlen(string) + 1);
+ events[nevents] = snewn(strlen(timebuf) + strlen(string) + 1, char);
strcpy(events[nevents], timebuf);
strcat(events[nevents], string);
if (logbox) {