From: <li...@us...> - 2002-09-26 22:08:04
|
Update of /cvsroot/freeassociation/libical/src/libical In directory usw-pr-cvs1:/tmp/cvs-serv13569 Modified Files: icaltypes.c Log Message: use new icaldurationtype_is_bad_duration() call Index: icaltypes.c =================================================================== RCS file: /cvsroot/freeassociation/libical/src/libical/icaltypes.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- icaltypes.c 9 Aug 2002 14:28:16 -0000 1.12 +++ icaltypes.c 26 Sep 2002 22:08:02 -0000 1.13 @@ -53,6 +53,15 @@ return 0; } +int icaltriggertype_is_bad_trigger(struct icaltriggertype tr) +{ + if(icaldurationtype_is_bad_duration(tr.duration)){ + return 1; + } + + return 0; +} + struct icaltriggertype icaltriggertype_from_int(const int reltime) { struct icaltriggertype tr; @@ -90,7 +99,7 @@ tr.duration = icaldurationtype_from_string(str); - if(icaldurationtype_as_int(tr.duration) == 0) goto error; + if (icaldurationtype_is_bad_duration(tr.duration)) goto error; } icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,es); @@ -100,7 +109,7 @@ error: icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,es); icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR); - return null_tr; + return tr; } |