cvs: /php4/ext/icap php3_icap.c php3_icap.h

musone Tue Aug 24 16:56:03 1999 EDT Modified files: /php4/ext/icap php3_icap.c php3_icap.h Log: argh..Finally Index: php4/ext/icap/php3_icap.c diff -u php4/ext/icap/php3_icap.c:1.10 php4/ext/icap/php3_icap.c:1.11 --- php4/ext/icap/php3_icap.c:1.10 Mon Aug 23 13:19:06 1999 +++ php4/ext/icap/php3_icap.c Tue Aug 24 16:56:02 1999 @@ -95,7 +95,7 @@ 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 @@ } -void icap_info(void) +PHP_MINFO_FUNCTION(icap) { php3_printf("Icap Support enabled<br>"); php3_printf("<table>"); @@ -134,7 +134,7 @@ 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 @@ 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,23 +924,24 @@ } -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: Index: php4/ext/icap/php3_icap.h diff -u php4/ext/icap/php3_icap.h:1.5 php4/ext/icap/php3_icap.h:1.6 --- php4/ext/icap/php3_icap.h:1.5 Mon Aug 23 13:19:05 1999 +++ php4/ext/icap/php3_icap.h Tue Aug 24 16:56:02 1999 @@ -1,4 +1,4 @@ -/* $Id: php3_icap.h,v 1.5 1999/08/23 17:19:05 musone Exp $ */ +/* $Id: php3_icap.h,v 1.6 1999/08/24 20:56:02 musone Exp $ */ #ifndef _INCLUDED_ICAP_H #define _INCLUDED_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);