aboutsummaryrefslogtreecommitdiff
path: root/vcal.h
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2019-02-04 18:23:51 +0100
committerHugo Hörnquist <hugo@lysator.liu.se>2019-02-05 18:16:17 +0100
commit14b33ae9c00f74a24a00aaece88b22af0955379e (patch)
treecee997634ecb0977e8f63fadfd6d00fdfdf89439 /vcal.h
parentNormalize and improve INIT & FREE macros. (diff)
downloadcalp-14b33ae9c00f74a24a00aaece88b22af0955379e.tar.gz
calp-14b33ae9c00f74a24a00aaece88b22af0955379e.tar.xz
Fix most memmory errors.
Diffstat (limited to 'vcal.h')
-rw-r--r--vcal.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/vcal.h b/vcal.h
index 03d04805..9123e3fa 100644
--- a/vcal.h
+++ b/vcal.h
@@ -28,8 +28,13 @@ typedef struct {
INIT_F(content_line);
INIT_F(content_line, int keylen, int vallen);
-int RESOLVE(content_line)
- (content_line** orig, content_line* new);
+/*
+ * This takes two content lines, and return a content line that is the
+ * merge of the two.
+ * The function also cleans up the unused memmory between the two.
+ */
+content_line* RESOLVE(content_line)
+ (content_line* dest, content_line* new);
#define TYPE content_line
// #include "hash.h"