cvs: /php4/ext/standard iptc.c

thies Mon Dec 13 22:49:55 1999 EDT Modified files: /php4/ext/standard iptc.c Log: use ex-API Index: php4/ext/standard/iptc.c diff -u php4/ext/standard/iptc.c:1.8 php4/ext/standard/iptc.c:1.9 --- php4/ext/standard/iptc.c:1.8 Sat Dec 4 14:16:03 1999 +++ php4/ext/standard/iptc.c Mon Dec 13 22:49:24 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iptc.c,v 1.8 1999/12/04 19:16:03 sas Exp $ */ +/* $Id: iptc.c,v 1.9 1999/12/14 03:49:24 thies Exp $ */ /* * Functions to parse & compse IPTC data. @@ -164,7 +164,7 @@ Embed binary IPTC data into a JPEG image. */ PHP_FUNCTION(iptcembed) { - pval *iptcdata, *jpeg_file, *spool_flag; + zval **iptcdata, **jpeg_file, **spool_flag; FILE *fp; unsigned int marker; unsigned int spool = 0, done = 0, inx, len; @@ -173,21 +173,21 @@ switch(ARG_COUNT(ht)){ case 3: - if (getParameters(ht, 3, &iptcdata, &jpeg_file, &spool_flag) == FAILURE) { + if (getParametersEx(3, &iptcdata, &jpeg_file, &spool_flag) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string(iptcdata); - convert_to_string(jpeg_file); - convert_to_long(spool_flag); - spool = spool_flag->value.lval; + convert_to_string_ex(iptcdata); + convert_to_string_ex(jpeg_file); + convert_to_long_ex(spool_flag); + spool = (*spool_flag)->value.lval; break; case 2: - if (getParameters(ht, 2, &iptcdata, &jpeg_file) == FAILURE) { + if (getParametersEx(2, &iptcdata, &jpeg_file) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string(iptcdata); - convert_to_string(jpeg_file); + convert_to_string_ex(iptcdata); + convert_to_string_ex(jpeg_file); break; default: @@ -195,11 +195,11 @@ break; } - if (_php3_check_open_basedir(jpeg_file->value.str.val)) + if (_php3_check_open_basedir((*jpeg_file)->value.str.val)) RETURN_FALSE; - if ((fp = fopen(jpeg_file->value.str.val,"rb")) == 0) { - php_error(E_WARNING, "Unable to open %s", jpeg_file->value.str.val); + if ((fp = fopen((*jpeg_file)->value.str.val,"rb")) == 0) { + php_error(E_WARNING, "Unable to open %s", (*jpeg_file)->value.str.val); RETURN_FALSE; } @@ -213,7 +213,7 @@ } } - len = iptcdata->value.str.len; + len = (*iptcdata)->value.str.len; if (spool < 2) { fstat(fileno(fp),&sb); @@ -269,7 +269,7 @@ php3_iptc_put1(fp,spool,(unsigned char)(len&0xff),poi?&poi:0); for (inx = 0; inx < len; inx++) - php3_iptc_put1(fp,spool,iptcdata->value.str.val[inx],poi?&poi:0); + php3_iptc_put1(fp,spool,(*iptcdata)->value.str.val[inx],poi?&poi:0); break; case M_SOS: @@ -301,16 +301,16 @@ unsigned char *buffer; unsigned char recnum, dataset; unsigned char key[ 16 ]; - pval *values, *str, **element; + zval *values, **str, **element; - if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &str) == FAILURE) { + if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string(str); + convert_to_string_ex(str); inx = 0; - length = str->value.str.len; - buffer = str->value.str.val; + length = (*str)->value.str.len; + buffer = (*str)->value.str.val; inheader = 0; /* have we already found the IPTC-Header??? */ tagsfound = 0; /* number of tags already found */