[PHP-CVS] cvs: php4 /ext/exif exif.c

[Daniel Beulshausen]

dbeuTue Apr  3 14:39:18 2001 EDT

  Modified files:  
/php4/ext/exif  exif.c 
  Log:
  resolve realpath if in v-dir mode
  
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.12 php4/ext/exif/exif.c:1.13
--- php4/ext/exif/exif.c:1.12   Sun Feb 25 22:06:54 2001
+++ php4/ext/exif/exif.cTue Apr  3 14:39:18 2001
@@ -1060,7 +1060,7 @@
 pval **p_name;
 int ac = ZEND_NUM_ARGS(), ret;
ImageInfoType ImageInfo;
-   char tmp[64];
+   char tmp[64], *file;
 
/*ImageInfo.Thumbnail = NULL;
ImageInfo.ThumbnailSize = 0;
@@ -1070,7 +1070,14 @@
WRONG_PARAM_COUNT;
 
convert_to_string_ex(p_name);
-   ret = php_read_jpeg_exif(ImageInfo, (*p_name)-value.str.val,1);
+
+#ifdef VIRTUAL_DIR
+   virtual_filepath(Z_STRVAL_PP(p_name), file);
+   ret = php_read_jpeg_exif(ImageInfo, file,1);
+#else
+   ret = php_read_jpeg_exif(ImageInfo, Z_STRVAL_PP(p_name),1);
+#endif
+
if (array_init(return_value) == FAILURE) {
RETURN_FALSE;
}



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

Re: [PHP-CVS] cvs: php4 /ext/exif exif.c

[Andi Gutmans]

Daniel,

Why not use virtual_filepath() always and make one case out of your code. 
It also works in non VIRTUAL_DIR mode. There shouldn't really be #ifdef's 
in the PHP code (TSRM takes care of it). If it's a specific problem we can 
think of how to fix it.

Andi

At 09:39 PM 4/3/2001 +, Daniel Beulshausen wrote:
dbeuTue Apr  3 14:39:18 2001 EDT

   Modified files:
 /php4/ext/exif  exif.c
   Log:
   resolve realpath if in v-dir mode

Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.12 php4/ext/exif/exif.c:1.13
--- php4/ext/exif/exif.c:1.12   Sun Feb 25 22:06:54 2001
+++ php4/ext/exif/exif.cTue Apr  3 14:39:18 2001
@@ -1060,7 +1060,7 @@
  pval **p_name;
  int ac = ZEND_NUM_ARGS(), ret;
 ImageInfoType ImageInfo;
-   char tmp[64];
+   char tmp[64], *file;

 /*ImageInfo.Thumbnail = NULL;
 ImageInfo.ThumbnailSize = 0;
@@ -1070,7 +1070,14 @@
 WRONG_PARAM_COUNT;

 convert_to_string_ex(p_name);
-   ret = php_read_jpeg_exif(ImageInfo, (*p_name)-value.str.val,1);
+
+#ifdef VIRTUAL_DIR
+   virtual_filepath(Z_STRVAL_PP(p_name), file);
+   ret = php_read_jpeg_exif(ImageInfo, file,1);
+#else
+   ret = php_read_jpeg_exif(ImageInfo, Z_STRVAL_PP(p_name),1);
+#endif
+
 if (array_init(return_value) == FAILURE) {
 RETURN_FALSE;
 }



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/exif exif.c /main network.c

[Rasmus Lerdorf]

rasmus  Tue Jan 16 22:40:49 2001 EDT

  Modified files:  
/php4/ext/exif  exif.c 
/php4/main  network.c 
  Log:
  Kill a couple of warnings
  
  
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.10 php4/ext/exif/exif.c:1.11
--- php4/ext/exif/exif.c:1.10   Fri Dec 15 09:25:20 2000
+++ php4/ext/exif/exif.cTue Jan 16 22:40:48 2001
@@ -1027,7 +1027,6 @@
int SectionsRead;
char *LastExifRefd=NULL;
int ret;
-   int thumbsize=0;
/* int i; */
 
ImageInfo-MotorolaOrder = 0;
Index: php4/main/network.c
diff -u php4/main/network.c:1.12 php4/main/network.c:1.13
--- php4/main/network.c:1.12Sat Jan 13 05:02:19 2001
+++ php4/main/network.c Tue Jan 16 22:40:48 2001
@@ -15,7 +15,7 @@
| Authors: Stig Venaas [EMAIL PROTECTED] |
+--+
  */
-/* $Id: network.c,v 1.12 2001/01/13 13:02:19 zeev Exp $ */
+/* $Id: network.c,v 1.13 2001/01/17 06:40:48 rasmus Exp $ */
 
 #include "php.h"
 
@@ -126,7 +126,7 @@
 
memset(hints, '\0', sizeof(hints));
hints.ai_family = AF_UNSPEC;
-   if (n = getaddrinfo(host, NULL, hints, res)) {
+   if ((n = getaddrinfo(host, NULL, hints, res))) {
php_error(E_WARNING, "php_network_getaddresses: getaddrinfo 
failed: %s", PHP_GAI_STRERROR(n));
return -1;
}



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]