diff options
author | Zeev Suraski <zeev@php.net> | 1999-12-17 22:01:09 +0000 |
---|---|---|
committer | Zeev Suraski <zeev@php.net> | 1999-12-17 22:01:09 +0000 |
commit | 878ed4934c54ff26e763ebc1544c9c079ea1a16a (patch) | |
tree | 471824d54f65648c2da7276cd91fc448c386cb11 | |
parent | bb3ca126299a9ff8216782db49c9a15c261ff5ae (diff) | |
download | php-git-878ed4934c54ff26e763ebc1544c9c079ea1a16a.tar.gz |
More cleanup
-rw-r--r-- | ext/icap/Makefile.am | 2 | ||||
-rw-r--r-- | ext/icap/php_icap.c (renamed from ext/icap/php3_icap.c) | 63 | ||||
-rw-r--r-- | ext/icap/php_icap.h | 37 |
3 files changed, 50 insertions, 52 deletions
diff --git a/ext/icap/Makefile.am b/ext/icap/Makefile.am index 414a17b64b..cd5e8976f7 100644 --- a/ext/icap/Makefile.am +++ b/ext/icap/Makefile.am @@ -1,5 +1,5 @@ # $Id$ noinst_LTLIBRARIES=libphpext_icap.la -libphpext_icap_la_SOURCES=php3_icap.c +libphpext_icap_la_SOURCES=php_icap.c diff --git a/ext/icap/php3_icap.c b/ext/icap/php_icap.c index 74c6f72d39..c6994a2622 100644 --- a/ext/icap/php3_icap.c +++ b/ext/icap/php_icap.c @@ -58,7 +58,7 @@ CALSTREAM *cal_close_it (); CALSTREAM *cal_close_full (); -typedef struct php3_icap_le_struct { +typedef struct php_icap_le_struct { CALSTREAM *icap_stream; long flags; } pils; @@ -78,29 +78,29 @@ static cal_list_t *g_cal_list_end=NULL; */ function_entry icap_functions[] = { - {"icap_open", php3_icap_open, NULL}, - {"icap_popen", php3_icap_popen, NULL}, - {"icap_reopen", php3_icap_reopen, NULL}, - {"icap_fetch_event", php3_icap_fetch_event, NULL}, - {"icap_list_events", php3_icap_list_events, NULL}, - {"icap_list_alarms", php3_icap_list_alarms, NULL}, - {"icap_create_calendar", php3_icap_create_calendar, NULL}, - {"icap_rename_calendar", php3_icap_rename_calendar, NULL}, - {"icap_delete_calendar", php3_icap_delete_calendar, NULL}, - {"icap_delete_event", php3_icap_delete_event, NULL}, - {"icap_store_event", php3_icap_store_event, NULL}, - {"icap_snooze", php3_icap_snooze, NULL}, + PHP_FE(icap_open, NULL) + PHP_FE(icap_popen, NULL) + PHP_FE(icap_reopen, NULL) + PHP_FE(icap_fetch_event, NULL) + PHP_FE(icap_list_event, NULL) + PHP_FE(icap_list_alarms, NULL) + PHP_FE(icap_create_calendar, NULL) + PHP_FE(icap_rename_calendar, NULL) + PHP_FE(icap_delete_calendar, NULL) + PHP_FE(icap_delete_event, NULL) + PHP_FE(icap_store_event, NULL) + PHP_FE(icap_snooze, NULL) {NULL, NULL, NULL} }; -zend_module_entry php3_icap_module_entry = { +zend_module_entry php_icap_module_entry = { CALVER, icap_functions, PHP_MINIT(icap), NULL, NULL, NULL, PHP_MINFO(icap), 0, 0, 0, NULL }; #if COMPILE_DL -DLEXPORT zend_module_entry *get_module(void) { return &php3_icap_module_entry; } +DLEXPORT zend_module_entry *get_module(void) { return &php_icap_module_entry; } #endif /* @@ -156,7 +156,7 @@ static int add_assoc_object(pval *arg, char *key, pval *tmp) } -void php3_icap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) +void php_icap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) { pval *calendar; pval *user; @@ -201,7 +201,7 @@ void php3_icap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) /* {{{ proto int icap_close(int stream_id [, int options]) Close an ICAP stream */ -void php3_icap_close(INTERNAL_FUNCTION_PARAMETERS) +PHP_FUNCTION(icap_close) { pval *options, *streamind; int ind, ind_type; @@ -238,16 +238,16 @@ void php3_icap_close(INTERNAL_FUNCTION_PARAMETERS) /* {{{ proto int icap_open(string calendar, string user, string password [, int options]) Open an ICAP stream to a calendar */ -void php3_icap_open(INTERNAL_FUNCTION_PARAMETERS) +PHP_FUNCTION(icap_open) { - php3_icap_do_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); + php_icap_do_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ /* {{{ proto int icap_reopen(int stream_id, string calendar [, int options]) Reopen ICAP stream to new calendar */ -void php3_icap_reopen(INTERNAL_FUNCTION_PARAMETERS) +PHP_FUNCTION(icap_reopen) { pval *streamind; pval *calendar; @@ -290,7 +290,7 @@ void php3_icap_reopen(INTERNAL_FUNCTION_PARAMETERS) /* {{{ proto int icap_expunge(int stream_id) Delete all messages marked for deletion */ -void php3_icap_expunge(INTERNAL_FUNCTION_PARAMETERS) +PHP_FUNCTION(icap_expunge) { pval *streamind; int ind, ind_type; @@ -320,7 +320,7 @@ void php3_icap_expunge(INTERNAL_FUNCTION_PARAMETERS) /* {{{ proto int icap_fetch_event(int stream_id,int eventid, [int options]) Fetch an event*/ -void php3_icap_fetch_event(INTERNAL_FUNCTION_PARAMETERS) +PHP_FUNCTION(icap_fetch_event) { pval *streamind,*eventid,*start,*end,*options=NULL; int ind, ind_type; @@ -388,7 +388,7 @@ void php3_icap_fetch_event(INTERNAL_FUNCTION_PARAMETERS) /* {{{ proto array icap_list_events(int stream_id,int begindate, [int enddate]) Returns list of UIDs for that day or range of days */ -void php3_icap_list_events(INTERNAL_FUNCTION_PARAMETERS) +PHP_FUNCTION(icap_list_events) { pval *streamind,*begindate,*enddate; pval **pvalue; @@ -476,7 +476,7 @@ g_cal_list=NULL; /* {{{ proto string icap_create_calendar(int stream_id, string calendar) Create a new calendar*/ -void php3_icap_create_calendar(INTERNAL_FUNCTION_PARAMETERS) +PHP_FUNCTION(icap_create_calendar) { pval *streamind, *calendar; int ind, ind_type; @@ -511,7 +511,7 @@ void php3_icap_create_calendar(INTERNAL_FUNCTION_PARAMETERS) /* {{{ proto string icap_rename(int stream_id, string src_calendar, string dest_calendar) Rename a calendar*/ -void php3_icap_rename_calendar(INTERNAL_FUNCTION_PARAMETERS) +PHP_FUNCTION(icap_rename_calendar) { pval *streamind, *src_calendar,*dest_calendar; int ind, ind_type; @@ -543,7 +543,7 @@ void php3_icap_rename_calendar(INTERNAL_FUNCTION_PARAMETERS) /* {{{ proto int icap_reopen(int stream_id, array date, array time) list alarms for a given time */ -void php3_icap_list_alarms(INTERNAL_FUNCTION_PARAMETERS) +PHP_FUNCTION(icap_list_alarms) { pval *streamind, *date,*time; pval **pvalue; @@ -620,7 +620,7 @@ void php3_icap_list_alarms(INTERNAL_FUNCTION_PARAMETERS) /* {{{ proto string icap_delete_calendar(int stream_id, string calendar) Delete calendar*/ -void php3_icap_delete_calendar(INTERNAL_FUNCTION_PARAMETERS) +PHP_FUNCTION(icap_delete_calendar) { pval *streamind, *calendar; int ind, ind_type; @@ -655,7 +655,7 @@ void php3_icap_delete_calendar(INTERNAL_FUNCTION_PARAMETERS) /* {{{ proto string icap_delete_event(int stream_id, int uid) Delete event*/ -void php3_icap_delete_event(INTERNAL_FUNCTION_PARAMETERS) +PHP_FUNCTION(icap_delete_event) { pval *streamind, *uid; int ind, ind_type; @@ -692,13 +692,14 @@ icap_delete_calendar(){ } /* }}} */ -void php3_icap_popen(INTERNAL_FUNCTION_PARAMETERS){ +PHP_FUNCTION(icap_popen) +{ } /* {{{ proto string icap_store_event(int stream_id, object event) Store an event*/ -void php3_icap_store_event(INTERNAL_FUNCTION_PARAMETERS) +PHP_FUNCTION(icap_store_event) { pval *streamind,*storeobject; int ind, ind_type; @@ -850,7 +851,7 @@ void php3_icap_store_event(INTERNAL_FUNCTION_PARAMETERS) /* {{{ proto string icap_snooze(int stream_id, int uid) Snooze an alarm*/ -void php3_icap_snooze(INTERNAL_FUNCTION_PARAMETERS) +PHP_FUNCTION(icap_snooze) { pval *streamind,*uid; int ind, ind_type; diff --git a/ext/icap/php_icap.h b/ext/icap/php_icap.h index 50bb3eee8c..91ceacd2c7 100644 --- a/ext/icap/php_icap.h +++ b/ext/icap/php_icap.h @@ -21,32 +21,29 @@ extern PHP_MINIT_FUNCTION(icap); PHP_MINFO_FUNCTION(icap); /* Functions accessable to PHP */ -extern zend_module_entry php3_icap_module_entry; -#define php3_icap_module_ptr &php3_icap_module_entry -#define phpext_icap_ptr php3_icap_module_ptr +extern zend_module_entry php_icap_module_entry; +#define php_icap_module_ptr &php_icap_module_entry +#define phpext_icap_ptr php_icap_module_ptr extern int icap_init_request(INIT_FUNC_ARGS); extern int icap_end_request(void); -void php3_icap_open(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_popen(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_reopen(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_close(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_fetch_event(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_list_events(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_create_calendar(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_rename_calendar(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_delete_calendar(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_store_event(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_delete_event(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_snooze(INTERNAL_FUNCTION_PARAMETERS); -void php3_icap_list_alarms(INTERNAL_FUNCTION_PARAMETERS); - - - +PHP_FUNCTION(icap_open); +PHP_FUNCTION(icap_popen); +PHP_FUNCTION(icap_reopen); +PHP_FUNCTION(icap_close); +PHP_FUNCTION(icap_fetch_event); +PHP_FUNCTION(icap_list_events); +PHP_FUNCTION(icap_create_calendar); +PHP_FUNCTION(icap_rename_calendar); +PHP_FUNCTION(icap_delete_calendar); +PHP_FUNCTION(icap_store_event); +PHP_FUNCTION(icap_delete_event); +PHP_FUNCTION(icap_snooze); +PHP_FUNCTION(icap_list_alarms); #else -#define php3_icap_module_ptr NULL +#define php_icap_module_ptr NULL #endif /* HAVE_ICAP */ |