diff --git a/libs/netpgp/src/writer.c b/libs/netpgp/src/writer.c index e08d08cf..69e04f10 100644 --- a/libs/netpgp/src/writer.c +++ b/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 diff --git a/src/mraheader.h b/src/mraheader.h index 839c5747..22505ce3 100644 --- a/src/mraheader.h +++ b/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 */ diff --git a/src/mrapeerstate.c b/src/mrapeerstate.c index 770a5176..5246035f 100644 --- a/src/mrapeerstate.c +++ b/src/mrapeerstate.c @@ -37,8 +37,6 @@ #include "mrapeerstate.h" #include "mraheader.h" -#define CLASS_MAGIC 1494527374 - /******************************************************************************* * Load/save diff --git a/src/mrapeerstate.h b/src/mrapeerstate.h index f65092a1..b7ffb592 100644 --- a/src/mrapeerstate.h +++ b/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; diff --git a/src/mrchat.c b/src/mrchat.c index b6dafc34..580f2b57 100644 --- a/src/mrchat.c +++ b/src/mrchat.c @@ -36,9 +36,6 @@ #include "mre2ee.h" -#define CLASS_MAGIC 1279756140 - - /******************************************************************************* * Tools ******************************************************************************/ diff --git a/src/mrchat.h b/src/mrchat.h index 6bd8e5ca..2c31a7b7 100644 --- a/src/mrchat.h +++ b/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 */ diff --git a/src/mrchatlist.c b/src/mrchatlist.c index 235d95d5..8c838510 100644 --- a/src/mrchatlist.c +++ b/src/mrchatlist.c @@ -29,8 +29,6 @@ #include "mrmailbox.h" #include "mrtools.h" -#define CLASS_MAGIC 1279576749 - /******************************************************************************* * Tools diff --git a/src/mrchatlist.h b/src/mrchatlist.h index 2cb9f530..710b041e 100644 --- a/src/mrchatlist.h +++ b/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; diff --git a/src/mrcontact.c b/src/mrcontact.c index 644e8269..96d80069 100644 --- a/src/mrcontact.c +++ b/src/mrcontact.c @@ -35,8 +35,6 @@ #include "mrapeerstate.h" #include "mrtools.h" -#define CLASS_MAGIC 1170070140 - /******************************************************************************* * Tools diff --git a/src/mrloginparam.c b/src/mrloginparam.c index 0a6e4103..1bf7a859 100644 --- a/src/mrloginparam.c +++ b/src/mrloginparam.c @@ -30,8 +30,6 @@ #include "mrloginparam.h" #include "mrtools.h" -#define CLASS_MAGIC 1479776404 - /******************************************************************************* * Main interface diff --git a/src/mrloginparam.h b/src/mrloginparam.h index 9a3d9661..5f0db758 100644 --- a/src/mrloginparam.h +++ b/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; diff --git a/src/mrmailbox.c b/src/mrmailbox.c index c5363dca..a3ebb87c 100644 --- a/src/mrmailbox.c +++ b/src/mrmailbox.c @@ -40,8 +40,7 @@ #include "mrjob.h" #include "mrloginparam.h" #include "mre2ee.h" - -#define CLASS_MAGIC 1479776513 +#include "mrapeerstate.h" /******************************************************************************* diff --git a/src/mrmailbox.h b/src/mrmailbox.h index 7dcccad5..363de8f6 100644 --- a/src/mrmailbox.h +++ b/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; diff --git a/src/mrmsg.c b/src/mrmsg.c index 475b87c0..fd0915e1 100644 --- a/src/mrmsg.c +++ b/src/mrmsg.c @@ -34,8 +34,6 @@ #include "mrtools.h" #include "mrjob.h" -#define CLASS_MAGIC 1333334140 - /******************************************************************************* * Tools diff --git a/src/mrmsg.h b/src/mrmsg.h index f4e7f90c..1865e9d8 100644 --- a/src/mrmsg.h +++ b/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; diff --git a/src/mrparam.c b/src/mrparam.c index 9a96b97b..09f1611d 100644 --- a/src/mrparam.c +++ b/src/mrparam.c @@ -32,8 +32,6 @@ #include "mrtools.h" #include "mrparam.h" -#define CLASS_MAGIC 1379776140 - /******************************************************************************* * Tools diff --git a/src/mrparam.h b/src/mrparam.h index 5c0ea06c..da3a3b93 100644 --- a/src/mrparam.h +++ b/src/mrparam.h @@ -60,7 +60,6 @@ extern "C" { typedef struct mrparam_t { - uint32_t m_magic; char* m_packed; /* != NULL */ } mrparam_t; diff --git a/src/mrpoortext.c b/src/mrpoortext.c index c873e5a9..c34d691b 100644 --- a/src/mrpoortext.c +++ b/src/mrpoortext.c @@ -29,8 +29,6 @@ #include "mrmailbox.h" #include "mrtools.h" -#define CLASS_MAGIC 1333332222 - /******************************************************************************* * Main interface diff --git a/src/mrpoortext.h b/src/mrpoortext.h index 2f466054..3e7a9ff0 100644 --- a/src/mrpoortext.h +++ b/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 */