cvs: php4 /main php.h

sas Sat Apr 19 14:35:31 2003 EDT Modified files: /php4/main php.h Log: Fix PUTS/PUTS_H to only evaluate their argument once. Index: php4/main/php.h diff -u php4/main/php.h:1.185 php4/main/php.h:1.186 --- php4/main/php.h:1.185 Tue Apr 8 11:04:26 2003 +++ php4/main/php.h Sat Apr 19 14:35:31 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.185 2003/04/08 15:04:26 andrei Exp $ */ +/* $Id: php.h,v 1.186 2003/04/19 18:35:31 sas Exp $ */ #ifndef PHP_H #define PHP_H @@ -344,10 +344,18 @@ /* Output support */ #include "main/php_output.h" #define PHPWRITE(str, str_len) php_body_write((str), (str_len) TSRMLS_CC) -#define PUTS(str) php_body_write((str), strlen((str)) TSRMLS_CC) +#define PUTS(str) do { \ + const char *__str = (str); \ + php_body_write(__str, strlen(__str) TSRMLS_CC); \ +} while (0) + #define PUTC(c) (php_body_write(&(c), 1 TSRMLS_CC), (c)) #define PHPWRITE_H(str, str_len) php_header_write((str), (str_len) TSRMLS_CC) -#define PUTS_H(str) php_header_write((str), strlen((str)) TSRMLS_CC) +#define PUTS_H(str) do { \ + const char *__str = (str); \ + php_header_write(__str, strlen(__str) TSRMLS_CC); \ +} while (0) + #define PUTC_H(c) (php_header_write(&(c), 1 TSRMLS_CC), (c)) #ifdef ZTS