nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-03 04:22:47 -05:00
Code Issues Projects Releases Wiki Activity

Make the backend_init error message dynamic. (NFC)

Browse Source 
Now, instead of a 'const char *' in the static data segment, error
messages returned from backend setup are dynamically allocated and
freed by the caller.

This will allow me to make the messages much more specific (including
errno values and the like). However, this commit is pure refactoring:
I've _just_ changed the allocation policy, and left all the messages
alone.
This commit is contained in:
Simon Tatham
2020-04-18 13:28:33 +01:00
parent d9c4ce9fd8
commit df2994a05a
14 changed files with 88 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
supdup.c
View File

@ -635,11 +635,11 @@ static void supdup_send_config(Supdup *supdup)
* Also places the canonical host name into `realhost'. It must be
* freed by the caller.
*/
static const char *supdup_init(const BackendVtable *x, Seat *seat,
Backend **backend_handle,
LogContext *logctx, Conf *conf,
const char *host, int port, char **realhost,
bool nodelay, bool keepalive)
static char *supdup_init(const BackendVtable *x, Seat *seat,
Backend **backend_handle,
LogContext *logctx, Conf *conf,
const char *host, int port, char **realhost,
bool nodelay, bool keepalive)
{
static const PlugVtable fn_table = {
.log = supdup_log,
@ -696,7 +696,7 @@ static const char *supdup_init(const BackendVtable *x, Seat *seat,
addr = name_lookup(host, port, realhost, supdup->conf, addressfamily, NULL, "");
if ((err = sk_addr_error(addr)) != NULL) {
sk_addr_free(addr);
return err;
return dupstr(err);
}
if (port < 0)
@ -708,7 +708,7 @@ static const char *supdup_init(const BackendVtable *x, Seat *seat,
supdup->s = new_connection(addr, *realhost, port, false, true,
nodelay, keepalive, &supdup->plug, supdup->conf);
if ((err = sk_socket_error(supdup->s)) != NULL)
return err;
return dupstr(err);
supdup->pinger = pinger_new(supdup->conf, &supdup->backend);