cvs: php4 /ext/standard basic_functions.h crc32.c datetime.c info.c info.h levenshtein.c parsedate.y php_parsedate.h /main fopen-wrappers.c main.c
php.h php_ini.c php_ini.h php_ticks.c php_variables.c

From: Date: Mon, 21 Aug 2000 09:50:53 +0000
Subject: cvs: php4 /ext/standard basic_functions.h crc32.c datetime.c info.c info.h levenshtein.c parsedate.y php_parsedate.h /main fopen-wrappers.c main.c
php.h php_ini.c php_ini.h php_ticks.c php_variables.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-1284@lists.php.net to get a copy of this message
sas Mon Aug 21 02:50:53 2000 EDT Added files: /php4/ext/standard php_parsedate.h Modified files: /php4/ext/standard basic_functions.h crc32.c datetime.c info.c info.h levenshtein.c parsedate.y /php4/main fopen-wrappers.c main.c php.h php_ini.c php_ini.h php_ticks.c php_variables.c Log: Cleaning up some mess Index: php4/ext/standard/basic_functions.h diff -u php4/ext/standard/basic_functions.h:1.58 php4/ext/standard/basic_functions.h:1.59 --- php4/ext/standard/basic_functions.h:1.58 Tue Aug 1 00:45:14 2000 +++ php4/ext/standard/basic_functions.h Mon Aug 21 02:50:52 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.h,v 1.58 2000/08/01 07:45:14 hholzgra Exp $ */ +/* $Id: basic_functions.h,v 1.59 2000/08/21 09:50:52 sas Exp $ */ #ifndef BASIC_FUNCTIONS_H #define BASIC_FUNCTIONS_H @@ -116,6 +116,8 @@ #else typedef int php_stat_len; #endif + +PHPAPI int _php_error_log(int opt_err,char *message,char *opt,char *headers); #if SIZEOF_INT == 4 /* Most 32-bit and 64-bit systems have 32-bit ints */ Index: php4/ext/standard/crc32.c diff -u php4/ext/standard/crc32.c:1.2 php4/ext/standard/crc32.c:1.3 --- php4/ext/standard/crc32.c:1.2 Sun Jul 23 18:39:49 2000 +++ php4/ext/standard/crc32.c Mon Aug 21 02:50:52 2000 @@ -16,9 +16,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: crc32.c,v 1.2 2000/07/24 01:39:49 david Exp $ */ +/* $Id: crc32.c,v 1.3 2000/08/21 09:50:52 sas Exp $ */ #include "php.h" +#include "basic_functions.h" /* * This code implements the AUTODIN II polynomial Index: php4/ext/standard/datetime.c diff -u php4/ext/standard/datetime.c:1.52 php4/ext/standard/datetime.c:1.53 --- php4/ext/standard/datetime.c:1.52 Tue Aug 1 04:16:20 2000 +++ php4/ext/standard/datetime.c Mon Aug 21 02:50:52 2000 @@ -19,7 +19,7 @@ */ -/* $Id: datetime.c,v 1.52 2000/08/01 11:16:20 hholzgra Exp $ */ +/* $Id: datetime.c,v 1.53 2000/08/21 09:50:52 sas Exp $ */ #include "php.h" @@ -33,6 +33,8 @@ #endif #include <stdio.h> +#include "php_parsedate.h" + char *mon_full_names[] = { "January", "February", "March", "April", @@ -64,8 +66,6 @@ }; #define isleap(year) (((year%4) == 0 && (year%100)!=0) || (year%400)==0) - -extern PHPAPI time_t parse_date (const char *p, const time_t *now); /* {{{ proto int time(void) Return current UNIX timestamp */ Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.109 php4/ext/standard/info.c:1.110 --- php4/ext/standard/info.c:1.109 Sun Aug 20 07:43:56 2000 +++ php4/ext/standard/info.c Mon Aug 21 02:50:52 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.109 2000/08/20 14:43:56 sas Exp $ */ +/* $Id: info.c,v 1.110 2000/08/21 09:50:52 sas Exp $ */ #include "php.h" #include "php_ini.h" @@ -108,7 +108,7 @@ } } -void php_info_print_style() +void php_info_print_style(void) { php_printf("<STYLE TYPE=\"text/css\"><!--\n"); php_printf("A { text-decoration: none; }\n"); Index: php4/ext/standard/info.h diff -u php4/ext/standard/info.h:1.15 php4/ext/standard/info.h:1.16 --- php4/ext/standard/info.h:1.15 Sun Jul 23 18:39:49 2000 +++ php4/ext/standard/info.h Mon Aug 21 02:50:52 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.h,v 1.15 2000/07/24 01:39:49 david Exp $ */ +/* $Id: info.h,v 1.16 2000/08/21 09:50:52 sas Exp $ */ #ifndef INFO_H #define INFO_H @@ -53,10 +53,12 @@ PHP_FUNCTION(phpcredits); PHP_FUNCTION(php_logo_guid); PHP_FUNCTION(zend_logo_guid); +PHP_FUNCTION(php_egg_logo_guid); PHP_FUNCTION(php_sapi_name); PHPAPI void php_print_info(int flag); PHPAPI void php_print_credits(int flag); PHPAPI void php_print_style(void); +PHPAPI void php_info_print_style(void); PHPAPI void php_info_print_table_colspan_header(int num_cols, char *header); PHPAPI void php_info_print_table_header(int num_cols, ...); PHPAPI void php_info_print_table_row(int num_cols, ...); Index: php4/ext/standard/levenshtein.c diff -u php4/ext/standard/levenshtein.c:1.11 php4/ext/standard/levenshtein.c:1.12 --- php4/ext/standard/levenshtein.c:1.11 Tue Aug 1 00:57:19 2000 +++ php4/ext/standard/levenshtein.c Mon Aug 21 02:50:52 2000 @@ -15,7 +15,7 @@ | Author: Hartmut Holzgraefe <hartmut@six.de> | +----------------------------------------------------------------------+ */ -/* $Id: levenshtein.c,v 1.11 2000/08/01 07:57:19 hholzgra Exp $ */ +/* $Id: levenshtein.c,v 1.12 2000/08/21 09:50:52 sas Exp $ */ #include "php.h" #include <stdlib.h> @@ -24,7 +24,7 @@ #include "php_string.h" /* faster, but obfuscated, all operations have a cost of 1 */ -int fastest_levdist(const char *s1, const char *s2) +static int fastest_levdist(const char *s1, const char *s2) { register char *p1,*p2; register int i,j,n; @@ -179,7 +179,7 @@ return n-=cost_del; } -int custom_levdist(char *str1,char *str2,char *callback_name) +static int custom_levdist(char *str1,char *str2,char *callback_name) { php_error(E_WARNING,"the general Levenshtein support is not there yet"); /* not there yet */ Index: php4/ext/standard/parsedate.y diff -u php4/ext/standard/parsedate.y:1.20 php4/ext/standard/parsedate.y:1.21 --- php4/ext/standard/parsedate.y:1.20 Sat Jun 17 09:49:03 2000 +++ php4/ext/standard/parsedate.y Mon Aug 21 02:50:52 2000 @@ -26,6 +26,8 @@ # include "win32/time.h" #endif +#include <php_parsedate.h> + #if HAVE_STDLIB_H # include <stdlib.h> /* for `free'; used by Bison 1.27 */ #endif Index: php4/main/fopen-wrappers.c diff -u php4/main/fopen-wrappers.c:1.81 php4/main/fopen-wrappers.c:1.82 --- php4/main/fopen-wrappers.c:1.81 Sun Aug 20 21:30:25 2000 +++ php4/main/fopen-wrappers.c Mon Aug 21 02:50:52 2000 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.81 2000/08/21 04:30:25 andi Exp $ */ +/* $Id: fopen-wrappers.c,v 1.82 2000/08/21 09:50:52 sas Exp $ */ #include "php.h" #include "php_globals.h" @@ -244,7 +244,7 @@ return 0; } -FILE *php_fopen_and_set_opened_path(const char *path, char *mode, char **opened_path) +static FILE *php_fopen_and_set_opened_path(const char *path, char *mode, char **opened_path) { FILE *fp; Index: php4/main/main.c diff -u php4/main/main.c:1.296 php4/main/main.c:1.297 --- php4/main/main.c:1.296 Sun Aug 20 12:56:24 2000 +++ php4/main/main.c Mon Aug 21 02:50:53 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.296 2000/08/20 19:56:24 andi Exp $ */ +/* $Id: main.c,v 1.297 2000/08/21 09:50:53 sas Exp $ */ #include <stdio.h> @@ -304,7 +304,7 @@ #define PRINTF_BUFFER_SIZE 1024*4 /* wrapper for modules to use PHPWRITE */ -PHPAPI int php_write(void *buf, int size) +PHPAPI int php_write(void *buf, uint size) { return PHPWRITE(buf, size); } Index: php4/main/php.h diff -u php4/main/php.h:1.114 php4/main/php.h:1.115 --- php4/main/php.h:1.114 Sun Aug 20 12:56:24 2000 +++ php4/main/php.h Mon Aug 21 02:50:53 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.114 2000/08/20 19:56:24 andi Exp $ */ +/* $Id: php.h,v 1.115 2000/08/21 09:50:53 sas Exp $ */ #ifndef PHP_H #define PHP_H @@ -156,7 +156,7 @@ #include "safe_mode.h" #ifndef HAVE_STRERROR -extern char *strerror(int); +char *strerror(int); #endif #include "fopen-wrappers.h" @@ -240,12 +240,12 @@ #define php_sleep sleep #endif -extern void phperror(char *error); -extern PHPAPI int php_write(void *buf, int size); -extern PHPAPI int php_printf(const char *format, ...); -extern void php_log_err(char *log_message); -extern int Debug(char *format, ...); -extern int cfgparse(void); +void phperror(char *error); +PHPAPI int php_write(void *buf, uint size); +PHPAPI int php_printf(const char *format, ...); +void php_log_err(char *log_message); +int Debug(char *format, ...); +int cfgparse(void); #define php_error zend_error @@ -263,9 +263,6 @@ int php_global_shutdown_internal_extensions(void); int mergesort(void *base, size_t nmemb, register size_t size, int (*cmp) (const void *, const void *)); - -/*from basic functions*/ -extern PHPAPI int _php_error_log(int opt_err,char *message,char *opt,char *headers); PHPAPI void php_register_pre_request_shutdown(void (*func)(void *), void *userdata); Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.37 php4/main/php_ini.c:1.38 --- php4/main/php_ini.c:1.37 Tue Jul 11 07:29:38 2000 +++ php4/main/php_ini.c Mon Aug 21 02:50:53 2000 @@ -103,7 +103,7 @@ } -void php_ini_sort_entries() +void php_ini_sort_entries(void) { zend_hash_sort(&known_directives, qsort, ini_key_compare, 0); } Index: php4/main/php_ini.h diff -u php4/main/php_ini.h:1.24 php4/main/php_ini.h:1.25 --- php4/main/php_ini.h:1.24 Sun Jul 2 16:46:50 2000 +++ php4/main/php_ini.h Mon Aug 21 02:50:53 2000 @@ -55,7 +55,7 @@ int php_ini_mshutdown(void); int php_ini_rshutdown(void); -void php_ini_sort_entries(); +void php_ini_sort_entries(void); PHPAPI int php_register_ini_entries(php_ini_entry *ini_entry, int module_number); PHPAPI void php_unregister_ini_entries(int module_number); Index: php4/main/php_ticks.c diff -u php4/main/php_ticks.c:1.2 php4/main/php_ticks.c:1.3 --- php4/main/php_ticks.c:1.2 Sun Jul 23 22:41:00 2000 +++ php4/main/php_ticks.c Mon Aug 21 02:50:53 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ticks.c,v 1.2 2000/07/24 05:41:00 david Exp $ */ +/* $Id: php_ticks.c,v 1.3 2000/08/21 09:50:53 sas Exp $ */ #include "php.h" #include "php_ticks.h" @@ -55,7 +55,7 @@ return SUCCESS; } -void php_tick_iterator(void *data, void *arg) +static void php_tick_iterator(void *data, void *arg) { void (*func)(int); func = (void(*)(int))data; Index: php4/main/php_variables.c diff -u php4/main/php_variables.c:1.14 php4/main/php_variables.c:1.15 --- php4/main/php_variables.c:1.14 Thu May 18 08:34:21 2000 +++ php4/main/php_variables.c Mon Aug 21 02:50:53 2000 @@ -23,6 +23,7 @@ #include "ext/standard/php_standard.h" #include "php_variables.h" #include "php_globals.h" +#include "php_content_types.h" #include "SAPI.h" #include "zend_globals.h" Index: php4/ext/standard/php_parsedate.h +++ php4/ext/standard/php_parsedate.h /* +----------------------------------------------------------------------+ | PHP version 4.0 | +----------------------------------------------------------------------+ | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available at through the world-wide-web at | | http://www.php.net/license/2_02.txt. | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Authors: Sascha Schumann <sascha@schumann.cx> | +----------------------------------------------------------------------+ */ #ifndef PHP_PARSEDATE_H #define PHP_PARSEDATE_H #include <time.h> time_t parse_date(const char *p, const time_t *now); #endif

« previous php.cvs (#1284) next »