ext/iconv fix solaris/illumos which can support const/non const versi…

[devnexen]

…ons.

[devnexen]

cc @petk would you mind trying this branch ? Thanks :)

[petk]

I've checked it on Solaris 11.4 and it builds fine. But I'm not exactly sure what to test here. With or without this patch there are 9 failing tests in ext/iconv:

=====================================================================
FAILED TEST SUMMARY
---------------------------------------------------------------------
Bug #52211 (iconv() returns part of string on error) [ext/iconv/tests/bug52211.phpt]
EUC-JP to ISO-2022-JP [ext/iconv/tests/eucjp2iso2022jp.phpt]
iconv_substr() with out of bounds offset [ext/iconv/tests/iconv_substr_out_of_bounds.phpt]
Bug #37773 (iconv_substr() gives "Unknown error" when string length = 1") [ext/iconv/tests/bug37773.phpt]
Test the basics to function iconv. [ext/iconv/tests/iconv_basic_001.phpt]
iconv() test 3 [ext/iconv/tests/iconv003.phpt]
Bug #69840 (iconv_substr() doesn't work with UTF-16BE) [ext/iconv/tests/bug69840.phpt]
iconv_strrpos() [ext/iconv/tests/iconv_strrpos.phpt]
iconv_mime_encode() [ext/iconv/tests/iconv_mime_encode.phpt]
=====================================================================

[devnexen]

It is not resolving anything but a build warning concerning the iconv api itself.

e.g.

