837cd0d4ce
PHP5 is a widely-used general-purpose scripting language that is especially suited for Web development and can be embedded into HTML.
76 lines
2.6 KiB
Plaintext
76 lines
2.6 KiB
Plaintext
$OpenBSD: patch-ext_iconv_iconv_c,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $
|
|
--- ext/iconv/iconv.c.orig Mon Jul 26 22:41:02 2004
|
|
+++ ext/iconv/iconv.c Mon Jul 26 22:46:24 2004
|
|
@@ -267,7 +267,7 @@
|
|
|
|
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:
|
|
@@ -427,7 +427,7 @@
|
|
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) {
|
|
@@ -541,7 +541,7 @@
|
|
|
|
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;
|
|
}
|
|
@@ -641,7 +641,7 @@
|
|
|
|
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;
|
|
}
|
|
@@ -772,7 +772,7 @@
|
|
|
|
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) {
|
|
@@ -1025,7 +1025,7 @@
|
|
|
|
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:
|
|
@@ -1125,7 +1125,7 @@
|
|
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:
|
|
@@ -2374,7 +2374,7 @@
|
|
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:
|