X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/d4e1d59118d011faaf349aa33a5b196cdea522ed..ae62eaeb01088430162fa96e8cca35f721ff376d:/unix/uxucs.c diff --git a/unix/uxucs.c b/unix/uxucs.c index ec881c51..20f25d4e 100644 --- a/unix/uxucs.c +++ b/unix/uxucs.c @@ -21,7 +21,7 @@ int is_dbcs_leadbyte(int codepage, char byte) return 0; /* we don't do DBCS */ } -int mb_to_wc(int codepage, int flags, char *mbstr, int mblen, +int mb_to_wc(int codepage, int flags, const char *mbstr, int mblen, wchar_t *wcstr, int wclen) { if (codepage == DEFAULT_CODEPAGE) { @@ -59,7 +59,7 @@ int mb_to_wc(int codepage, int flags, char *mbstr, int mblen, NULL, NULL, 0); } -int wc_to_mb(int codepage, int flags, wchar_t *wcstr, int wclen, +int wc_to_mb(int codepage, int flags, const wchar_t *wcstr, int wclen, char *mbstr, int mblen, char *defchr, int *defused, struct unicode_data *ucsdata) { @@ -139,7 +139,7 @@ int init_ucs(struct unicode_data *ucsdata, char *linecharset, /* * Failing that, line_codepage should be decoded from the - * specification in cfg. + * specification in conf. */ if (ucsdata->line_codepage == CS_NONE) ucsdata->line_codepage = decode_codepage(linecharset); @@ -162,7 +162,8 @@ int init_ucs(struct unicode_data *ucsdata, char *linecharset, * in the line codepage into Unicode. */ for (i = 0; i < 256; i++) { - char c[1], *p; + char c[1]; + const char *p; wchar_t wc[1]; int len; c[0] = i; @@ -216,7 +217,8 @@ int init_ucs(struct unicode_data *ucsdata, char *linecharset, * simply CP437. */ for (i = 0; i < 256; i++) { - char c[1], *p; + char c[1]; + const char *p; wchar_t wc[1]; int len; c[0] = i;