aboutsummaryrefslogtreecommitdiff
path: root/vcal.c
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2019-02-26 10:56:49 +0100
committerHugo Hörnquist <hugo@lysator.liu.se>2019-02-26 10:56:49 +0100
commit985ee1776348b2068fb6470e2a2fd3442c2a0811 (patch)
tree53537a365103edf9213a592a7637ee7cee7fd16a /vcal.c
parentMove load-extension to (vcalendar primitive). (diff)
downloadcalp-985ee1776348b2068fb6470e2a2fd3442c2a0811.tar.gz
calp-985ee1776348b2068fb6470e2a2fd3442c2a0811.tar.xz
Start update of types.
Diffstat (limited to 'vcal.c')
-rw-r--r--vcal.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/vcal.c b/vcal.c
index a17f1fcc..94be9399 100644
--- a/vcal.c
+++ b/vcal.c
@@ -7,7 +7,7 @@
#undef TYPE
#define TYPE param_set
-#include "linked_list.inc.h"
+#include "trie.inc.h"
#undef TYPE
#define TYPE content_set
@@ -15,13 +15,7 @@
#undef TYPE
#define T strbuf
- #define V LLIST(strbuf)
- #include "pair.inc.h"
- #undef V
- #define V LLIST(param_set)
- #include "pair.inc.h"
- #undef V
- #define V LLIST(content_set)
+ #define V TRIE(param_set)
#include "pair.inc.h"
#undef V
#undef T
@@ -65,24 +59,29 @@ INIT_F(vcomponent, const char* type, const char* filename) {
return 0;
}
+#if 0
content_line* RESOLVE(content_line)
(content_line* dest, content_line* new_)
{
if (dest == NULL) return new_;
+ /*
if (strbuf_cmp(&dest->key, &new_->key) != 0) {
ERR("Can't resolve between these two types");
return NULL;
}
+ */
/* This destroys new_->val. */
- APPEND(LLIST(content_set)) (&dest->val, &new_->val);
+ //APPEND(LLIST(content_set)) (&dest->val, &new_->val);
+ APPEND(LLIST(content_set)) (dest, new_);
- FREE(strbuf)(&new_->key);
+ // FREE(strbuf)(&new_->key);
free(new_);
return dest;
}
+#endif
content_line* get_property (vcomponent* ev, const char* key) {
size_t len = strlen(key) + 1;