On Thu, 24 Oct 2002, Anantha Kesari H Y wrote:
> hyanantha Thu Oct 24 07:16:57 2002 EDT
>
> Modified files: (Branch: PHP_4_2_0)
> /php4/ext/standard image.c
> Log:
> NetWare related changes/modifications.
You can also commit all files in one run ... please :)
Derick
>
>
> Index: php4/ext/standard/image.c
> diff -u php4/ext/standard/image.c:1.44.2.2 php4/ext/standard/image.c:1.44.2.3
> --- php4/ext/standard/image.c:1.44.2.2 Tue Mar 12 00:57:28 2002
> +++ php4/ext/standard/image.c Thu Oct 24 07:16:57 2002
> @@ -16,7 +16,7 @@
> | Marcus Boerger <[EMAIL PROTECTED]> |
> +----------------------------------------------------------------------+
> */
> -/* $Id: image.c,v 1.44.2.2 2002/03/12 05:57:28 helly Exp $ */
> +/* $Id: image.c,v 1.44.2.3 2002/10/24 11:16:57 hyanantha Exp $ */
> /*
> * Based on Daniel Schmitt's imageinfo.c which carried the following
> * Copyright notice.
> @@ -39,6 +39,11 @@
>
> #include "php.h"
> #include <stdio.h>
> +
> +#if defined(NETWARE) && !defined(NEW_LIBC)
> +#include <sys/socket.h>
> +#endif
> +
> #if HAVE_FCNTL_H
> #include <fcntl.h>
> #endif
> @@ -82,10 +87,10 @@
>
> FP_FREAD(temp, 3, socketd, fp, issock); /* fseek(fp, 6L, SEEK_SET); */
>
> - FP_FREAD(a, sizeof(a), socketd, fp, issock); /* fread(a, sizeof(a), 1, fp); */
> + FP_FREAD((char*)a, sizeof(a), socketd, fp, issock); /* fread(a, sizeof(a), 1,
>fp); */ /* Type-casting done due to NetWare */
> result->width = (unsigned short)a[0] | (((unsigned short)a[1])<<8);
>
> - FP_FREAD(a, sizeof(a), socketd, fp, issock); /* fread(a, sizeof(a), 1, fp); */
> + FP_FREAD((char *)a, sizeof(a), socketd, fp, issock); /* fread(a, sizeof(a), 1,
>fp); */ /* Type-casting done due to NetWare */
> result->height = (unsigned short)a[0] | (((unsigned short)a[1])<<8);
>
> return result;
> @@ -104,7 +109,7 @@
> result = (struct gfxinfo *) ecalloc(1, sizeof(struct gfxinfo));
> FP_FREAD(temp, sizeof(temp), socketd, fp, issock);
>
> - if((FP_FREAD(a, sizeof(a), socketd, fp, issock)) <= 0) {
> + if((FP_FREAD((char *)a, sizeof(a), socketd, fp, issock)) <= 0) { /*
>Type-casting done due to NetWare */
> in_height = 0;
> in_width = 0;
> } else {
> @@ -169,7 +174,7 @@
> result = (struct gfxinfo *) ecalloc (1, sizeof (struct gfxinfo));
> FP_FREAD(temp, 5, socketd, fp, issock); /* fseek(fp, 8L, SEEK_SET); */
>
> - FP_FREAD(a, sizeof(a), socketd, fp, issock); /* fread(a, sizeof(a), 1, fp); */
> + FP_FREAD((char *)a, sizeof(a), socketd, fp, issock); /* fread(a, sizeof(a), 1,
>fp); */ /* Type-casting done due to NetWare */
> bits = php_swf_get_bits (a, 0, 5);
> result->width = (php_swf_get_bits (a, 5 + bits, bits) -
> php_swf_get_bits (a, 5, bits)) / 20;
> @@ -192,7 +197,7 @@
>
> FP_FREAD(temp, sizeof(temp), socketd, fp, issock); /* fseek(fp, 16L,
>SEEK_SET); */
>
> - if((FP_FREAD(a, sizeof(a), socketd, fp, issock)) <= 0) {
> + if((FP_FREAD((char *)a, sizeof(a), socketd, fp, issock)) <= 0) { /*
>Type-casting done due to NetWare */
> in_width = 0;
> in_height = 0;
> } else {
> @@ -249,8 +254,7 @@
> unsigned char a[2];
>
> /* just return 0 if we hit the end-of-file */
> - if((FP_FREAD(a, sizeof(a), socketd, fp, issock)) <= 0) return 0;
> -
> + if((FP_FREAD((char *)a, sizeof(a), socketd, fp, issock)) <= 0) return 0;
> /* Type-casting done due to NetWare */
> return (((unsigned short) a[ 0 ]) << 8) + ((unsigned short) a[ 1 ]);
> }
> /* }}} */
> @@ -316,16 +320,16 @@
> buffer = emalloc(length);
> if ( !buffer) return;
>
> - if (FP_FREAD(buffer, (long) length, socketd, fp, issock) <= 0) {
> + if (FP_FREAD((char *)buffer, (long) length, socketd, fp, issock) <= 0) {
> /* Type-casting done due to NetWare */
> efree(buffer);
> return;
> }
>
> - sprintf(markername, "APP%d", marker - M_APP0);
> + sprintf((char *)markername, "APP%d", marker - M_APP0); /* Type-casting done
>due to NetWare */
>
> - if (zend_hash_find(Z_ARRVAL_P(info), markername, strlen(markername)+1, (void
>**) &tmp) == FAILURE) {
> + if (zend_hash_find(Z_ARRVAL_P(info), (char *)markername, strlen((char
>*)markername)+1, (void **) &tmp) == FAILURE) { /* Type-casting done due to NetWare
>*/
> /* XXX we onyl catch the 1st tag of it's kind! */
> - add_assoc_stringl(info, markername, buffer, length, 1);
> + add_assoc_stringl(info, (char *)markername, (char *)buffer, length,
>1); /* Type-casting done due to NetWare */
> }
>
> efree(buffer);
> @@ -362,7 +366,7 @@
> result = (struct gfxinfo *) ecalloc(1,
>sizeof(struct gfxinfo));
> length = php_read2(socketd, fp, issock);
> result->bits = FP_FGETC(socketd, fp, issock);
> - FP_FREAD(a, sizeof(a), socketd, fp, issock);
> + FP_FREAD((char *)a, sizeof(a), socketd, fp,
>issock); /* Type-casting done due to NetWare */
> result->height = (((unsigned short) a[ 0 ]) <<
>8) + ((unsigned short) a[ 1 ]);
> result->width = (((unsigned short) a[ 2 ]) <<
>8) + ((unsigned short) a[ 3 ]);
> result->channels = FP_FGETC(socketd, fp,
>issock);
> @@ -507,7 +511,7 @@
> /* now we have the directory we can look how long it should be */
> ifd_size = dir_size;
> for(i=0;i<num_entries;i++) {
> - dir_entry = ifd_data+2+i*12;
> + dir_entry = (unsigned char *)ifd_data+2+i*12; /*
>Type-casting done due to NetWare */
> entry_tag = php_ifd_get16u(dir_entry+0, motorola_intel);
> entry_type = php_ifd_get16u(dir_entry+2, motorola_intel);
> entry_length = php_ifd_get32u(dir_entry+4, motorola_intel) *
>php_tiff_bytes_per_format[entry_type];
>
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
--
---------------------------------------------------------------------------
Derick Rethans http://derickrethans.nl/
JDI Media Solutions
--------------[ if you hold a unix shell to your ear, do you hear the c? ]-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
