...

src/Makefile

@@ -9,10 +9,10 @@ GPGME_IN=$(HOME)
 LIBGPGME=libgpgme-pthread.dylib
 CC?=clang -std=c99 -pthread
 LD?=clang
-CFLAGS?=-I$(GPGME_IN)/include -I/opt/local/include $(OPTIMIZE) -pedantic \
+CFLAGS?=-I$(GPGME_IN)/include -I$(HOME)/include -I/opt/local/include $(OPTIMIZE) -pedantic \
 	-DSYSTEM_DB=\"$(SYSTEM_DB)\" -DLIBGPGME=\"$(LIBGPGME)\"
 LDFLAGS?=-lc -shared -arch x86_64 \
-	-L/opt/local/lib -letpan -lgpgme-pthread -lsqlite3
+	-L$(HOME)/lib -L/opt/local/lib -letpan -lgpgme-pthread -lsqlite3
 
 else
 $(error don't know how to make for $(BUILD_FOR) on $(BUILD_ON))

src/message_api.c

@@ -6,7 +6,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#define NOT_IMPLEMENTED assert(0);
+#define NOT_IMPLEMENTED assert(0); return PEP_UNKNOWN_ERROR;
 
 static char * combine_short_and_long(const message * src)
 {
@@ -287,6 +287,7 @@ DYNAMIC_API PEP_STATUS decrypt_message(
     *dst = NULL;
     
     // msg = new_message(src->dir, from, to, NULL);
+    NOT_IMPLEMENTED
 
     *dst = msg;
     return PEP_STATUS_OK;

src/pEpEngine.c

@@ -319,7 +319,7 @@ DYNAMIC_API stringlist_t *stringlist_dup(const stringlist_t *src)
     if (src->next) {
         dst->next = stringlist_dup(src->next);
         if (dst->next == NULL) {
-            free(dst);
+            free_stringlist(dst);
             return NULL;
         }
     }

src/pgp_gpg.c

@@ -5,8 +5,8 @@
 
 #define _GPGERR(X) ((X) & 0xffffL)
 
-void *gpgme;
-struct gpg_s gpg;
+static void *gpgme;
+static struct gpg_s gpg;
 
 static bool ensure_keyserver()
 {

src/transport.c

@@ -33,10 +33,8 @@ DYNAMIC_API identity_list *new_identity_list(pEp_identity *ident)
 {
     identity_list *id_list = calloc(1, sizeof(identity_list));
     assert(id_list);
-    if (id_list == NULL) {
-        free(ident);
+    if (id_list == NULL)
         return NULL;
-    }
 
     id_list->ident = ident;
 

src/transport.h

@@ -37,7 +37,8 @@ typedef struct _identity_list {
 //      new identity_list or NULL if out of memory
 //
 //  caveat:
-//      ident is being moved, the caller loses ownership
+//      ident is being moved if the function succeeds, the caller loses
+//      ownership
 
 DYNAMIC_API identity_list *new_identity_list(pEp_identity *ident);
 
@@ -75,7 +76,8 @@ DYNAMIC_API void free_identity_list(identity_list *id_list);
 //      pointer to the last element in identity_list or NULL if out of memory
 //
 //  caveat:
-//      ident is being moved, the caller loses ownership
+//      ident is being moved, the caller loses ownership if the function is
+//      successful
 
 DYNAMIC_API identity_list *identity_list_add(identity_list *id_list, pEp_identity *ident);