48abbd4bee
more than one php binaries within one workdir (idea from FreeBSD) - move pdo_sqlite support from core to extensions and also add a pdo_mysql and a pdo_sqlite subpackage - regen patches while here - bump PKGNAMEs
76 lines
3.0 KiB
Plaintext
76 lines
3.0 KiB
Plaintext
$OpenBSD: patch-ext_iconv_iconv_c,v 1.2 2007/04/01 21:37:27 robert Exp $
|
|
--- ext/iconv/iconv.c.orig Thu Feb 1 15:02:35 2007
|
|
+++ ext/iconv/iconv.c Sun Apr 1 13:42:42 2007
|
|
@@ -336,7 +336,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d
|
|
|
|
out_p = (d)->c + (d)->len;
|
|
|
|
- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
|
|
+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
|
|
#if ICONV_SUPPORTS_ERRNO
|
|
switch (errno) {
|
|
case EINVAL:
|
|
@@ -500,7 +500,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const c
|
|
out_p = out_buf;
|
|
|
|
while (in_left > 0) {
|
|
- result = iconv(cd, (char **) &in_p, &in_left, (char **) &out_p, &out_left);
|
|
+ result = iconv(cd, (const char **) &in_p, &in_left, (char **) &out_p, &out_left);
|
|
out_size = bsz - out_left;
|
|
if (result == (size_t)(-1)) {
|
|
if (errno == E2BIG && in_left > 0) {
|
|
@@ -614,7 +614,7 @@ static php_iconv_err_t _php_iconv_strlen(unsigned int
|
|
|
|
prev_in_left = in_left;
|
|
|
|
- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
|
|
+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
|
|
if (prev_in_left == in_left) {
|
|
break;
|
|
}
|
|
@@ -728,7 +728,7 @@ static php_iconv_err_t _php_iconv_substr(smart_str *pr
|
|
|
|
prev_in_left = in_left;
|
|
|
|
- if (iconv(cd1, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
|
|
+ if (iconv(cd1, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
|
|
if (prev_in_left == in_left) {
|
|
break;
|
|
}
|
|
@@ -857,7 +857,7 @@ static php_iconv_err_t _php_iconv_strpos(unsigned int
|
|
|
|
prev_in_left = in_left;
|
|
|
|
- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
|
|
+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
|
|
if (prev_in_left == in_left) {
|
|
#if ICONV_SUPPORTS_ERRNO
|
|
switch (errno) {
|
|
@@ -1106,7 +1106,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st
|
|
|
|
out_left = out_size - out_reserved;
|
|
|
|
- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
|
|
+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
|
|
#if ICONV_SUPPORTS_ERRNO
|
|
switch (errno) {
|
|
case EINVAL:
|
|
@@ -1206,7 +1206,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_st
|
|
out_p = buf;
|
|
out_left = out_size;
|
|
|
|
- if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
|
|
+ if (iconv(cd, (const char **)&in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
|
|
#if ICONV_SUPPORTS_ERRNO
|
|
switch (errno) {
|
|
case EINVAL:
|
|
@@ -2472,7 +2472,7 @@ static int php_iconv_stream_filter_append_bucket(
|
|
tcnt = self->stub_len;
|
|
|
|
while (tcnt > 0) {
|
|
- if (iconv(self->cd, &pt, &tcnt, &pd, &ocnt) == (size_t)-1) {
|
|
+ if (iconv(self->cd, (const char **)&pt, &tcnt, &pd, &ocnt) == (size_t)-1) {
|
|
#if ICONV_SUPPORTS_ERRNO
|
|
switch (errno) {
|
|
case EILSEQ:
|