diff options
| author | Mark Musone <musone@php.net> | 1999-08-24 20:56:02 +0000 |
|---|---|---|
| committer | Mark Musone <musone@php.net> | 1999-08-24 20:56:02 +0000 |
| commit | d8a322e7be07473647730144a5507f7da82b9680 (patch) | |
| tree | 74e18f507c1e512cabbb96aba1e0ee4a71214894 /ext/icap | |
| parent | 9aea8d5bdcf034f9c140ac9f4a55878f1c85fef0 (diff) | |
| download | php-git-d8a322e7be07473647730144a5507f7da82b9680.tar.gz | |
argh..Finally
Diffstat (limited to 'ext/icap')
| -rw-r--r-- | ext/icap/php3_icap.c | 25 | ||||
| -rw-r--r-- | ext/icap/php3_icap.h | 4 |
2 files changed, 15 insertions, 14 deletions
diff --git a/ext/icap/php3_icap.c b/ext/icap/php3_icap.c index b0e0bbd1c7..33c565c907 100644 --- a/ext/icap/php3_icap.c +++ b/ext/icap/php3_icap.c @@ -95,7 +95,7 @@ function_entry icap_functions[] = { php3_module_entry php3_icap_module_entry = { - CALVER, icap_functions, icap_init, NULL, NULL, NULL, icap_info, 0, 0, 0, NULL + CALVER, icap_functions, PHP_MINIT(icap), NULL, NULL, NULL, PHP_MINFO(icap), 0, 0, 0, NULL }; @@ -125,7 +125,7 @@ CALSTREAM *cal_close_it (pils *icap_le_struct) } -void icap_info(void) +PHP_MINFO_FUNCTION(icap) { php3_printf("Icap Support enabled<br>"); php3_printf("<table>"); @@ -134,7 +134,7 @@ void icap_info(void) php3_printf("</tr></table>"); } -int icap_init(INIT_FUNC_ARGS) +PHP_MINIT_FUNCTION(icap) { le_icap = register_list_destructors(cal_close_it,NULL); @@ -460,7 +460,7 @@ if(myargc == 3) g_cal_list=NULL; - cal_search_range(icap_le_struct->icap_stream,&begincal,(myargc == 3) ? NULL : &endcal); + cal_search_range(icap_le_struct->icap_stream,&begincal,&endcal); my_cal_list=g_cal_list; while(my_cal_list != NULL) { @@ -924,24 +924,25 @@ void cc_fetched(const CALEVENT *event) } -void cc_log(const char *fmt, ...) + +void cc_login(const char **user, const char **pwd) { +*user=icap_user; +*pwd=icap_password; } -void cc_dlog(const char *fmt, ...) -{ +void cc_vlog(const char *fmt,va_list ap) +{ } - -void cc_login(const char **user, const char **pwd) +void cc_vdlog(const char *fmt,va_list ap) { - -*user=icap_user; -*pwd=icap_password; } + #endif + /* * Local_ variables: * tab-width: 4 diff --git a/ext/icap/php3_icap.h b/ext/icap/php3_icap.h index ad77249e01..f7e1b06b54 100644 --- a/ext/icap/php3_icap.h +++ b/ext/icap/php3_icap.h @@ -17,16 +17,16 @@ #include "build-defs.h" #endif +extern PHP_MINIT_FUNCTION(icap); +PHP_MINFO_FUNCTION(icap); /* Functions accessable to PHP */ extern php3_module_entry php3_icap_module_entry; #define php3_icap_module_ptr &php3_icap_module_entry #define phpext_icap_ptr php3_icap_module_ptr -extern int icap_init(INIT_FUNC_ARGS); extern int icap_init_request(INIT_FUNC_ARGS); extern int icap_end_request(void); -extern void icap_info(void); void php3_icap_open(INTERNAL_FUNCTION_PARAMETERS); void php3_icap_popen(INTERNAL_FUNCTION_PARAMETERS); void php3_icap_reopen(INTERNAL_FUNCTION_PARAMETERS); |