cvs: /php4/ext/standard pack.c reg.c string.c
| From: | Egon Schmid | Date: | Thu, 24 Feb 2000 10:12:12 +0000 |
| Subject: | cvs: /php4/ext/standard pack.c reg.c string.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-10816@lists.php.net to get a copy of this message | ||
eschmid Thu Feb 24 02:12:12 2000 EDT
Modified files:
/php4/ext/standard pack.c reg.c string.c
Log:
Will watch the diffs as much as I can.
Index: php4/ext/standard/pack.c
diff -u php4/ext/standard/pack.c:1.17 php4/ext/standard/pack.c:1.18
--- php4/ext/standard/pack.c:1.17 Sat Feb 19 15:41:21 2000
+++ php4/ext/standard/pack.c Thu Feb 24 02:11:42 2000
@@ -15,7 +15,7 @@
| Authors: Chris Schneider <cschneid@relog.ch> |
+----------------------------------------------------------------------+
*/
-/* $Id: pack.c,v 1.17 2000/02/19 23:41:21 zeev Exp $ */
+/* $Id: pack.c,v 1.18 2000/02/24 10:11:42 eschmid Exp $ */
#include "php.h"
@@ -97,7 +97,7 @@
/* pack() idea stolen from Perl (implemented formats behave the same as there)
* Implemented formats are A,a,h,H,c,C,s,S,i,I,l,L,n,N,f,d,x,X,@.
*/
-/* {{{ proto string pack(string format, mixed arg1, mixed arg2, ...)
+/* {{{ proto string pack(string format, mixed arg1 [, mixed arg2 [, ...]])
Takes 1 or more arguments and packs them into a binary string according to the format argument
*/
PHP_FUNCTION(pack)
{
Index: php4/ext/standard/reg.c
diff -u php4/ext/standard/reg.c:1.31 php4/ext/standard/reg.c:1.32
--- php4/ext/standard/reg.c:1.31 Sat Feb 19 15:41:21 2000
+++ php4/ext/standard/reg.c Thu Feb 24 02:11:42 2000
@@ -17,7 +17,7 @@
| Jaakko Hyvätti <jaakko@hyvatti.iki.fi> |
+----------------------------------------------------------------------+
*/
-/* $Id: reg.c,v 1.31 2000/02/19 23:41:21 zeev Exp $ */
+/* $Id: reg.c,v 1.32 2000/02/24 10:11:42 eschmid Exp $ */
#include <stdio.h>
#include "php.h"
@@ -510,7 +510,7 @@
/* ("root", "passwd", "uid", "gid",
"other:stuff:like:/bin/sh")
= split(":", $passwd_file, 5); */
/* {{{ proto array split(string pattern, string string [, int limit])
- split string into array by regular expression */
+ Split string into array by regular expression */
PHP_FUNCTION(split)
{
pval **spliton, **str, **arg_count = NULL;
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.101 php4/ext/standard/string.c:1.102
--- php4/ext/standard/string.c:1.101 Sat Feb 19 15:41:21 2000
+++ php4/ext/standard/string.c Thu Feb 24 02:11:42 2000
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.101 2000/02/19 23:41:21 zeev Exp $ */
+/* $Id: string.c,v 1.102 2000/02/24 10:11:42 eschmid Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -59,8 +59,8 @@
return new;
}
-/* proto bin2hex(string data)
- converts the binary representation of data to hex */
+/* {{{ proto string bin2hex(string data)
+ Converts the binary representation of data to hex */
PHP_FUNCTION(bin2hex)
{
zval **data;
@@ -81,7 +81,7 @@
RETURN_STRINGL(new, newlen, 0);
}
-
+/* }}} */
/* {{{ proto int strspn(string str, string mask)
Find length of initial segment consisting entirely of characters found in mask */
@@ -1436,9 +1436,7 @@
}
/* {{{ proto string addcslashes(string str, string charlist)
- Escape all chars mentioned in charlist with backslash. It creates
- octal representations if asked to backslash characters with 8th bit set
- or with ASCII<32 (except '\n', '\r', '\t' etc...) */
+ Escape all chars mentioned in charlist with backslash. It creates octal representations if asked
to backslash characters with 8th bit set or with ASCII<32 (except '\n', '\r',
'\t' etc...). */
PHP_FUNCTION(addcslashes)
{
zval **str, **what;
@@ -1469,7 +1467,7 @@
/* }}} */
/* {{{ proto string stripcslashes(string str)
- Strip backslashes from a string. Uses C-style conventions*/
+ Strip backslashes from a string. Uses C-style conventions */
PHP_FUNCTION(stripcslashes)
{
zval **str;
@@ -2369,7 +2367,7 @@
}
/* }}} */
-/* {{{ proto mixed count_chars(string input[, int mode])
+/* {{{ proto mixed count_chars(string input [, int mode])
Returns info about what characters are used in input */
PHP_FUNCTION(count_chars)
{