Re: Submitting changes

*** sybase.c.old Mon Jan 4 16:25:22 1999 --- sybase.c Thu Apr 8 11:32:27 1999 *************** *** 56,95 **** function_entry sybase_functions[] = { {"sybase_connect", php3_sybase_connect, NULL}, {"sybase_pconnect", php3_sybase_pconnect, NULL}, ! {"sybase_close", php3_sybase_close, NULL}, ! {"sybase_select_db", php3_sybase_select_db, NULL}, ! {"sybase_query", php3_sybase_query, NULL}, ! {"sybase_free_result", php3_sybase_free_result, NULL}, ! {"sybase_get_last_message", php3_sybase_get_last_message, NULL}, {"sybase_num_rows", php3_sybase_num_rows, NULL}, ! {"sybase_num_fields", php3_sybase_num_fields, NULL}, ! {"sybase_fetch_row", php3_sybase_fetch_row, NULL}, ! {"sybase_fetch_array", php3_sybase_fetch_array, NULL}, ! {"sybase_fetch_object", php3_sybase_fetch_object, NULL}, ! {"sybase_data_seek", php3_sybase_data_seek, NULL}, ! {"sybase_fetch_field", php3_sybase_fetch_field, NULL}, ! {"sybase_field_seek", php3_sybase_field_seek, NULL}, ! {"sybase_result", php3_sybase_result, NULL}, ! {"sybase_min_error_severity", php3_sybase_min_error_severity, NULL}, ! {"sybase_min_message_severity", php3_sybase_min_message_severity, NULL}, {"mssql_connect", php3_sybase_connect, NULL}, {"mssql_pconnect", php3_sybase_pconnect, NULL}, ! {"mssql_close", php3_sybase_close, NULL}, {"mssql_select_db", php3_sybase_select_db, NULL}, ! {"mssql_query", php3_sybase_query, NULL}, ! {"mssql_free_result", php3_sybase_free_result, NULL}, ! {"mssql_get_last_message", php3_sybase_get_last_message, NULL}, {"mssql_num_rows", php3_sybase_num_rows, NULL}, ! {"mssql_num_fields", php3_sybase_num_fields, NULL}, {"mssql_fetch_row", php3_sybase_fetch_row, NULL}, ! {"mssql_fetch_array", php3_sybase_fetch_array, NULL}, ! {"mssql_fetch_object", php3_sybase_fetch_object, NULL}, {"mssql_data_seek", php3_sybase_data_seek, NULL}, ! {"mssql_fetch_field", php3_sybase_fetch_field, NULL}, ! {"mssql_field_seek", php3_sybase_field_seek, NULL}, ! {"mssql_result", php3_sybase_result, NULL}, ! {"mssql_min_error_severity", php3_sybase_min_error_severity, NULL}, ! {"mssql_min_message_severity", php3_sybase_min_message_severity, NULL}, {NULL, NULL, NULL} }; --- 56,96 ---- function_entry sybase_functions[] = { {"sybase_connect", php3_sybase_connect, NULL}, {"sybase_pconnect", php3_sybase_pconnect, NULL}, ! {"sybase_close", php3_sybase_close, NULL}, ! {"sybase_select_db", php3_sybase_select_db, NULL}, ! {"sybase_query", php3_sybase_query, NULL}, ! {"sybase_free_result", php3_sybase_free_result, NULL}, ! {"sybase_get_last_message", php3_sybase_get_last_message, NULL}, {"sybase_num_rows", php3_sybase_num_rows, NULL}, ! {"sybase_num_fields", php3_sybase_num_fields, NULL}, ! {"sybase_fetch_row", php3_sybase_fetch_row, NULL}, ! {"sybase_fetch_array", php3_sybase_fetch_array, NULL}, ! {"sybase_fetch_object", php3_sybase_fetch_object, NULL}, ! {"sybase_data_seek", php3_sybase_data_seek, NULL}, ! {"sybase_fetch_field", php3_sybase_fetch_field, NULL}, ! {"sybase_field_seek", php3_sybase_field_seek, NULL}, ! {"sybase_result", php3_sybase_result, NULL}, ! {"sybase_min_error_severity", php3_sybase_min_error_severity, NULL}, ! {"sybase_min_message_severity", php3_sybase_min_message_severity, NULL}, ! {"sybase_last_error", php3_sybase_get_last_error, NULL}, {"mssql_connect", php3_sybase_connect, NULL}, {"mssql_pconnect", php3_sybase_pconnect, NULL}, ! {"mssql_close", php3_sybase_close, NULL}, {"mssql_select_db", php3_sybase_select_db, NULL}, ! {"mssql_query", php3_sybase_query, NULL}, ! {"mssql_free_result", php3_sybase_free_result, NULL}, ! {"mssql_get_last_message", php3_sybase_get_last_message, NULL}, {"mssql_num_rows", php3_sybase_num_rows, NULL}, ! {"mssql_num_fields", php3_sybase_num_fields, NULL}, {"mssql_fetch_row", php3_sybase_fetch_row, NULL}, ! {"mssql_fetch_array", php3_sybase_fetch_array, NULL}, ! {"mssql_fetch_object", php3_sybase_fetch_object, NULL}, {"mssql_data_seek", php3_sybase_data_seek, NULL}, ! {"mssql_fetch_field", php3_sybase_fetch_field, NULL}, ! {"mssql_field_seek", php3_sybase_field_seek, NULL}, ! {"mssql_result", php3_sybase_result, NULL}, ! {"mssql_min_error_severity", php3_sybase_min_error_severity, NULL}, ! {"mssql_min_message_severity", php3_sybase_min_message_severity, NULL}, {NULL, NULL, NULL} }; *************** *** 104,110 **** THREAD_LS sybase_module php3_sybase_module; THREAD_LS static HashTable *resource_list, *resource_plist; - #define CHECK_LINK(link) { if (link==-1) { php3_error(E_WARNING,"Sybase: A link to the server could not be established"); RETURN_FALSE; } } --- 105,110 ---- *************** *** 114,119 **** --- 114,120 ---- static int php3_sybase_error_handler(DBPROCESS *dbproc,int severity,int dberr, int oserr,char *dberrstr,char *oserrstr) { + php3_sybase_module.last_error = dberr; if (severity >= php3_sybase_module.min_error_severity) { php3_error(E_WARNING,"Sybase error: %s (severity %d)",dberrstr,severity); } *************** *** 240,245 **** --- 241,247 ---- php3_sybase_module.num_links = php3_sybase_module.num_persistent; php3_sybase_module.appname = estrndup("PHP 3.0",7); php3_sybase_module.server_message = empty_string; + php3_sybase_module.last_error = 0; php3_sybase_module.min_error_severity = php3_sybase_module.cfg_min_error_severity; php3_sybase_module.min_message_severity = php3_sybase_module.cfg_min_message_severity; return SUCCESS; *************** *** 854,859 **** --- 856,870 ---- void php3_sybase_get_last_message(INTERNAL_FUNCTION_PARAMETERS) { RETURN_STRING(php3_sybase_module.server_message,1); + } + /* }}} */ + + /* {{{ proto int sybase_get_last_error(void) + Returns the last message from server (over min_message_severity?) */ + void php3_sybase_get_last_error(INTERNAL_FUNCTION_PARAMETERS) + { + return_value->value.lval = php3_sybase_module.last_error; + return_value->type = IS_LONG; } /* }}} */ *** php3_sybase.h.old Fri Jan 1 19:59:16 1999 --- php3_sybase.h Thu Apr 8 11:12:26 1999 *************** *** 55,60 **** --- 55,61 ---- extern void php3_sybase_query(INTERNAL_FUNCTION_PARAMETERS); extern void php3_sybase_free_result(INTERNAL_FUNCTION_PARAMETERS); extern void php3_sybase_get_last_message(INTERNAL_FUNCTION_PARAMETERS); + extern void php3_sybase_get_last_error(INTERNAL_FUNCTION_PARAMETERS); extern void php3_sybase_num_rows(INTERNAL_FUNCTION_PARAMETERS); extern void php3_sybase_num_fields(INTERNAL_FUNCTION_PARAMETERS); extern void php3_sybase_fetch_row(INTERNAL_FUNCTION_PARAMETERS); *************** *** 105,110 **** --- 106,112 ---- long min_error_severity,min_message_severity; long cfg_min_error_severity,cfg_min_message_severity; long compatability_mode; + int last_error; } sybase_module; struct sybase_link_struct { -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net