summaryrefslogtreecommitdiff
path: root/ext/standard
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard')
-rw-r--r--ext/standard/base64.c4
-rw-r--r--ext/standard/base64.h2
-rw-r--r--ext/standard/dir.c2
-rw-r--r--ext/standard/file.c12
-rw-r--r--ext/standard/fsock.c2
-rw-r--r--ext/standard/fsock.h2
-rw-r--r--ext/standard/head.c18
-rw-r--r--ext/standard/head.h10
-rw-r--r--ext/standard/iptc.c2
-rw-r--r--ext/standard/output.c2
-rw-r--r--ext/standard/pageinfo.c4
-rw-r--r--ext/standard/pageinfo.h2
-rw-r--r--ext/standard/post.c2
-rw-r--r--ext/standard/type.c2
-rw-r--r--ext/standard/type.h2
-rw-r--r--ext/standard/url.c4
-rw-r--r--ext/standard/url.h2
17 files changed, 37 insertions, 37 deletions
diff --git a/ext/standard/base64.c b/ext/standard/base64.c
index fcec86bbba..3f676ba8b9 100644
--- a/ext/standard/base64.c
+++ b/ext/standard/base64.c
@@ -31,7 +31,7 @@ static char base64_table[] =
};
static char base64_pad = '=';
-unsigned char *_php3_base64_encode(const unsigned char *string, int length, int *ret_length) {
+unsigned char *php_base64_encode(const unsigned char *string, int length, int *ret_length) {
const unsigned char *current = string;
int i = 0;
unsigned char *result = (unsigned char *)emalloc(((length + 3 - length % 3) * 4 / 3 + 1) * sizeof(char));
@@ -150,7 +150,7 @@ PHP_FUNCTION(base64_encode) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(string);
- result = _php3_base64_encode((*string)->value.str.val, (*string)->value.str.len, &ret_length);
+ result = php_base64_encode((*string)->value.str.val, (*string)->value.str.len, &ret_length);
if (result != NULL) {
return_value->value.str.val = result;
return_value->value.str.len = ret_length;
diff --git a/ext/standard/base64.h b/ext/standard/base64.h
index b71898dac3..23d9ffd591 100644
--- a/ext/standard/base64.h
+++ b/ext/standard/base64.h
@@ -34,7 +34,7 @@
PHP_FUNCTION(base64_decode);
PHP_FUNCTION(base64_encode);
-extern unsigned char *_php3_base64_encode(const unsigned char *, int, int *);
+extern unsigned char *php_base64_encode(const unsigned char *, int, int *);
extern unsigned char *_php3_base64_decode(const unsigned char *, int, int *);
#endif /* _BASE64_h */
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 0717badf87..9239ea33c6 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -209,7 +209,7 @@ PHP_FUNCTION(closedir)
FETCH_DIRP();
- php3_list_delete(dirp->id);
+ zend_list_delete(dirp->id);
}
/* }}} */
diff --git a/ext/standard/file.c b/ext/standard/file.c
index d4cd4fae3d..d8a312d4ce 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -700,7 +700,7 @@ PHP_FUNCTION(fclose)
what = zend_fetch_resource(arg1,-1,"File-Handle",&type,2,le_fopen,le_socket);
ZEND_VERIFY_RESOURCE(what);
- php3_list_delete((*arg1)->value.lval);
+ zend_list_delete((*arg1)->value.lval);
RETURN_TRUE;
}
@@ -776,7 +776,7 @@ PHP_FUNCTION(pclose)
what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,1,le_popen);
ZEND_VERIFY_RESOURCE(what);
- php3_list_delete((*arg1)->value.lval);
+ zend_list_delete((*arg1)->value.lval);
RETURN_LONG(FIL(pclose_ret));
}
@@ -888,7 +888,7 @@ PHP_FUNCTION(set_socket_timeout)
convert_to_long(socket);
convert_to_long(timeout);
- sock = php3_list_find(socket->value.lval, &type);
+ sock = zend_list_find(socket->value.lval, &type);
if (type!=le_socket) {
php_error(E_WARNING,"%d is not a socket id",socket->value.lval);
RETURN_FALSE;
@@ -1337,7 +1337,7 @@ PHP_FUNCTION(readfile)
}
RETURN_FALSE;
}
- if (php3_header()) {
+ if (php_header()) {
size = php_passthru_fd(socketd, fp, issock);
}
if (issock) {
@@ -1400,11 +1400,11 @@ PHP_FUNCTION(fpassthru)
}
size = 0;
- if (php3_header()) { /* force headers if not already sent */
+ if (php_header()) { /* force headers if not already sent */
size = php_passthru_fd(socketd, (FILE*) what, issock);
}
- php3_list_delete((*arg1)->value.lval);
+ zend_list_delete((*arg1)->value.lval);
RETURN_LONG(size);
}
diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index bbb22c9f1f..0cfdcc4947 100644
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -444,7 +444,7 @@ static php3i_sockbuf *_php3_sock_create(int socket FLS_DC)
return sock;
}
-size_t _php3_sock_set_def_chunk_size(size_t size)
+size_t php_sock_set_def_chunk_size(size_t size)
{
size_t old;
FLS_FETCH();
diff --git a/ext/standard/fsock.h b/ext/standard/fsock.h
index a833f9be44..04108580b8 100644
--- a/ext/standard/fsock.h
+++ b/ext/standard/fsock.h
@@ -69,7 +69,7 @@ int _php3_is_persistent_sock(int);
int _php3_sock_set_blocking(int socket, int mode);
int _php3_sock_destroy(int socket);
int php_sock_close(int socket);
-size_t _php3_sock_set_def_chunk_size(size_t size);
+size_t php_sock_set_def_chunk_size(size_t size);
int php_msock_destroy(int *data);
PHPAPI int connect_nonb(int sockfd, struct sockaddr *addr, socklen_t addrlen, struct timeval *timeout);
diff --git a/ext/standard/head.c b/ext/standard/head.c
index 523e3ff9ac..5bc39e5a3a 100644
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -104,7 +104,7 @@ void php4i_add_header_information(char *header_information, uint header_length)
rr = r + 1;
}
if (PG(safe_mode) && (!strcasecmp(header_information, "WWW-authenticate"))) {
- myuid = _php3_getuid();
+ myuid = php_getuid();
sprintf(temp2, "realm=\"%ld ", myuid); /* SAFE */
temp = _php3_regreplace("realm=\"", temp2, rr, 1, 0);
if (!strcmp(temp, rr)) {
@@ -214,16 +214,16 @@ PHP_FUNCTION(Header)
#if 0
/*
- * php3_header() flushes the header info built up using calls to
+ * php_header() flushes the header info built up using calls to
* the Header() function. If type is 1, a redirect to str is done.
* Otherwise type should be 0 and str NULL.
*
* The function returns non-zero if output is allowed after the
- * call, and zero otherwise. Any call to php3_header() must check
+ * call, and zero otherwise. Any call to php_header() must check
* the return status and if false, no output must be sent. This
* is in order to correctly handle HEAD requests.
*/
-PHPAPI int php3_header(void)
+PHPAPI int php_header(void)
{
#if APACHE
CookieList *cookie;
@@ -379,7 +379,7 @@ PHPAPI int php3_header(void)
return(1);
}
#else
-PHPAPI int php3_header()
+PHPAPI int php_header()
{
SLS_FETCH();
@@ -548,7 +548,7 @@ PHP_FUNCTION(setcookie)
}
-int php3_headers_unsent(void)
+int php_headers_unsent(void)
{
if (php3_HeaderPrinted!=1 || !php3_PrintHeader) {
return 1;
@@ -568,13 +568,13 @@ PHP_FUNCTION(headers_sent)
}
}
-function_entry php3_header_functions[] = {
+function_entry php_header_functions[] = {
{NULL, NULL, NULL}
};
-php3_module_entry php3_header_module_entry = {
- "PHP_head", php3_header_functions, NULL, NULL, PHP_RINIT(head), NULL, NULL, STANDARD_MODULE_PROPERTIES
+php3_module_entry php_header_module_entry = {
+ "PHP_head", php_header_functions, NULL, NULL, PHP_RINIT(head), NULL, NULL, STANDARD_MODULE_PROPERTIES
};
/*
diff --git a/ext/standard/head.h b/ext/standard/head.h
index 51208a606e..df5aceb6fe 100644
--- a/ext/standard/head.h
+++ b/ext/standard/head.h
@@ -49,8 +49,8 @@ typedef struct CookieList {
struct CookieList *next;
} CookieList;
-extern php3_module_entry php3_header_module_entry;
-#define php3_header_module_ptr &php3_header_module_entry
+extern php3_module_entry php_header_module_entry;
+#define php_header_module_ptr &php_header_module_entry
extern PHP_RINIT_FUNCTION(head);
PHP_FUNCTION(Header);
@@ -59,9 +59,9 @@ PHP_FUNCTION(headers_sent);
void php4i_add_header_information(char *header_information, uint header_length);
-PHPAPI int php3_header(void);
-int php3_headers_unsent(void);
+PHPAPI int php_header(void);
+int php_headers_unsent(void);
-#define phpext_head_ptr php3_header_module_ptr
+#define phpext_head_ptr php_header_module_ptr
#endif
diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c
index f790b35446..004c3998ad 100644
--- a/ext/standard/iptc.c
+++ b/ext/standard/iptc.c
@@ -204,7 +204,7 @@ PHP_FUNCTION(iptcembed)
}
if (spool > 0)
- if (!php3_header()){ /* we got a HEAD request. */
+ if (!php_header()){ /* we got a HEAD request. */
if (spool == 2){
RETURN_TRUE; /* we only wanted to spool - report success. */
} else
diff --git a/ext/standard/output.c b/ext/standard/output.c
index a4b022313c..721379471b 100644
--- a/ext/standard/output.c
+++ b/ext/standard/output.c
@@ -334,7 +334,7 @@ static int php_ub_body_write(const char *str, uint str_length)
if (SG(request_info).headers_only) {
zend_bailout();
}
- if (php3_header()) {
+ if (php_header()) {
OG(php_body_write) = php_ub_body_write_no_header;
result = php_ub_body_write_no_header(str, str_length);
}
diff --git a/ext/standard/pageinfo.c b/ext/standard/pageinfo.c
index 188b5bad4e..023a283fec 100644
--- a/ext/standard/pageinfo.c
+++ b/ext/standard/pageinfo.c
@@ -81,7 +81,7 @@ static void _php3_statpage(void)
#endif
}
-long _php3_getuid(void)
+long php_getuid(void)
{
BLS_FETCH();
@@ -95,7 +95,7 @@ PHP_FUNCTION(getmyuid)
{
long uid;
- uid = _php3_getuid();
+ uid = php_getuid();
if (uid < 0) {
RETURN_FALSE;
} else {
diff --git a/ext/standard/pageinfo.h b/ext/standard/pageinfo.h
index d593ade004..5f230fec05 100644
--- a/ext/standard/pageinfo.h
+++ b/ext/standard/pageinfo.h
@@ -6,6 +6,6 @@ PHP_FUNCTION(getmypid);
PHP_FUNCTION(getmyinode);
PHP_FUNCTION(getlastmod);
-extern long _php3_getuid(void);
+extern long php_getuid(void);
#endif
diff --git a/ext/standard/post.c b/ext/standard/post.c
index c6b1c5297a..b1aaa26a97 100644
--- a/ext/standard/post.c
+++ b/ext/standard/post.c
@@ -47,7 +47,7 @@ void php_parse_gpc_data(char *val, char *var, pval *track_vars_array ELS_DC PLS_
return;
}
- var_type = php3_check_ident_type(var);
+ var_type = php_check_ident_type(var);
if (var_type == GPC_INDEXED_ARRAY) {
ind = php3_get_ident_index(var);
if (PG(magic_quotes_gpc)) {
diff --git a/ext/standard/type.c b/ext/standard/type.c
index ee6ab91049..be5c79467e 100644
--- a/ext/standard/type.c
+++ b/ext/standard/type.c
@@ -58,7 +58,7 @@ int php3_check_type(char *str)
* 1 - non-index array
* 2 - index array
*/
-int php3_check_ident_type(char *str)
+int php_check_ident_type(char *str)
{
char *s;
diff --git a/ext/standard/type.h b/ext/standard/type.h
index 62f98bea7a..7bb136cef4 100644
--- a/ext/standard/type.h
+++ b/ext/standard/type.h
@@ -30,7 +30,7 @@
#define _TYPE_H
extern int php3_check_type(char *str);
-extern int php3_check_ident_type(char *str);
+extern int php_check_ident_type(char *str);
extern char *php3_get_ident_index(char *str);
#define GPC_REGULAR 0x1
diff --git a/ext/standard/url.c b/ext/standard/url.c
index 23eb24bc38..4fb2393989 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -395,13 +395,13 @@ PHP_FUNCTION(rawurldecode)
if (!(*arg)->value.str.len) {
RETURN_FALSE;
}
- len = _php3_rawurldecode((*arg)->value.str.val, (*arg)->value.str.len);
+ len = php_raw_url_decode((*arg)->value.str.val, (*arg)->value.str.len);
RETVAL_STRINGL((*arg)->value.str.val, len, 1);
}
/* }}} */
-int _php3_rawurldecode(char *str, int len)
+int php_raw_url_decode(char *str, int len)
{
char *dest = str;
char *data = str;
diff --git a/ext/standard/url.h b/ext/standard/url.h
index eaf5c32f77..d075f6164b 100644
--- a/ext/standard/url.h
+++ b/ext/standard/url.h
@@ -43,7 +43,7 @@ void free_url(url *);
extern url *url_parse(char *);
extern int _php3_urldecode(char *, int); /* return value: length of decoded string */
extern char *_php3_urlencode(char *, int);
-extern int _php3_rawurldecode(char *, int); /* return value: length of decoded string */
+extern int php_raw_url_decode(char *, int); /* return value: length of decoded string */
extern char *_php3_rawurlencode(char *, int);
PHP_FUNCTION(parse_url);
View Lorry Controller Status