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

settings.c: replace some 'void *' with proper types.

Browse Source 
Commit 733fcca2c introduced named types settings_r and settings_w and
made the per-platform storage abstraction use those in place of 'void
*'. But a lot of the intermediate helper functions in the centralised
settings.c, like gpps() and wmap(), were still taking 'void *'. It
still worked, because of C's implicit casting, but it was avoiding the
type-checking advantages from making that change in the first place.
This commit is contained in:
Simon Tatham 2018-10-08 19:35:58 +01:00
parent a3a8b28528
commit 78d0022c70
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
settings.c
View File

@ -105,9 +105,9 @@ char *get_remote_username(Conf *conf)
} }
} }
static char *gpps_raw(void *handle, const char *name, const char *def) static char *gpps_raw(settings_r *sesskey, const char *name, const char *def)
{ {
char *ret = read_setting_s(handle, name); char *ret = read_setting_s(sesskey, name);
if (!ret) if (!ret)
ret = platform_default_s(name); ret = platform_default_s(name);
if (!ret) if (!ret)
@ -115,10 +115,10 @@ static char *gpps_raw(void *handle, const char *name, const char *def)
return ret; return ret;
} }
static void gpps(void *handle, const char *name, const char *def, static void gpps(settings_r *sesskey, const char *name, const char *def,
Conf *conf, int primary) Conf *conf, int primary)
{ {
char *val = gpps_raw(handle, name, def); char *val = gpps_raw(sesskey, name, def);
conf_set_str(conf, primary, val); conf_set_str(conf, primary, val);
sfree(val); sfree(val);
} }
@ -128,33 +128,35 @@ static void gpps(void *handle, const char *name, const char *def,
* format of a Filename or FontSpec is platform-dependent. So the * format of a Filename or FontSpec is platform-dependent. So the
* platform-dependent functions MUST return some sort of value. * platform-dependent functions MUST return some sort of value.
*/ */
static void gppfont(void *handle, const char *name, Conf *conf, int primary) static void gppfont(settings_r *sesskey, char *name,
Conf *conf, int primary)
{ {
FontSpec *result = read_setting_fontspec(handle, name); FontSpec *result = read_setting_fontspec(sesskey, name);
if (!result) if (!result)
result = platform_default_fontspec(name); result = platform_default_fontspec(name);
conf_set_fontspec(conf, primary, result); conf_set_fontspec(conf, primary, result);
fontspec_free(result); fontspec_free(result);
} }
static void gppfile(void *handle, const char *name, Conf *conf, int primary) static void gppfile(settings_r *sesskey, const char *name,
Conf *conf, int primary)
{ {
Filename *result = read_setting_filename(handle, name); Filename *result = read_setting_filename(sesskey, name);
if (!result) if (!result)
result = platform_default_filename(name); result = platform_default_filename(name);
conf_set_filename(conf, primary, result); conf_set_filename(conf, primary, result);
filename_free(result); filename_free(result);
} }
static int gppi_raw(void *handle, const char *name, int def) static int gppi_raw(settings_r *sesskey, const char *name, int def)
{ {
def = platform_default_i(name, def); def = platform_default_i(name, def);
return read_setting_i(handle, name, def); return read_setting_i(sesskey, name, def);
} }
static void gppi(void *handle, const char *name, int def, static void gppi(settings_r *sesskey, const char *name, int def,
Conf *conf, int primary) Conf *conf, int primary)
{ {
conf_set_int(conf, primary, gppi_raw(handle, name, def)); conf_set_int(conf, primary, gppi_raw(sesskey, name, def));
} }
/* /*
@ -164,7 +166,8 @@ static void gppi(void *handle, const char *name, int def,
* If there's no "=VALUE" (e.g. just NAME,NAME,NAME) then those keys * If there's no "=VALUE" (e.g. just NAME,NAME,NAME) then those keys
* are mapped to the empty string. * are mapped to the empty string.
*/ */
static int gppmap(void *handle, const char *name, Conf *conf, int primary) static int gppmap(settings_r *sesskey, const char *name,
Conf *conf, int primary)
{ {
char *buf, *p, *q, *key, *val; char *buf, *p, *q, *key, *val;
@ -178,7 +181,7 @@ static int gppmap(void *handle, const char *name, Conf *conf, int primary)
* Now read a serialised list from the settings and unmarshal it * Now read a serialised list from the settings and unmarshal it
* into its components. * into its components.
*/ */
buf = gpps_raw(handle, name, NULL); buf = gpps_raw(sesskey, name, NULL);
if (!buf) if (!buf)
return FALSE; return FALSE;
@ -231,8 +234,8 @@ static int gppmap(void *handle, const char *name, Conf *conf, int primary)
* Write a set of name/value pairs in the above format, or just the * Write a set of name/value pairs in the above format, or just the
* names if include_values is FALSE. * names if include_values is FALSE.
*/ */
static void wmap(void *handle, char const *outkey, Conf *conf, int primary, static void wmap(settings_w *sesskey, char const *outkey, Conf *conf,
int include_values) int primary, int include_values)
{ {
char *buf, *p, *key, *realkey; char *buf, *p, *key, *realkey;
const char *val, *q; const char *val, *q;
@ -293,7 +296,7 @@ static void wmap(void *handle, char const *outkey, Conf *conf, int primary,
} }
} }
*p = '\0'; *p = '\0';
write_setting_s(handle, outkey, buf); write_setting_s(sesskey, outkey, buf);
sfree(buf); sfree(buf);
} }
@ -403,7 +406,7 @@ static void gprefs_from_str(const char *str,
/* /*
* Read a preference list. * Read a preference list.
*/ */
static void gprefs(void *sesskey, const char *name, const char *def, static void gprefs(settings_r *sesskey, const char *name, const char *def,
const struct keyvalwhere *mapping, int nvals, const struct keyvalwhere *mapping, int nvals,
Conf *conf, int primary) Conf *conf, int primary)
{ {
@ -418,7 +421,7 @@ static void gprefs(void *sesskey, const char *name, const char *def,
/* /*
* Write out a preference list. * Write out a preference list.
*/ */
static void wprefs(void *sesskey, const char *name, static void wprefs(settings_w *sesskey, const char *name,
const struct keyvalwhere *mapping, int nvals, const struct keyvalwhere *mapping, int nvals,
Conf *conf, int primary) Conf *conf, int primary)
{ {
@ -452,36 +455,36 @@ static void wprefs(void *sesskey, const char *name,
sfree(buf); sfree(buf);
} }
static void write_clip_setting(void *handle, const char *savekey, static void write_clip_setting(settings_w *sesskey, const char *savekey,
Conf *conf, int confkey, int strconfkey) Conf *conf, int confkey, int strconfkey)
{ {
int val = conf_get_int(conf, confkey); int val = conf_get_int(conf, confkey);
switch (val) { switch (val) {
case CLIPUI_NONE: case CLIPUI_NONE:
default: default:
write_setting_s(handle, savekey, "none"); write_setting_s(sesskey, savekey, "none");
break; break;
case CLIPUI_IMPLICIT: case CLIPUI_IMPLICIT:
write_setting_s(handle, savekey, "implicit"); write_setting_s(sesskey, savekey, "implicit");
break; break;
case CLIPUI_EXPLICIT: case CLIPUI_EXPLICIT:
write_setting_s(handle, savekey, "explicit"); write_setting_s(sesskey, savekey, "explicit");
break; break;
case CLIPUI_CUSTOM: case CLIPUI_CUSTOM:
{ {
char *sval = dupcat("custom:", conf_get_str(conf, strconfkey), char *sval = dupcat("custom:", conf_get_str(conf, strconfkey),
(const char *)NULL); (const char *)NULL);
write_setting_s(handle, savekey, sval); write_setting_s(sesskey, savekey, sval);
sfree(sval); sfree(sval);
} }
break; break;
} }
} }
static void read_clip_setting(void *handle, const char *savekey, static void read_clip_setting(settings_r *sesskey, char *savekey,
int def, Conf *conf, int confkey, int strconfkey) int def, Conf *conf, int confkey, int strconfkey)
{ {
char *setting = read_setting_s(handle, savekey); char *setting = read_setting_s(sesskey, savekey);
int val; int val;
conf_set_str(conf, strconfkey, ""); conf_set_str(conf, strconfkey, "");