X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/07b2a9cdcc1dda55516a50708556f1f65c6e9418..7bd029472d96162f71f61df67baedc00fc0bb1a8:/unicode.c

diff --git a/unicode.c b/unicode.c
index d1428bb6..c68017ae 100644
--- a/unicode.c
+++ b/unicode.c
@@ -516,12 +516,12 @@ void init_ucs(Config *cfg, struct unicode_data *ucsdata)
 	    if (DIRECT_FONT(ucsdata->unitab_line[i]))
 		continue;
 	    if (!ucsdata->uni_tbl) {
-		ucsdata->uni_tbl = smalloc(256 * sizeof(char *));
+		ucsdata->uni_tbl = snewn(256, char *);
 		memset(ucsdata->uni_tbl, 0, 256 * sizeof(char *));
 	    }
 	    j = ((ucsdata->unitab_line[i] >> 8) & 0xFF);
 	    if (!ucsdata->uni_tbl[j]) {
-		ucsdata->uni_tbl[j] = smalloc(256 * sizeof(char));
+		ucsdata->uni_tbl[j] = snewn(256, char);
 		memset(ucsdata->uni_tbl[j], 0, 256 * sizeof(char));
 	    }
 	    ucsdata->uni_tbl[j][ucsdata->unitab_line[i] & 0xFF] = i;
@@ -1094,7 +1094,7 @@ int decode_codepage(char *cp_name)
     return codepage;
 }
 
-char *cp_name(int codepage)
+const char *cp_name(int codepage)
 {
     const struct cp_list_item *cpi, *cpno;
     static char buf[32];
@@ -1134,7 +1134,7 @@ char *cp_name(int codepage)
  * Return the nth code page in the list, for use in the GUI
  * configurer.
  */
-char *cp_enumerate(int index)
+const char *cp_enumerate(int index)
 {
     if (index < 0 || index >= lenof(cp_list))
 	return NULL;