CVS update: php3/functions

Date: Monday October 5, 1998 @ 11:10 Author: zeev Update of /repository/php3/functions In directory asf:/u2/tmp/cvs-serv12266/functions Modified Files: mysql.c url.c Log Message: Fix the error messages in url.c Index: php3/functions/mysql.c diff -c php3/functions/mysql.c:1.171 php3/functions/mysql.c:1.172 *** php3/functions/mysql.c:1.171 Sun Oct 4 19:25:27 1998 --- php3/functions/mysql.c Mon Oct 5 11:10:24 1998 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: mysql.c,v 1.171 1998/10/04 23:25:27 zeev Exp $ */ /* TODO: --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: mysql.c,v 1.172 1998/10/05 15:10:24 zeev Exp $ */ /* TODO: *************** *** 131,136 **** --- 131,137 ---- {"mysql_listdbs", php3_mysql_list_dbs, NULL}, {"mysql_listtables", php3_mysql_list_tables, NULL}, {"mysql_listfields", php3_mysql_list_fields, NULL}, + {"mysql_db_name", php3_mysql_result, NULL}, {"mysql_dbname", php3_mysql_result, NULL}, {"mysql_tablename", php3_mysql_result, NULL}, {NULL, NULL, NULL} Index: php3/functions/url.c diff -c php3/functions/url.c:1.37 php3/functions/url.c:1.38 *** php3/functions/url.c:1.37 Mon Sep 14 11:55:08 1998 --- php3/functions/url.c Mon Oct 5 11:10:25 1998 *************** *** 26,32 **** | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ ! /* $Id: url.c,v 1.37 1998/09/14 15:55:08 martin Exp $ */ #include <stdlib.h> #include <string.h> --- 26,32 ---- | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ ! /* $Id: url.c,v 1.38 1998/10/05 15:10:25 zeev Exp $ */ #include <stdlib.h> #include <string.h> *************** *** 75,81 **** url *ret = (url *) emalloc(sizeof(url)); if (!ret) { ! printf("unable to alloc memory\n"); return NULL; } memset(ret, 0, sizeof(url)); --- 75,81 ---- url *ret = (url *) emalloc(sizeof(url)); if (!ret) { ! php3_error(E_WARNING,"Unable to allocate memory\n"); return NULL; } memset(ret, 0, sizeof(url)); *************** *** 84,95 **** http://www.ics.uci.edu/~fielding/url/url.txt */ err = regcomp(&re, "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?", REG_EXTENDED); if (err) { ! printf("unable to compile regex: %d\n", err); return NULL; } err = regexec(&re, string, 10, subs, 0); if (err) { ! printf("error with regex\n"); return NULL; } /* no processing necessary on the scheme */ --- 84,95 ---- http://www.ics.uci.edu/~fielding/url/url.txt */ err = regcomp(&re, "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?", REG_EXTENDED); if (err) { ! php3_error(E_WARNING,"Unable to compile regex: %d\n", err); return NULL; } err = regexec(&re, string, 10, subs, 0); if (err) { ! php3_error(E_WARNING,"Error with regex\n"); return NULL; } /* no processing necessary on the scheme */ *************** *** 117,128 **** regfree(&re); /* free the old regex */ err = regcomp(&re, "^(([^@:]+)(:([^@:]+))?@)?([^:@]+)(:([^:@]+))?", REG_EXTENDED); if (err) { ! printf("unable to compile regex: %d\n", err); return NULL; } err = regexec(&re, result, 10, subs, 0); if (err) { ! printf("error with regex\n"); return NULL; } /* now deal with all of the results */ --- 117,128 ---- regfree(&re); /* free the old regex */ err = regcomp(&re, "^(([^@:]+)(:([^@:]+))?@)?([^:@]+)(:([^:@]+))?", REG_EXTENDED); if (err) { ! php3_error(E_WARNING,"Unable to compile regex: %d\n", err); return NULL; } err = regexec(&re, result, 10, subs, 0); if (err) { ! php3_error(E_WARNING,"error with regex\n"); return NULL; } /* now deal with all of the results */ -- 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