CVS update: php3/functions
| From: | zeev | Date: | Sun, 04 Oct 1998 00:50:22 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1632@lists.php.net to get a copy of this message | ||
Date: Saturday October 3, 1998 @ 20:50
Author: zeev
Update of /repository/php3/functions
In directory asf:/u2/tmp/cvs-serv13891/functions
Modified Files:
basic_functions.c string.c
Log Message:
Fixes for #807 and #797
Index: php3/functions/basic_functions.c
diff -c php3/functions/basic_functions.c:1.224 php3/functions/basic_functions.c:1.225
*** php3/functions/basic_functions.c:1.224 Tue Sep 29 03:14:40 1998
--- php3/functions/basic_functions.c Sat Oct 3 20:50:21 1998
***************
*** 927,933 ****
WRONG_PARAM_COUNT;
}
if (!(array->type & IS_HASH)) {
! php3_error(E_WARNING, "Wrong datatype in uasort() call");
user_compare_func_name = old_compare_func;
return;
}
--- 927,933 ----
WRONG_PARAM_COUNT;
}
if (!(array->type & IS_HASH)) {
! php3_error(E_WARNING, "Wrong datatype in uksort() call");
user_compare_func_name = old_compare_func;
return;
}
Index: php3/functions/string.c
diff -c php3/functions/string.c:1.142 php3/functions/string.c:1.143
*** php3/functions/string.c:1.142 Sat Oct 3 15:10:14 1998
--- php3/functions/string.c Sat Oct 3 20:50:22 1998
***************
*** 30,36 ****
*/
! /* $Id: string.c,v 1.142 1998/10/03 19:10:14 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 30,36 ----
*/
! /* $Id: string.c,v 1.143 1998/10/04 00:50:22 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 987,993 ****
static void _php3_char_to_str(char *str,uint len,char from,char *to,int to_len,pval *result)
{
int char_count=0;
! char *source,*target,*tmp;
for (source=str; *source; source++) {
if (*source==from) {
--- 987,993 ----
static void _php3_char_to_str(char *str,uint len,char from,char *to,int to_len,pval *result)
{
int char_count=0;
! char *source,*target,*tmp,*source_end=source+len;
for (source=str; *source; source++) {
if (*source==from) {
***************
*** 1006,1012 ****
result->value.str.len = len+char_count*(to_len-1);
result->value.str.val = target = (char *) emalloc(result->value.str.len+1);
! for (source=str; *source; source++) {
if (*source==from) {
for (tmp=to; *tmp; tmp++) {
*target = *tmp;
--- 1006,1012 ----
result->value.str.len = len+char_count*(to_len-1);
result->value.str.val = target = (char *) emalloc(result->value.str.len+1);
! for (source=str; source<source_end; source++) {
if (*source==from) {
for (tmp=to; *tmp; tmp++) {
*target = *tmp;
***************
*** 1017,1023 ****
target++;
}
}
! *target = *source;
}
--- 1017,1023 ----
target++;
}
}
! *target = 0;
}
***************
*** 1203,1209 ****
void php3_newline_to_br(INTERNAL_FUNCTION_PARAMETERS)
{
pval *str;
-
if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &str)==FAILURE) {
WRONG_PARAM_COUNT;
--- 1203,1208 ----
--
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