argh..Finally

This commit is contained in:
Mark Musone 1999-08-24 20:56:02 +00:00
parent 9aea8d5bdc
commit d8a322e7be
2 changed files with 16 additions and 15 deletions

View File

@ -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,15 +924,6 @@ void cc_fetched(const CALEVENT *event)
}
void cc_log(const char *fmt, ...)
{
}
void cc_dlog(const char *fmt, ...)
{
}
void cc_login(const char **user, const char **pwd)
{
@ -940,8 +931,18 @@ void cc_login(const char **user, const char **pwd)
*user=icap_user;
*pwd=icap_password;
}
void cc_vlog(const char *fmt,va_list ap)
{
}
void cc_vdlog(const char *fmt,va_list ap)
{
}
#endif
/*
* Local_ variables:
* tab-width: 4

View File

@ -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);