diff options
| author | JP Rosevear <jpr@src.gnome.org> | 2001-02-06 03:16:27 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2001-02-06 03:16:27 +0800 |
| commit | d7da449065a8138d93367765f091932481e776b4 (patch) | |
| tree | 09ea5f1142b19e3dd39a4e9a226c1b797437662d | |
| parent | 1994ec032fd25516ca9ed2f5953130794a4767a2 (diff) | |
| download | gsoc2013-evolution-d7da449065a8138d93367765f091932481e776b4.tar.gz gsoc2013-evolution-d7da449065a8138d93367765f091932481e776b4.tar.zst gsoc2013-evolution-d7da449065a8138d93367765f091932481e776b4.zip | |
This commit was generated by cvs2svn to compensate for changes in r7975,
which included commits to RCS files with non-trunk default branches.
svn path=/trunk/; revision=7976
| -rw-r--r-- | libical/src/libical/icalvalue.h.in | 18 | ||||
| -rw-r--r-- | libical/src/libicalss/icalfileset.c | 5 | ||||
| -rw-r--r-- | libical/src/test/recur.c | 4 |
3 files changed, 24 insertions, 3 deletions
diff --git a/libical/src/libical/icalvalue.h.in b/libical/src/libical/icalvalue.h.in index 6e7770346a..90daa49f79 100644 --- a/libical/src/libical/icalvalue.h.in +++ b/libical/src/libical/icalvalue.h.in @@ -4,7 +4,7 @@ CREATOR: eric 20 March 1999 - $Id: icalvalue.h.in,v 1.1.1.2 2001/01/23 19:20:40 jpr Exp $ + $Id: icalvalue.h.in,v 1.1.1.3 2001/02/05 19:16:24 jpr Exp $ $Locker: $ @@ -55,4 +55,20 @@ int icalvalue_isa_value(void*); icalparameter_xliccomparetype icalvalue_compare(icalvalue* a, icalvalue *b); + +/* Special, non autogenerated value accessors */ + +icalvalue* icalvalue_new_recur (struct icalrecurrencetype v); +void icalvalue_set_recur(icalvalue* value, struct icalrecurrencetype v); +struct icalrecurrencetype icalvalue_get_recur(icalvalue* value); + +icalvalue* icalvalue_new_trigger (struct icaltriggertype v); +void icalvalue_set_trigger(icalvalue* value, struct icaltriggertype v); +struct icaltriggertype icalvalue_get_trigger(icalvalue* value); + +icalvalue* icalvalue_new_datetimeperiod (struct icaldatetimeperiodtype v); +void icalvalue_set_datetimeperiod(icalvalue* value, + struct icaldatetimeperiodtype v); +struct icaldatetimeperiodtype icalvalue_get_datetimeperiod(icalvalue* value); + /* Everything below this line is machine generated. Do not edit. */ diff --git a/libical/src/libicalss/icalfileset.c b/libical/src/libicalss/icalfileset.c index 52dbc0beda..2ef38ff876 100644 --- a/libical/src/libicalss/icalfileset.c +++ b/libical/src/libicalss/icalfileset.c @@ -135,11 +135,12 @@ char* icalfileset_read_from_file(char *s, size_t size, void *d) for(p=s; p<s+size-1;p++){ if(read(fd,p,1) != 1 || *p=='\n'){ - break; + p++; + break; } } - *(++p) = '\0'; + *p = '\0'; if(*s == 0){ return 0; diff --git a/libical/src/test/recur.c b/libical/src/test/recur.c index 546cacb007..95dd3b08a3 100644 --- a/libical/src/test/recur.c +++ b/libical/src/test/recur.c @@ -46,6 +46,10 @@ int main(int argc, char *argv[]) time_t tt; char* file; + icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR, ICAL_ERROR_NONFATAL); + icalerror_set_error_state(ICAL_PARSE_ERROR, ICAL_ERROR_NONFATAL); + + if (argc <= 1){ file = "../../test-data/recur.txt"; } else if (argc == 2){ |