From de67801b0fd3dfa11777c1ef86cd617baf376b7b Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sun, 1 Oct 2017 13:38:35 +0100 Subject: Use a proper union in struct config_item. This allows me to use different types for the mutable, dynamically allocated string value in a C_STRING control and the fixed constant list of option names in a C_CHOICES. --- midend.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'midend.c') diff --git a/midend.c b/midend.c index 913b322..1f5f077 100644 --- a/midend.c +++ b/midend.c @@ -1360,7 +1360,6 @@ config_item *midend_get_config(midend *me, int which, char **wintitle) ret[0].name = "Game random seed"; else ret[0].name = "Game ID"; - ret[0].ival = 0; /* * For CFG_DESC the text going in here will be a string * encoding of the restricted parameters, plus a colon, @@ -1379,13 +1378,12 @@ config_item *midend_get_config(midend *me, int which, char **wintitle) rest = me->seedstr ? me->seedstr : ""; sep = '#'; } - ret[0].sval = snewn(strlen(parstr) + strlen(rest) + 2, char); - sprintf(ret[0].sval, "%s%c%s", parstr, sep, rest); + ret[0].u.string.sval = snewn(strlen(parstr) + strlen(rest) + 2, char); + sprintf(ret[0].u.string.sval, "%s%c%s", parstr, sep, rest); sfree(parstr); ret[1].type = C_END; - ret[1].name = ret[1].sval = NULL; - ret[1].ival = 0; + ret[1].name = NULL; return ret; } @@ -1620,7 +1618,7 @@ char *midend_set_config(midend *me, int which, config_item *cfg) case CFG_SEED: case CFG_DESC: - error = midend_game_id_int(me, cfg[0].sval, + error = midend_game_id_int(me, cfg[0].u.string.sval, (which == CFG_SEED ? DEF_SEED : DEF_DESC)); if (error) return error; -- cgit v1.1