1 files changed, 23 insertions, 117 deletions

diff --git a/libical/src/libical/icaltypes.c b/libical/src/libical/icaltypes.c
index 8c67deb..19719f8 100644
--- a/libical/src/libical/icaltypes.c
+++ b/libical/src/libical/icaltypes.c
@@ -32,141 +32,47 @@
 #include "icalmemory.h"
 #include <stdlib.h> /* for malloc and abs() */
 #include <errno.h> /* for errno */
 #include <string.h> /* for icalmemory_strdup */
 #include <assert.h>
 
-int snprintf(char *str, size_t n, char const *fmt, ...);
+#ifdef WIN32
+#define snprintf      _snprintf
+#define strcasecmp    stricmp
+#endif
 
 #define TEMP_MAX 1024
 
-void*
-icalattachtype_get_data (struct icalattachtype* type);
-
-struct icalattachtype*
-icalattachtype_new()
-{
-    struct icalattachtype* v;
-
-    if ( ( v = (struct icalattachtype*)
-           malloc(sizeof(struct icalattachtype))) == 0) {
-        errno = ENOMEM;
-        return 0;
-    }
-
-    v->refcount = 1;
-
-    v->binary = 0;
-    v->owns_binary = 0;
-    v->base64 = 0;
-    //fprintf(stderr,"setting base 64 to 0   \n");
-    
-    v->owns_base64 = 0;
-
-    v->url = 0; 
-
-    return v;
-}
-
-
-void
-icalattachtype_free(struct icalattachtype* v)
-{
-    icalerror_check_arg( (v!=0),"v");
-    
-    v->refcount--;
 
-    if (v->refcount <= 0){
-        
-        if (v->base64 != 0 && v->owns_base64 != 0){
-        int val = v->base64 ;
-        if ( val < 255 ) {
-        fprintf(stderr,"Possible error in attachment processing (%d)\nPocssible solution: Remove attachment from file.\n",val  );
-        }
-            free(v->base64);
-        }
-
-        if (v->binary != 0 && v->owns_binary != 0){
-            free(v->binary);
-        }
-        
-        if (v->url != 0){
-            free(v->url);
-        }
-
-        free(v);
-    }
-}
-
-void  icalattachtype_add_reference(struct icalattachtype* v)
-{
-    icalerror_check_arg( (v!=0),"v");
-    v->refcount++;
-}
-
-void icalattachtype_set_url(struct icalattachtype* v, char* url)
-{
-    icalerror_check_arg( (v!=0),"v");
-
-    if (v->url != 0){
-        free (v->url);
-    }
-
-    v->url = icalmemory_strdup(url);
-
-    /* HACK This routine should do something if icalmemory_strdup returns NULL */
-
-}
-
-char* icalattachtype_get_url(struct icalattachtype* v)
+int icaltriggertype_is_null_trigger(struct icaltriggertype tr)
 {
-    icalerror_check_arg( (v!=0),"v");
-    return v->url;
+    if(icaltime_is_null_time(tr.time) && 
+       icaldurationtype_is_null_duration(tr.duration)){
+        return 1;
 }
 
-void icalattachtype_set_base64(struct icalattachtype* v, char* base64,
-                                int owns)
-{
-    //fprintf(stderr,"1setbase64 %d  \n", base64 );
-    icalerror_check_arg( (v!=0),"v");
-    //fprintf(stderr,"setbase64 %d  \n", base64 );
-    v->base64 = base64;
-    v->owns_base64 = !(owns != 0 );
-    
+    return 0;
 }
 
-char* icalattachtype_get_base64(struct icalattachtype* v)
+int icaltriggertype_is_bad_trigger(struct icaltriggertype tr)
 {
-    icalerror_check_arg( (v!=0),"v");
-    return v->base64;
+    if(icaldurationtype_is_bad_duration(tr.duration)){
+        return 1;
 }
 
-void icalattachtype_set_binary(struct icalattachtype* v, char* binary,
-                                int owns)
-{
-    icalerror_check_arg( (v!=0),"v");
-
-    v->binary = binary;
-    v->owns_binary = !(owns != 0 );
-
+    return 0;
 }
 
-void* icalattachtype_get_binary(struct icalattachtype* v)
+struct icaltriggertype icaltriggertype_from_int(const int reltime)
 {
-    icalerror_check_arg( (v!=0),"v");
-    return v->binary;
-}
+    struct icaltriggertype tr;
 
-int icaltriggertype_is_null_trigger(struct icaltriggertype tr)
-{
-    if(icaltime_is_null_time(tr.time) && 
-       icaldurationtype_is_null_duration(tr.duration)){
-        return 1;
-    }
+            tr.time= icaltime_null_time();
+    tr.duration = icaldurationtype_from_int(reltime);
 
-    return 0;
+    return tr;
 }
     
 struct icaltriggertype icaltriggertype_from_string(const char* str)
 {
 
     
@@ -178,54 +84,54 @@ struct icaltriggertype icaltriggertype_from_string(const char* str)
     tr.duration = icaldurationtype_from_int(0);
 
     null_tr = tr;
 
     if(str == 0) goto error;
 
-    /* Surpress errors so a failure in icaltime_from_string() does not cause an abort */
+    /* Suppress errors so a failure in icaltime_from_string() does not cause an abort */
     es = icalerror_get_error_state(ICAL_MALFORMEDDATA_ERROR);
     icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,ICAL_ERROR_NONFATAL);
     e = icalerrno;
     icalerror_set_errno(ICAL_NO_ERROR);
 
     tr.time = icaltime_from_string(str);
 
     if (icaltime_is_null_time(tr.time)){
 
         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);
     icalerror_set_errno(e);
     return tr;
 
  error:
     icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,es);
     icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-    return null_tr;
+    return tr;
 
 }
 
 
 struct icalreqstattype icalreqstattype_from_string(const char* str)
 {
   const char *p1,*p2;
   struct icalreqstattype stat;
-  int major, minor;
+  short major=0, minor=0;
 
   icalerror_check_arg((str != 0),"str");
 
   stat.code = ICAL_UNKNOWN_STATUS;
   stat.debug = 0; 
    stat.desc = 0;
 
   /* Get the status numbers */
 
-  sscanf(str, "%d.%d",&major, &minor);
+  sscanf(str, "%hd.%hd",&major, &minor);
 
   if (major <= 0 || minor < 0){
     icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
     return stat;
   }