cvs: php4(PHP_4_2_0) /ext/imap php_imap.c
| From: | Dan Kalowsky | Date: | Sat, 17 Aug 2002 20:03:51 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /ext/imap php_imap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13443@lists.php.net to get a copy of this message | ||
kalowsky Sat Aug 17 16:03:51 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/imap php_imap.c
Log:
MFH - fix Irix compiler errors
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.112.2.2 php4/ext/imap/php_imap.c:1.112.2.3
--- php4/ext/imap/php_imap.c:1.112.2.2 Wed Jun 26 19:31:09 2002
+++ php4/ext/imap/php_imap.c Sat Aug 17 16:03:50 2002
@@ -25,7 +25,7 @@
| PHP 4.0 updates: Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.112.2.2 2002/06/26 23:31:09 sniper Exp $ */
+/* $Id: php_imap.c,v 1.112.2.3 2002/08/17 20:03:50 kalowsky Exp $ */
#define IMAP41
@@ -2191,6 +2191,7 @@
zval **arg;
const unsigned char *in, *inp, *endp;
unsigned char *out, *outp;
+ unsigned char c;
int inlen, outlen;
enum {
ST_NORMAL, /* printable text */
@@ -2292,13 +2293,15 @@
break;
case ST_DECODE1:
outp[1] = UNB64(*inp);
- *outp++ |= outp[1] >> 4;
+ c = outp[1] >> 4;
+ *outp++ |= c;
*outp <<= 4;
state = ST_DECODE2;
break;
case ST_DECODE2:
outp[1] = UNB64(*inp);
- *outp++ |= outp[1] >> 2;
+ c = outp[1] >> 2;
+ *outp++ |= c;
*outp <<= 6;
state = ST_DECODE3;
break;
@@ -2332,6 +2335,7 @@
zval **arg;
const unsigned char *in, *inp, *endp;
unsigned char *out, *outp;
+ unsigned char c;
int inlen, outlen;
enum {
ST_NORMAL, /* printable text */
@@ -2415,12 +2419,14 @@
state = ST_ENCODE1;
break;
case ST_ENCODE1:
- *outp++ = B64(*outp | *inp >> 4);
+ c = B64(*outp | *inp >> 4);
+ *outp++ = c;
*outp = *inp++ << 2;
state = ST_ENCODE2;
break;
case ST_ENCODE2:
- *outp++ = B64(*outp | *inp >> 6);
+ c = B64(*outp | *inp >> 6);
+ *outp++ = c;
*outp++ = B64(*inp++);
state = ST_ENCODE0;
case ST_NORMAL: