cvs: /php4 main.c /php4/ext/odbc php_odbc.c /php4/ext/standard basic_functions.c info.c info.h

zeev Tue Dec 21 15:36:14 1999 EDT Modified files: /php4 main.c /php4/ext/odbc php_odbc.c /php4/ext/standard basic_functions.c info.c info.h Log: @- Fixed a bug in ODBC error reporting (Zeev) @- Added PHP_Logo_GUID() and Zend_Logo_GUID() functions, that return the GUIDs @ of the PHP and Zend logos used in phpinfo() (Zeev) Index: php4/main.c diff -u php4/main.c:1.165 php4/main.c:1.166 --- php4/main.c:1.165 Tue Dec 21 14:43:38 1999 +++ php4/main.c Tue Dec 21 15:35:41 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.165 1999/12/21 19:43:38 andrei Exp $ */ +/* $Id: main.c,v 1.166 1999/12/21 20:35:41 zeev Exp $ */ #include <stdio.h> @@ -1224,13 +1224,13 @@ if (SG(request_info).query_string && SG(request_info).query_string[0]=='=' && PG(expose_php)) { - if (!strcmp(SG(request_info).query_string+1, "PHPE9568F34-D428-11d2-A769-00AA001ACF42")) { + if (!strcmp(SG(request_info).query_string+1, PHP_LOGO_GUID)) { char *header_line = estrndup(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF)); php4i_add_header_information(header_line, sizeof(CONTEXT_TYPE_IMAGE_GIF)-1); PHPWRITE(php4_logo, sizeof(php4_logo)); return; - } else if (!strcmp(SG(request_info).query_string+1, "PHPE9568F35-D428-11d2-A769-00AA001ACF42")) { + } else if (!strcmp(SG(request_info).query_string+1, ZEND_LOGO_GUID)) { char *header_line = estrndup(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF)); php4i_add_header_information(header_line, sizeof(CONTEXT_TYPE_IMAGE_GIF)-1); Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.19 php4/ext/odbc/php_odbc.c:1.20 --- php4/ext/odbc/php_odbc.c:1.19 Sat Dec 18 17:35:17 1999 +++ php4/ext/odbc/php_odbc.c Tue Dec 21 15:35:42 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.19 1999/12/18 22:35:17 zeev Exp $ */ +/* $Id: php_odbc.c,v 1.20 1999/12/21 20:35:42 zeev Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -465,7 +465,7 @@ ODBCLS_FETCH(); do { - SQLError(henv, conn, stmt, state, + ret = SQLError(henv, conn, stmt, state, &error, errormsg, sizeof(errormsg)-1, &errormsgsize); if (func) { php_error(E_WARNING, "SQL error: %s, SQL state %s in %s", Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.144 php4/ext/standard/basic_functions.c:1.145 --- php4/ext/standard/basic_functions.c:1.144 Mon Dec 20 12:34:54 1999 +++ php4/ext/standard/basic_functions.c Tue Dec 21 15:35:43 1999 @@ -113,6 +113,8 @@ PHP_FE(phpinfo, NULL) PHP_FE(phpversion, NULL) PHP_FE(phpcredits, NULL) + PHP_FE(php_logo_guid, NULL) + PHP_FE(zend_logo_guid, NULL) PHP_FE(strspn, NULL) PHP_FE(strcspn, NULL) Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.54 php4/ext/standard/info.c:1.55 --- php4/ext/standard/info.c:1.54 Mon Dec 20 18:09:49 1999 +++ php4/ext/standard/info.c Tue Dec 21 15:35:43 1999 @@ -510,6 +510,18 @@ /* }}} */ + +PHP_FUNCTION(php_logo_guid) +{ + RETURN_STRINGL(PHP_LOGO_GUID, sizeof(PHP_LOGO_GUID)-1, 1); +} + + +PHP_FUNCTION(zend_logo_guid) +{ + RETURN_STRINGL(ZEND_LOGO_GUID, sizeof(ZEND_LOGO_GUID)-1, 1); +} + /* * Local variables: * tab-width: 4 Index: php4/ext/standard/info.h diff -u php4/ext/standard/info.h:1.7 php4/ext/standard/info.h:1.8 --- php4/ext/standard/info.h:1.7 Sat Jul 17 15:17:42 1999 +++ php4/ext/standard/info.h Tue Dec 21 15:35:43 1999 @@ -27,7 +27,7 @@ | Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: info.h,v 1.7 1999/07/17 19:17:42 zeev Exp $ */ +/* $Id: info.h,v 1.8 1999/12/21 20:35:43 zeev Exp $ */ #ifndef _INFO_H #define _INFO_H @@ -52,9 +52,14 @@ #define PHP_CREDITS_FULLPAGE (1<<3) #define PHP_CREDITS_ALL 0xFFFFFFFF +#define PHP_LOGO_GUID "PHPE9568F34-D428-11d2-A769-00AA001ACF42" +#define ZEND_LOGO_GUID "PHPE9568F35-D428-11d2-A769-00AA001ACF42" + PHP_FUNCTION(phpversion); PHP_FUNCTION(phpinfo); PHP_FUNCTION(phpcredits); +PHP_FUNCTION(php_logo_guid); +PHP_FUNCTION(zend_logo_guid); PHPAPI void php_print_info(int flag); PHPAPI void php_print_credits(int flag);