~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cope with NULL labels in every control where it makes sense, and assert that
[sgt/putty]
/
settings.c
diff --git
a/settings.c
b/settings.c
index
c3f8c88
..
1de8e51
100644
(file)
--- a/
settings.c
+++ b/
settings.c
@@
-141,15
+141,17
@@
static void wprefs(void *sesskey, char *name,
write_setting_s(sesskey, name, buf);
}
write_setting_s(sesskey, name, buf);
}
-
void
save_settings(char *section, int do_host, Config * cfg)
+
char *
save_settings(char *section, int do_host, Config * cfg)
{
void *sesskey;
{
void *sesskey;
+ char *errmsg;
- sesskey = open_settings_w(section);
+ sesskey = open_settings_w(section
, &errmsg
);
if (!sesskey)
if (!sesskey)
- return;
+ return
errmsg
;
save_open_settings(sesskey, do_host, cfg);
close_settings_w(sesskey);
save_open_settings(sesskey, do_host, cfg);
close_settings_w(sesskey);
+ return NULL;
}
void save_open_settings(void *sesskey, int do_host, Config *cfg)
}
void save_open_settings(void *sesskey, int do_host, Config *cfg)
@@
-631,10
+633,7
@@
void load_open_settings(void *sesskey, int do_host, Config *cfg)
void do_defaults(char *session, Config * cfg)
{
void do_defaults(char *session, Config * cfg)
{
- if (session)
- load_settings(session, TRUE, cfg);
- else
- load_settings("Default Settings", FALSE, cfg);
+ load_settings(session, (session != NULL && *session), cfg);
}
static int sessioncmp(const void *av, const void *bv)
}
static int sessioncmp(const void *av, const void *bv)
@@
-675,7
+674,7
@@
void get_sesslist(struct sesslist *list, int allocate)
int len = strlen(otherbuf) + 1;
if (bufsize < buflen + len) {
bufsize = buflen + len + 2048;
int len = strlen(otherbuf) + 1;
if (bufsize < buflen + len) {
bufsize = buflen + len + 2048;
- list->buffer = sre
alloc(list->buffer, bufsize
);
+ list->buffer = sre
size(list->buffer, bufsize, char
);
}
strcpy(list->buffer + buflen, otherbuf);
buflen += strlen(list->buffer + buflen) + 1;
}
strcpy(list->buffer + buflen, otherbuf);
buflen += strlen(list->buffer + buflen) + 1;
@@
-683,7
+682,7
@@
void get_sesslist(struct sesslist *list, int allocate)
} while (ret);
enum_settings_finish(handle);
}
} while (ret);
enum_settings_finish(handle);
}
- list->buffer = sre
alloc(list->buffer, buflen + 1
);
+ list->buffer = sre
size(list->buffer, buflen + 1, char
);
list->buffer[buflen] = '\0';
/*
list->buffer[buflen] = '\0';
/*
@@
-702,7
+701,7
@@
void get_sesslist(struct sesslist *list, int allocate)
p++;
}
p++;
}
- list->sessions = s
malloc((list->nsessions + 1) * sizeof(char *)
);
+ list->sessions = s
newn(list->nsessions + 1, char *
);
list->sessions[0] = "Default Settings";
p = list->buffer;
i = 1;
list->sessions[0] = "Default Settings";
p = list->buffer;
i = 1;