7115607 cmd/auto_ef compilation fails on b175a - wrong iconv args (backport of s11u1:fb701ba7adfd)
--- a/src/cmd/auto_ef/auto_ef_str.c Mon Nov 14 18:08:44 2011 +0100
+++ b/src/cmd/auto_ef/auto_ef_str.c Mon Nov 28 09:40:57 2011 +0100
@@ -129,7 +129,8 @@
}
for (i = 0; i < ICONV_LOCALE_MAX; i++) {
- const char *p, *context;
+ const char *p;
+ char *context;
int flag;
int succeed_flag = 0;
int tmp_bufsize = 0;
--- a/src/cmd/auto_ef/auto_ef_util.c Mon Nov 14 18:08:44 2011 +0100
+++ b/src/cmd/auto_ef/auto_ef_util.c Mon Nov 28 09:40:57 2011 +0100
@@ -38,7 +38,7 @@
int HashTableOpen(char *, srd *, double *, double *);
void get_hash_name(char *, char *);
int Regist_ASCII_ISO2022JP(int, char *, _auto_ef_t *);
-int IsAsciiOr2022_buf(const char *, int, char *);
+int IsAsciiOr2022_buf(char *, int, char *);
int Is2022KROrCN(int, char *, char *, size_t, _auto_ef_t *);
int Hash(unsigned char, unsigned char);
int TotalScore_buf(const char *, double *, int, srd *, double *, double *);
@@ -274,7 +274,7 @@
{
iconv_t cd;
- const char *context;
+ char *context;
char *convert;
char *tbuf, *retbuf;
size_t fsize, tsize;
@@ -566,13 +566,14 @@
return (0);
}
-int IsAsciiOr2022_buf(const char *input_buf, int buf_size,
+int IsAsciiOr2022_buf(char *input_buf, int buf_size,
char *from_encoding) {
char *tbuf;
iconv_t cd;
char *convert;
- const char *context, *p;
+ char *context;
+ const char *p;
size_t fsize, tsize, ret;
int i;
int tmp_bufsize = 0;