CVS update: php3/functions
| From: | fmk | Date: | Fri, 12 Feb 1999 15:41:18 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-4068@lists.php.net to get a copy of this message | ||
Date: Friday February 12, 1999 @ 10:41
Author: fmk
Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv16736
Modified Files:
string.c php3_string.h
Log Message:
Function _StrTr renamed to _php3_strtr
Index: php3/functions/string.c
diff -c php3/functions/string.c:1.177 php3/functions/string.c:1.178
*** php3/functions/string.c:1.177 Tue Feb 9 08:34:09 1999
--- php3/functions/string.c Fri Feb 12 10:41:17 1999
***************
*** 30,36 ****
*/
! /* $Id: string.c,v 1.177 1999/02/09 13:34:09 sas Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 30,36 ----
*/
! /* $Id: string.c,v 1.178 1999/02/12 15:41:17 fmk Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 1003,1032 ****
}
/* }}} */
! /* {{{ proto string strtr(string str, string from, string to)
! Translate characters in str using given translation tables */
! void php3_strtr(INTERNAL_FUNCTION_PARAMETERS)
! { /* strtr(STRING,FROM,TO) */
! pval *str, *from, *to;
! unsigned char xlat[256];
! unsigned char *str_from, *str_to, *string;
int i, len1, len2;
! TLS_VARS;
!
! if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &str, &from, &to) ==
! FAILURE) {
! WRONG_PARAM_COUNT;
! }
! convert_to_string(str);
! convert_to_string(from);
! convert_to_string(to);
!
! string = (unsigned char*) str->value.str.val;
! str_from = (unsigned char*) from->value.str.val;
! str_to = (unsigned char*) to->value.str.val;
! len1 = from->value.str.len;
! len2 = to->value.str.len;
if (len1 > len2) {
str_from[len2] = '\0';
--- 1003,1015 ----
}
/* }}} */
! PHPAPI char *_php3_strtr(char *string, char *str_from, char *str_to)
! {
int i, len1, len2;
! unsigned char xlat[256];
! len1 = strlen(str_from);
! len2 = strlen(str_to);
if (len1 > len2) {
str_from[len2] = '\0';
***************
*** 1038,1048 ****
xlat[(unsigned char) str_from[i]] = str_to[i];
}
! for (i = 0; i < str->value.str.len; i++) {
string[i] = xlat[(unsigned char) string[i]];
}
! RETVAL_STRING((char *)string,1);
}
/* }}} */
--- 1021,1049 ----
xlat[(unsigned char) str_from[i]] = str_to[i];
}
! for (i = 0; i < (int)strlen(string); i++) {
string[i] = xlat[(unsigned char) string[i]];
}
+
+ return string;
+ }
+
+ /* {{{ proto string strtr(string str, string from, string to)
+ Translate characters in str using given translation tables */
+ void php3_strtr(INTERNAL_FUNCTION_PARAMETERS)
+ { /* strtr(STRING,FROM,TO) */
+ pval *str, *from, *to;
+ TLS_VARS;
+
+ if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &str, &from, &to) ==
+ FAILURE) {
+ WRONG_PARAM_COUNT;
+ }
+ convert_to_string(str);
+ convert_to_string(from);
+ convert_to_string(to);
! RETVAL_STRING(_php3_strtr(str->value.str.val, from->value.str.val,
to->value.str.val),1);
}
/* }}} */
Index: php3/functions/php3_string.h
diff -c php3/functions/php3_string.h:1.34 php3/functions/php3_string.h:1.35
*** php3/functions/php3_string.h:1.34 Mon Feb 1 02:45:01 1999
--- php3/functions/php3_string.h Fri Feb 12 10:41:17 1999
***************
*** 29,35 ****
*/
! /* $Id: php3_string.h,v 1.34 1999/02/01 07:45:01 fmk Exp $ */
#ifndef _PHPSTRING_H
#define _PHPSTRING_H
--- 29,35 ----
*/
! /* $Id: php3_string.h,v 1.35 1999/02/12 15:41:17 fmk Exp $ */
#ifndef _PHPSTRING_H
#define _PHPSTRING_H
***************
*** 90,96 ****
extern PHPAPI char *_php3_strtoupper(char *s);
extern PHPAPI char *_php3_strtolower(char *s);
! extern PHPAPI char *_StrTr(char *string, char *str_from, char *str_to);
extern PHPAPI char *_php3_addslashes(char *string, int length, int *new_length, int freeit);
extern PHPAPI void _php3_stripslashes(char *string, int *len);
extern PHPAPI void _php3_dirname(char *str, int len);
--- 90,97 ----
extern PHPAPI char *_php3_strtoupper(char *s);
extern PHPAPI char *_php3_strtolower(char *s);
! //extern PHPAPI char *_StrTr(char *string, char *str_from, char *str_to);
! extern PHPAPI char *_php3_strtr(char *string, char *str_from, char *str_to);
extern PHPAPI char *_php3_addslashes(char *string, int length, int *new_length, int freeit);
extern PHPAPI void _php3_stripslashes(char *string, int *len);
extern PHPAPI void _php3_dirname(char *str, int len);
--
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