Remove dead code.

libs/netpgp/src/writer.c

@@ -788,6 +788,7 @@ pgp_writer_push_armor_msg(pgp_output_t *output)
 		base64);
 }
 
+#if 0 //////
 static unsigned
 armoured_finaliser(pgp_armor_type_t type,
 			pgp_error_t **errors,
@@ -846,6 +847,7 @@ armoured_finaliser(pgp_armor_type_t type,
 	}
 	return stacked_write(writer, tail, tailsize, errors);
 }
+#endif //////
 
 #if 0 //////
 static unsigned

src/mraheader.h

@@ -38,7 +38,6 @@ extern "C" {
 
 typedef struct mraheader_t
 {
-	uint32_t       m_magic;
 	char*          m_to;
 	mrkey_t*       m_public_key; /* != NULL */
 	int            m_prefer_encrypted; /* YES, NO or NOPREFERENCE if attribute is missing */

src/mrapeerstate.c

@@ -37,8 +37,6 @@
 #include "mrapeerstate.h"
 #include "mraheader.h"
 
-#define CLASS_MAGIC 1494527374
-
 
 /*******************************************************************************
  * Load/save

src/mrapeerstate.h

@@ -49,7 +49,6 @@ typedef struct mraheader_t mraheader_t;
 
 typedef struct mrapeerstate_t
 {
-	uint32_t       m_magic;
 	char*          m_addr;
 	time_t         m_changed;
 	time_t         m_last_seen;

src/mrchat.c

@@ -36,9 +36,6 @@
 #include "mre2ee.h"
 
 
-#define CLASS_MAGIC 1279756140
-
-
 /*******************************************************************************
  * Tools
  ******************************************************************************/

src/mrchat.h

@@ -53,7 +53,6 @@ typedef struct mrjob_t mrjob_t;
 
 typedef struct mrchat_t
 {
-	uint32_t        m_magic;
 	uint32_t        m_id;
 	int             m_type;
 	char*           m_name;            /* NULL if unset */

src/mrchatlist.c

@@ -29,8 +29,6 @@
 #include "mrmailbox.h"
 #include "mrtools.h"
 
-#define CLASS_MAGIC 1279576749
-
 
 /*******************************************************************************
  * Tools

src/mrchatlist.h

@@ -37,7 +37,6 @@ typedef struct mrpoortext_t mrpoortext_t;
 
 typedef struct mrchatlist_t
 {
-	uint32_t     m_magic;
 	size_t       m_cnt;
 	carray*      m_chatNlastmsg_ids;
 	mrmailbox_t* m_mailbox;

src/mrcontact.c

@@ -35,8 +35,6 @@
 #include "mrapeerstate.h"
 #include "mrtools.h"
 
-#define CLASS_MAGIC 1170070140
-
 
 /*******************************************************************************
  * Tools

src/mrloginparam.c

@@ -30,8 +30,6 @@
 #include "mrloginparam.h"
 #include "mrtools.h"
 
-#define CLASS_MAGIC 1479776404
-
 
 /*******************************************************************************
  * Main interface

src/mrloginparam.h

@@ -36,8 +36,6 @@ extern "C" {
 
 typedef struct mrloginparam_t
 {
-	uint32_t      m_magic;
-
 	/* IMAP/POP3 - all pointers may be NULL if unset, public read */
 	char*         m_addr;
 	char*         m_mail_server;

src/mrmailbox.c

@@ -40,8 +40,7 @@
 #include "mrjob.h"
 #include "mrloginparam.h"
 #include "mre2ee.h"
-
+#include "mrapeerstate.h"
-#define CLASS_MAGIC 1479776513
 
 
 /*******************************************************************************

src/mrmailbox.h

@@ -103,8 +103,6 @@ typedef uintptr_t (*mrmailboxcb_t) (mrmailbox_t*, int event, uintptr_t data1, ui
 
 typedef struct mrmailbox_t
 {
-	uint32_t         m_magic; /* must be first*/
-
 	/* the following members should be treated as library private */
 	mrsqlite3_t*     m_sql;      /* != NULL */
 	char*            m_dbfile;

src/mrmsg.c

@@ -34,8 +34,6 @@
 #include "mrtools.h"
 #include "mrjob.h"
 
-#define CLASS_MAGIC 1333334140
-
 
 /*******************************************************************************
  * Tools

src/mrmsg.h

@@ -73,7 +73,6 @@ typedef struct mrchat_t mrchat_t;
 
 typedef struct mrmsg_t
 {
-	uint32_t      m_magic;
 	uint32_t      m_id;
 	char*         m_rfc724_mid;
 	char*         m_server_folder;

src/mrparam.c

@@ -32,8 +32,6 @@
 #include "mrtools.h"
 #include "mrparam.h"
 
-#define CLASS_MAGIC 1379776140
-
 
 /*******************************************************************************
  * Tools

src/mrparam.h

@@ -60,7 +60,6 @@ extern "C" {
 
 typedef struct mrparam_t
 {
-	uint32_t m_magic;
 	char*    m_packed;    /* != NULL */
 } mrparam_t;
 

src/mrpoortext.c

@@ -29,8 +29,6 @@
 #include "mrmailbox.h"
 #include "mrtools.h"
 
-#define CLASS_MAGIC 1333332222
-
 
 /*******************************************************************************
  * Main interface

src/mrpoortext.h

@@ -43,7 +43,6 @@ extern "C" {
 
 typedef struct mrpoortext_t
 {
-	uint32_t m_magic;
 	char*    m_text1;         /* may be NULL */
 	int      m_text1_meaning; /* one of MR_TEXT1_* */
 	char*    m_text2;         /* may be NULL */