php4-beta | 199912

[PHP4BETA] cvs: /php4 php.h /php4/ext/mysql php_mysql.c /php4/ext/standard array.c From: Zeev Suraski (zeev <email protected>)
Date: 12/31/99

zeev Fri Dec 31 09:07:02 1999 EDT

  Modified files:
    /php4 php.h
    /php4/ext/mysql php_mysql.c
    /php4/ext/standard array.c
  Log:
  Happy new year (especially to Thies :)
  - Zend branch patches merged in - get the PHP tree uptodate
  - Clean
  
  
Index: php4/php.h
diff -u php4/php.h:1.53 php4/php.h:1.54
--- php4/php.h:1.53 Thu Dec 30 11:09:17 1999
+++ php4/php.h Fri Dec 31 09:06:30 1999
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php.h,v 1.53 1999/12/30 16:09:17 sas Exp $ */
+/* $Id: php.h,v 1.54 1999/12/31 14:06:30 zeev Exp $ */
 
 #ifndef _PHP_H
 #define _PHP_H
@@ -253,13 +253,7 @@
 #define PHP_MIME_TYPE "application/x-httpd-php"
 
 /* macros */
-#undef MIN
-#undef MAX
 #undef COPY_STRING
-#define DO_OR_DIE(retvalue) if (retvalue==FAILURE) { return FAILURE; }
-#define MAX(a,b) (((a)>(b))?(a):(b))
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#define STR_FREE(ptr) if (ptr && ptr!=empty_string && ptr!=undefined_variable_string) { efree(ptr); }
 #define COPY_STRING(yy) (yy).value.str.val = (char *) estrndup((yy).value.str.val,(yy).value.str.len)
 #define STR_PRINT(str) ((str)?(str):"")
 
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.18 php4/ext/mysql/php_mysql.c:1.19
--- php4/ext/mysql/php_mysql.c:1.18 Tue Dec 28 13:45:10 1999
+++ php4/ext/mysql/php_mysql.c Fri Dec 31 09:06:31 1999
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
  
-/* $Id: php_mysql.c,v 1.18 1999/12/28 18:45:10 sas Exp $ */
+/* $Id: php_mysql.c,v 1.19 1999/12/31 14:06:31 zeev Exp $ */
 
 
 /* TODO:
@@ -1255,9 +1255,7 @@
                         return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len);
                 }
         } else {
- return_value->value.str.val = undefined_variable_string;
- return_value->value.str.len=0;
- return_value->type = IS_STRING;
+ return_value->type = IS_UNSET;
         }
         
         return_value->type = IS_STRING;
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.19 php4/ext/standard/array.c:1.20
--- php4/ext/standard/array.c:1.19 Sun Dec 26 16:20:48 1999
+++ php4/ext/standard/array.c Fri Dec 31 09:06:31 1999
@@ -246,7 +246,7 @@
         }
         target_hash = HASH_OF(*array);
         if (!target_hash) {
- if ((*array)->type == IS_STRING && (*array)->value.str.val==undefined_variable_string) {
+ if ((*array)->type == IS_UNSET) {
                         RETURN_LONG(0);
                 } else {
                         RETURN_LONG(1); 

-- 
PHP 4.0 Beta Mailing List <http://www.php.net/version4/>
To unsubscribe, e-mail: php4beta-unsubscribe <email protected>
For additional commands, e-mail: php4beta-help <email protected>
To contact the list administrators, e-mail: php4beta-admin <email protected>