cvs: /php3/functions php3_mcal.c php3_mcal.h

musone Wed Sep 8 15:30:59 1999 EDT Modified files: /php3/functions php3_mcal.c php3_mcal.h Log: cleaned up unused variables Index: php3/functions/php3_mcal.c diff -u php3/functions/php3_mcal.c:1.22 php3/functions/php3_mcal.c:1.23 --- php3/functions/php3_mcal.c:1.22 Wed Sep 8 14:14:25 1999 +++ php3/functions/php3_mcal.c Wed Sep 8 15:30:58 1999 @@ -157,7 +157,7 @@ php3_printf("</tr></table>"); } -PHP_MINIT_FUNCTION(INIT_FUNC_ARGS) +int PHP_MINIT_FUNCTION(INIT_FUNC_ARGS) { le_mcal = register_list_destructors(cal_close_it,NULL); @@ -218,6 +218,7 @@ if(myargc ==4) { convert_to_long(options); flags=options->value.lval; + php3_printf("option is: %d\n",options->value.lval); } mcal_stream = cal_open(NULL,calendar->value.str.val,0); if (!mcal_stream) { @@ -289,7 +290,7 @@ pval *streamind; pval *calendar; pval *options; - CALSTREAM *mcal_stream; + CALSTREAM *mcal_stream=NULL; pils *mcal_le_struct; int ind, ind_type; long flags=0; @@ -331,7 +332,6 @@ { pval *streamind; int ind, ind_type; - pval *start,*end; pils *mcal_le_struct; if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &streamind) == FAILURE) { @@ -359,7 +359,7 @@ Fetch an event*/ void php3_mcal_fetch_event(INTERNAL_FUNCTION_PARAMETERS) { - pval *streamind,*eventid,start,end,*options=NULL; + pval *streamind,*eventid,*options=NULL; int ind, ind_type; pils *mcal_le_struct=NULL; CALEVENT *myevent; @@ -394,7 +394,6 @@ pval *streamind; int ind, ind_type; pils *mcal_le_struct=NULL; - CALEVENT *myevent; int myargcount=ARG_COUNT(ht); if (myargcount != 1 || getParameters(ht, myargcount, &streamind) == FAILURE) { @@ -469,10 +468,6 @@ pval *streamind,*begindate,*enddate,*recurrence; pval *pvalue; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; pils *mcal_le_struct; cal_list_t *my_cal_list; CALEVENT *event; @@ -643,8 +638,6 @@ datetime_t mydate=DT_INIT; int ind, ind_type; pils *mcal_le_struct; - int mcal_folders=0; - unsigned int msgno; cal_list_t *my_cal_list; int myargc=ARG_COUNT(ht); @@ -741,7 +734,7 @@ RETURN_FALSE; } - if (mcal_delete_calendar(mcal_le_struct->mcal_stream,calendar->value.str.val)) + /* if (mcal_delete_calendar(mcal_le_struct->mcal_stream,calendar->value.str.val)) { RETURN_TRUE; } @@ -749,7 +742,7 @@ { RETURN_FALSE; } - + */ } /* }}} */ @@ -786,12 +779,6 @@ } /* }}} */ -/* {{{ proto string mcal_delete_calendar(int stream_id, int uid) - Delete event*/ -mcal_delete_calendar(){ - return 1; -} -/* }}} */ void php3_mcal_popen(INTERNAL_FUNCTION_PARAMETERS){ } @@ -803,13 +790,8 @@ { pval *streamind,*storeobject; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; pils *mcal_le_struct; pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; unsigned long uid; CALEVENT *myevent; @@ -963,7 +945,6 @@ pval *streamind,*uid; int ind, ind_type; pils *mcal_le_struct; - pval *pvalue; int myargc; myargc=ARG_COUNT(ht); if (myargc !=2 || getParameters(ht,myargc,&streamind,&uid) == FAILURE) { @@ -1002,16 +983,8 @@ { pval *streamind,*category; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; myargc=ARG_COUNT(ht); if (myargc !=2 || getParameters(ht,myargc,&streamind,&category) == FAILURE) { WRONG_PARAM_COUNT; @@ -1038,16 +1011,8 @@ { pval *streamind,*title; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; myargc=ARG_COUNT(ht); if (myargc !=2 || getParameters(ht,myargc,&streamind,&title) == FAILURE) { WRONG_PARAM_COUNT; @@ -1074,16 +1039,8 @@ { pval *streamind,*description; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; myargc=ARG_COUNT(ht); if (myargc !=2 || getParameters(ht,myargc,&streamind,&description) == FAILURE) { WRONG_PARAM_COUNT; @@ -1110,16 +1067,9 @@ { pval *streamind,*year,*month,*date,*hour,*min,*sec; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0,myhour=0,mymin=0,mysec=0; - unsigned int msgno; + int myhour=0,mymin=0,mysec=0; pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; myargc=ARG_COUNT(ht); if (myargc <4 || getParameters(ht,myargc,&streamind,&year,&month,&date,&hour,&min,&sec) == FAILURE) { WRONG_PARAM_COUNT; @@ -1148,7 +1098,7 @@ if(myargc > 4) myhour=hour->value.lval; if(myargc > 5) mymin=min->value.lval; if(myargc > 6) mysec=sec->value.lval; - if(myargc >4) dt_settime(&(mcal_le_struct->event->start),year->value.lval,month->value.lval,date->value.lval); + if(myargc >4) dt_settime(&(mcal_le_struct->event->start),myhour,mymin,mysec); } /* }}} */ @@ -1159,16 +1109,9 @@ { pval *streamind,*year,*month,*date,*hour,*min,*sec; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0,myhour,mymin,mysec; - unsigned int msgno; + int myhour,mymin,mysec; pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; myargc=ARG_COUNT(ht); if (myargc <4 || getParameters(ht,myargc,&streamind,&year,&month,&date,&hour,&min,&sec) == FAILURE) { WRONG_PARAM_COUNT; @@ -1207,16 +1150,8 @@ { pval *streamind,*alarm; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; myargc=ARG_COUNT(ht); if (myargc !=2 || getParameters(ht,myargc,&streamind,&alarm) == FAILURE) { WRONG_PARAM_COUNT; @@ -1243,16 +1178,8 @@ { pval *streamind; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; myargc=ARG_COUNT(ht); if (myargc !=1 || getParameters(ht,myargc,&streamind) == FAILURE) { WRONG_PARAM_COUNT; @@ -1272,7 +1199,7 @@ } /* }}} */ -php3_event_init(struct php3_mcal_le_struct *mystruct) +void php3_event_init(struct php3_mcal_le_struct *mystruct) { calevent_free(mystruct->event); mystruct->event=calevent_new(); @@ -1285,16 +1212,8 @@ { pval *streamind,*class; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; myargc=ARG_COUNT(ht); if (myargc !=2 || getParameters(ht,myargc,&streamind,&class) == FAILURE) { WRONG_PARAM_COUNT; @@ -1322,17 +1241,7 @@ void php3_mcal_is_leap_year(INTERNAL_FUNCTION_PARAMETERS) { pval *year; - int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; - pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; myargc=ARG_COUNT(ht); if (myargc !=1 || getParameters(ht,myargc,&year) == FAILURE) { WRONG_PARAM_COUNT; @@ -1354,17 +1263,7 @@ void php3_mcal_days_in_month(INTERNAL_FUNCTION_PARAMETERS) { pval *month,*leap; - int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; - pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; myargc=ARG_COUNT(ht); if (myargc !=2 || getParameters(ht,myargc,&month,&leap) == FAILURE) { WRONG_PARAM_COUNT; @@ -1382,17 +1281,7 @@ void php3_mcal_date_valid(INTERNAL_FUNCTION_PARAMETERS) { pval *year,*month,*day; - int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; - pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; myargc=ARG_COUNT(ht); if (myargc !=3 || getParameters(ht,myargc,&year,&month,&day) == FAILURE) { WRONG_PARAM_COUNT; @@ -1418,17 +1307,7 @@ void php3_mcal_time_valid(INTERNAL_FUNCTION_PARAMETERS) { pval *hour,*min,*sec; - int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; - pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; myargc=ARG_COUNT(ht); if (myargc !=3 || getParameters(ht,myargc,&hour,&min,&sec) == FAILURE) { WRONG_PARAM_COUNT; @@ -1452,18 +1331,8 @@ void php3_mcal_day_of_week(INTERNAL_FUNCTION_PARAMETERS) { pval *year,*month,*day; - int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; - pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; datetime_t mydate; - CALEVENT *myevent; myargc=ARG_COUNT(ht); if (myargc !=3 || getParameters(ht,myargc,&year,&month,&day) == FAILURE) { WRONG_PARAM_COUNT; @@ -1483,18 +1352,8 @@ void php3_mcal_day_of_year(INTERNAL_FUNCTION_PARAMETERS) { pval *year,*month,*day; - int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; - pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; datetime_t mydate; - CALEVENT *myevent; myargc=ARG_COUNT(ht); if (myargc !=3 || getParameters(ht,myargc,&year,&month,&day) == FAILURE) { WRONG_PARAM_COUNT; @@ -1517,18 +1376,8 @@ { pval *ayear,*amonth,*aday; pval *byear,*bmonth,*bday; - int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; - pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; datetime_t myadate,mybdate; - CALEVENT *myevent; myargc=ARG_COUNT(ht); if (myargc !=6 || getParameters(ht,myargc,&ayear,&amonth,&aday,&byear,&bmonth,&bday) == FAILURE) { WRONG_PARAM_COUNT; @@ -1560,18 +1409,9 @@ { pval *streamind,*weekstart; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; datetime_t next; - weekday_t startofweek; myargc=ARG_COUNT(ht); if (myargc !=2 || getParameters(ht,myargc,&streamind,&weekstart) == FAILURE) { WRONG_PARAM_COUNT; @@ -1613,16 +1453,8 @@ { pval *streamind,*enddate,*interval; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; datetime_t endtime; myargc=ARG_COUNT(ht); if (myargc !=3 || getParameters(ht,myargc,&streamind,&enddate,&interval) == FAILURE) { @@ -1652,16 +1484,8 @@ { pval *streamind,*enddate,*interval,*weekdays; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; datetime_t endtime; myargc=ARG_COUNT(ht); if (myargc !=4 || getParameters(ht,myargc,&streamind,&enddate,&interval,&weekdays) == FAILURE) { @@ -1692,16 +1516,8 @@ { pval *streamind,*enddate,*interval; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; datetime_t endtime; myargc=ARG_COUNT(ht); if (myargc !=3 || getParameters(ht,myargc,&streamind,&enddate,&interval) == FAILURE) { @@ -1731,16 +1547,8 @@ { pval *streamind,*enddate,*interval; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; datetime_t endtime; myargc=ARG_COUNT(ht); if (myargc !=3 || getParameters(ht,myargc,&streamind,&enddate,&interval) == FAILURE) { @@ -1770,16 +1578,8 @@ { pval *streamind,*enddate,*interval; int ind, ind_type; - unsigned long i; - char *t; - int mcal_folders=0; - unsigned int msgno; pils *mcal_le_struct; - pval *pvalue,*temppvalue; - cal_list_t *my_cal_list; int myargc; - unsigned long uid; - CALEVENT *myevent; datetime_t endtime; myargc=ARG_COUNT(ht); if (myargc !=3 || getParameters(ht,myargc,&streamind,&enddate,&interval) == FAILURE) { Index: php3/functions/php3_mcal.h diff -u php3/functions/php3_mcal.h:1.9 php3/functions/php3_mcal.h:1.10 --- php3/functions/php3_mcal.h:1.9 Wed Sep 8 13:53:04 1999 +++ php3/functions/php3_mcal.h Wed Sep 8 15:30:58 1999 @@ -1,4 +1,4 @@ -/* $Id: php3_mcal.h,v 1.9 1999/09/08 17:53:04 musone Exp $ */ +/* $Id: php3_mcal.h,v 1.10 1999/09/08 19:30:58 musone Exp $ */ #ifndef _INCLUDED_MCAL_H #define _INCLUDED_MCAL_H @@ -30,6 +30,7 @@ extern int mcal_init_request(INIT_FUNC_ARGS); extern int mcal_end_request(void); void make_event_object(); +void php3_event_init(); void php3_mcal_open(INTERNAL_FUNCTION_PARAMETERS); void php3_mcal_popen(INTERNAL_FUNCTION_PARAMETERS);