if (iconv(cd, (**ICONV_CONST**char**)&in_p, &in_left, (char**) &out_p, &out_left) == (size_t)-1) {

[petk]

With this patch applied I get more warnings:

Details

/export/home/petk/projects/php-src/ext/iconv/iconv.c: In function ‘_php_iconv_appendl’:
/export/home/petk/projects/php-src/ext/iconv/iconv.c:373:39: warning: passing argument 2 of ‘iconv’ from incompatible pointer type [-Wincompatible-pointer-types]
373 | if (iconv(cd, (ICONV_CONST char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| const char **
In file included from /export/home/petk/projects/php-src/ext/iconv/iconv.c:36:
/usr/include/iconv.h:97:32: note: expected ‘char ** restrict’ but argument is of type ‘const char **’
97 | extern size_t iconv(iconv_t, char **_RESTRICT_KYWD,
| ^
/export/home/petk/projects/php-src/ext/iconv/iconv.c: In function ‘php_iconv_string’:
/export/home/petk/projects/php-src/ext/iconv/iconv.c:469:36: warning: passing argument 2 of ‘iconv’ from incompatible pointer type [-Wincompatible-pointer-types]
469 | result = iconv(cd, (ICONV_CONST char **) &in_p, &in_left, (char **) &out_p, &out_left);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| const char **
In file included from /export/home/petk/projects/php-src/ext/iconv/iconv.c:36:
/usr/include/iconv.h:97:32: note: expected ‘char ** restrict’ but argument is of type ‘const char **’
97 | extern size_t iconv(iconv_t, char **_RESTRICT_KYWD,
| ^
/export/home/petk/projects/php-src/ext/iconv/iconv.c: In function ‘_php_iconv_strlen’:
/export/home/petk/projects/php-src/ext/iconv/iconv.c:589:61: warning: passing argument 2 of ‘iconv’ from incompatible pointer type [-Wincompatible-pointer-types]
589 | iconv(cd, more ? (ICONV_CONST char **)&in_p : NULL, more ? &in_left : NULL, (char **) &out_p, &out_left);
| ^
| |
| const char **
In file included from /export/home/petk/projects/php-src/ext/iconv/iconv.c:36:
/usr/include/iconv.h:97:32: note: expected ‘char ** restrict’ but argument is of type ‘const char **’
97 | extern size_t iconv(iconv_t, char **_RESTRICT_KYWD,
| ^
/export/home/petk/projects/php-src/ext/iconv/iconv.c: In function ‘_php_iconv_substr’:
/export/home/petk/projects/php-src/ext/iconv/iconv.c:696:62: warning: passing argument 2 of ‘iconv’ from incompatible pointer type [-Wincompatible-pointer-types]
696 | iconv(cd1, more ? (ICONV_CONST char **)&in_p : NULL, more ? &in_left : NULL, (char **) &out_p, &out_left);
| ^
| |
| const char **
In file included from /export/home/petk/projects/php-src/ext/iconv/iconv.c:36:
/usr/include/iconv.h:97:32: note: expected ‘char ** restrict’ but argument is of type ‘const char **’
97 | extern size_t iconv(iconv_t, char **_RESTRICT_KYWD,
| ^
/export/home/petk/projects/php-src/ext/iconv/iconv.c: In function ‘_php_iconv_strpos’:
/export/home/petk/projects/php-src/ext/iconv/iconv.c:818:73: warning: passing argument 2 of ‘iconv’ from incompatible pointer type [-Wincompatible-pointer-types]
818 | iconv_ret = iconv(cd, more ? (ICONV_CONST char **)&in_p : NULL, more ? &in_left : NULL, (char **) &out_p, &out_left);
| ^
| |
| const char **
In file included from /export/home/petk/projects/php-src/ext/iconv/iconv.c:36:
/usr/include/iconv.h:97:32: note: expected ‘char ** restrict’ but argument is of type ‘const char **’
97 | extern size_t iconv(iconv_t, char **_RESTRICT_KYWD,
| ^
/export/home/petk/projects/php-src/ext/iconv/iconv.c: In function ‘_php_iconv_mime_encode’:
/export/home/petk/projects/php-src/ext/iconv/iconv.c:1025:55: warning: passing argument 2 of ‘iconv’ from incompatible pointer type [-Wincompatible-pointer-types]
1025 | if (iconv(cd, (ICONV_CONST char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| const char **
In file included from /export/home/petk/projects/php-src/ext/iconv/iconv.c:36:
/usr/include/iconv.h:97:32: note: expected ‘char ** restrict’ but argument is of type ‘const char **’
97 | extern size_t iconv(iconv_t, char **_RESTRICT_KYWD,
| ^
/export/home/petk/projects/php-src/ext/iconv/iconv.c:1109:55: warning: passing argument 2 of ‘iconv’ from incompatible pointer type [-Wincompatible-pointer-types]
1109 | if (iconv(cd, (ICONV_CONST char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| const char **
In file included from /export/home/petk/projects/php-src/ext/iconv/iconv.c:36:
/usr/include/iconv.h:97:32: note: expected ‘char ** restrict’ but argument is of type ‘const char **’
97 | extern size_t iconv(iconv_t, char **_RESTRICT_KYWD,
| ^
/export/home/petk/projects/php-src/ext/iconv/iconv.c: In function ‘php_iconv_stream_filter_append_bucket’:
/export/home/petk/projects/php-src/ext/iconv/iconv.c:2378:45: warning: passing argument 2 of ‘iconv’ from incompatible pointer type [-Wincompatible-pointer-types]
2378 | if (iconv(self->cd, (ICONV_CONST char **)&pt, &tcnt, &pd, &ocnt) == (size_t)-1) {
| ^~~~~~~~~~~~~~~~~~~~~~~~
| |
| const char **
In file included from /export/home/petk/projects/php-src/ext/iconv/iconv.c:36:
/usr/include/iconv.h:97:32: note: expected ‘char ** restrict’ but argument is of type ‘const char **’
97 | extern size_t iconv(iconv_t, char **_RESTRICT_KYWD,
| ^
/export/home/petk/projects/php-src/ext/iconv/iconv.c:2444:57: warning: passing argument 2 of ‘iconv’ from incompatible pointer type [-Wincompatible-pointer-types]
2444 | iconv(self->cd, (ICONV_CONST char **)&ps, &icnt, &pd, &ocnt)) == (size_t)-1) {
| ^~~~~~~~~~~~~~~~~~~~~~~~
| |
| const char **
In file included from /export/home/petk/projects/php-src/ext/iconv/iconv.c:36:
/usr/include/iconv.h:97:32: note: expected ‘char ** restrict’ but argument is of type ‘const char **’
97 | extern size_t iconv(iconv_t, char **_RESTRICT_KYWD,
| ^

[devnexen]

Thanks. do you have specific CFLAGS you pass for building ?

[petk]

Everything by default:

./configure
gmake

[devnexen]

Ok I ll look into it further thanks !