[gmime] minor cleanup

[Jeffrey Stedfast <fejj src gnome org>]

commit 8af93450573eedef9235b4704b840c3041da8be0
Author: Jeffrey Stedfast <fejj gnome org>
Date:   Wed Dec 20 11:58:05 2017 -0500

    minor cleanup

 gmime/gmime-autocrypt.c |   80 +++++++++++++++++++++++++++-------------------
 gmime/gmime-autocrypt.h |    2 +-
 2 files changed, 48 insertions(+), 34 deletions(-)
---
diff --git a/gmime/gmime-autocrypt.c b/gmime/gmime-autocrypt.c
index 2b2f970..69b4efd 100644
--- a/gmime/gmime-autocrypt.c
+++ b/gmime/gmime-autocrypt.c
@@ -123,6 +123,7 @@ g_mime_autocrypt_header_new (void)
 
 /**
  * g_mime_autocrypt_header_new_from_string:
+ * @string: The raw string value of an Autocrypt header
  *
  * Creates a new #GMimeAutocryptHeader object based on the value of an
  * Autocrypt: header.
@@ -231,9 +232,11 @@ g_mime_autocrypt_header_set_address_from_string (GMimeAutocryptHeader *ah, const
 
        if (ah->address)
                g_object_unref (ah->address);
-       ah->address = INTERNET_ADDRESS_MAILBOX(internet_address_mailbox_new (NULL, address));
+       
+       ah->address = (InternetAddressMailbox *) internet_address_mailbox_new (NULL, address);
 }
 
+
 /**
  * g_mime_autocrypt_header_set_address:
  * @ah: a #GMimeAutocryptHeader object
@@ -245,14 +248,15 @@ void
 g_mime_autocrypt_header_set_address (GMimeAutocryptHeader *ah, InternetAddressMailbox *address)
 {
        g_return_if_fail (GMIME_IS_AUTOCRYPT_HEADER (ah));
-
+       g_return_if_fail (INTERNET_ADDRESS_IS_MAILBOX (address));
+       
+       g_object_ref (address);
        if (ah->address)
                g_object_unref (ah->address);
-       
        ah->address = address;
-       g_object_ref (address);
 }
 
+
 /**
  * g_mime_autocrypt_header_get_address:
  * @ah: a #GMimeAutocryptHeader object
@@ -261,11 +265,11 @@ g_mime_autocrypt_header_set_address (GMimeAutocryptHeader *ah, InternetAddressMa
  *
  * Returns: (transfer none): the address associated with the Autocrypt header
  **/
-InternetAddressMailbox*
+InternetAddressMailbox *
 g_mime_autocrypt_header_get_address (GMimeAutocryptHeader *ah)
 {
        g_return_val_if_fail (GMIME_IS_AUTOCRYPT_HEADER (ah), NULL);
-
+       
        return ah->address;
 }
 
@@ -278,11 +282,11 @@ g_mime_autocrypt_header_get_address (GMimeAutocryptHeader *ah)
  *
  * Returns: (transfer none): the address associated with the Autocrypt header
  **/
-const char*
+const char *
 g_mime_autocrypt_header_get_address_as_string (GMimeAutocryptHeader *ah)
 {
        g_return_val_if_fail (GMIME_IS_AUTOCRYPT_HEADER (ah), NULL);
-
+       
        return ah->address->addr;
 }
 
@@ -298,10 +302,11 @@ void
 g_mime_autocrypt_header_set_prefer_encrypt (GMimeAutocryptHeader *ah, GMimeAutocryptPreferEncrypt pref)
 {
        g_return_if_fail (GMIME_IS_AUTOCRYPT_HEADER (ah));
-
+       
        ah->prefer_encrypt = pref;
 }
 
+
 /**
  * g_mime_autocrypt_header_get_prefer_encrypt:
  * @ah: a #GMimeAutocryptHeader object
@@ -314,7 +319,7 @@ GMimeAutocryptPreferEncrypt
 g_mime_autocrypt_header_get_prefer_encrypt (GMimeAutocryptHeader *ah)
 {
        g_return_val_if_fail (GMIME_IS_AUTOCRYPT_HEADER (ah), GMIME_AUTOCRYPT_PREFER_ENCRYPT_NONE);
-
+       
        return ah->prefer_encrypt;
 }
 
@@ -330,15 +335,17 @@ void
 g_mime_autocrypt_header_set_keydata (GMimeAutocryptHeader *ah, GBytes *keydata)
 {
        g_return_if_fail (GMIME_IS_AUTOCRYPT_HEADER (ah));
-
+       
+       if (keydata)
+               g_bytes_ref (keydata);
+       
        if (ah->keydata)
                g_bytes_unref (ah->keydata);
        
        ah->keydata = keydata;
-       if (keydata)
-               g_bytes_ref (keydata);
 }
 
+
 /**
  * g_mime_autocrypt_header_get_keydata:
  * @ah: a #GMimeAutocryptHeader object
@@ -351,7 +358,7 @@ GBytes*
 g_mime_autocrypt_header_get_keydata (GMimeAutocryptHeader *ah)
 {
        g_return_val_if_fail (GMIME_IS_AUTOCRYPT_HEADER (ah), NULL);
-
+       
        return ah->keydata;
 }
 
@@ -367,15 +374,17 @@ void
 g_mime_autocrypt_header_set_effective_date (GMimeAutocryptHeader *ah, GDateTime *effective_date)
 {
        g_return_if_fail (GMIME_IS_AUTOCRYPT_HEADER (ah));
-
+       
+       if (effective_date)
+               g_date_time_ref (effective_date);
+       
        if (ah->effective_date)
                g_date_time_unref (ah->effective_date);
        
        ah->effective_date = effective_date;
-       if (effective_date)
-               g_date_time_ref (effective_date);
 }
 
+
 /**
  * g_mime_autocrypt_header_get_effective_date:
  * @ah: a #GMimeAutocryptHeader object
@@ -384,14 +393,15 @@ g_mime_autocrypt_header_set_effective_date (GMimeAutocryptHeader *ah, GDateTime
  *
  * Returns: (transfer none): the effective date associated with the Autocrypt header
  **/
-GDateTime*
+GDateTime *
 g_mime_autocrypt_header_get_effective_date (GMimeAutocryptHeader *ah)
 {
        g_return_val_if_fail (GMIME_IS_AUTOCRYPT_HEADER (ah), NULL);
-
+       
        return ah->effective_date;
 }
 
+
 /**
  * g_mime_autocrypt_header_is_complete:
  * @ah: a #GMimeAutocryptHeader object
@@ -408,6 +418,7 @@ gboolean
 g_mime_autocrypt_header_is_complete (GMimeAutocryptHeader *ah)
 {
        g_return_val_if_fail (GMIME_IS_AUTOCRYPT_HEADER (ah), FALSE);
+       
        return (ah->address && ah->address->addr && ah->keydata &&
                g_bytes_get_size (ah->keydata) && g_bytes_get_data (ah->keydata, NULL));
 }
@@ -441,9 +452,7 @@ g_mime_autocrypt_header_to_string (GMimeAutocryptHeader *ah, gboolean gossip)
                pe = "prefer-encrypt=mutual; ";
        const char *addr = internet_address_mailbox_get_addr (ah->address);
        GPtrArray *lines = g_ptr_array_new_with_free_func (g_free);
-
-       gchar * first = g_strdup_printf("addr=%s; %skeydata=",
-                                       addr, pe);
+       gchar *first = g_strdup_printf ("addr=%s; %skeydata=", addr, pe);
        size_t n = strlen (first);
        const size_t maxwid = 72;
        const size_t firstline = maxwid - sizeof ("Autocrypt:");
@@ -462,20 +471,21 @@ g_mime_autocrypt_header_to_string (GMimeAutocryptHeader *ah, gboolean gossip)
                offset = firstlinekeylen;
        }
        g_ptr_array_add (lines, first);
-
+       
        while (offset < ksz) {
                gsize newsz = MIN((maxwid/4)*3, ksz - offset);
                g_ptr_array_add (lines, g_base64_encode (kp + offset, newsz));
                offset += newsz;
        }
-
+       
        g_ptr_array_add (lines, NULL);
-
+       
        char *ret = g_strjoinv (" ", (gchar**)(lines->pdata));
        g_ptr_array_unref (lines);
        return ret;
 }
 
+
 /**
  * g_mime_autocrypt_header_compare:
  * @ah1: a #GMimeAutocryptHeader object
@@ -489,7 +499,7 @@ g_mime_autocrypt_header_to_string (GMimeAutocryptHeader *ah, gboolean gossip)
  *  - keydata
  *  - prefer_encrypt
  *
- * Returns: -1, 0, or 1 @ah1 is less than, equal to, or greater than @ah2.
+ * Returns: -1, 0, or 1 when @ah1 is less than, equal to, or greater than @ah2.
  **/
 int
 g_mime_autocrypt_header_compare (GMimeAutocryptHeader *ah1, GMimeAutocryptHeader *ah2)
@@ -515,7 +525,7 @@ g_mime_autocrypt_header_compare (GMimeAutocryptHeader *ah1, GMimeAutocryptHeader
                if (ret)
                        return ret;
        }
-
+       
        if (!ah1->keydata && ah2->keydata)
                return -1;
        if (ah1->keydata && !ah2->keydata)
@@ -533,7 +543,7 @@ g_mime_autocrypt_header_compare (GMimeAutocryptHeader *ah1, GMimeAutocryptHeader
                if (ret)
                        return ret;
        }
-
+       
        if (ah1->prefer_encrypt < ah2->prefer_encrypt)
                return -1;
        if (ah1->prefer_encrypt > ah2->prefer_encrypt)
@@ -555,26 +565,30 @@ g_mime_autocrypt_header_clone (GMimeAutocryptHeader *dst, GMimeAutocryptHeader *
 {
        if (!dst->address || !src->address)
                return;
+       
        if (g_strcmp0 (internet_address_mailbox_get_idn_addr (dst->address), 
internet_address_mailbox_get_idn_addr (src->address)))
                return;
-
+       
        if (dst->keydata)
                g_bytes_unref (dst->keydata);
+       
        if (src->keydata) {
                g_bytes_ref (src->keydata);
                dst->keydata = src->keydata;
-       } else
+       } else {
                dst->keydata = NULL;
-
+       }
+       
        dst->prefer_encrypt = src->prefer_encrypt;
-
+       
        if (dst->effective_date)
                g_date_time_unref (dst->effective_date);
        if (src->effective_date) {
                g_date_time_ref (src->effective_date);
                dst->effective_date = src->effective_date;
-       } else
+       } else {
                dst->effective_date = NULL;
+       }
 }
 
 
diff --git a/gmime/gmime-autocrypt.h b/gmime/gmime-autocrypt.h
index 8826d72..970a20f 100644
--- a/gmime/gmime-autocrypt.h
+++ b/gmime/gmime-autocrypt.h
@@ -91,7 +91,7 @@ struct _GMimeAutocryptHeaderClass {
 GType g_mime_autocrypt_header_get_type (void);
 
 GMimeAutocryptHeader *g_mime_autocrypt_header_new (void);
-GMimeAutocryptHeader *g_mime_autocrypt_header_new_from_string (const char* header);
+GMimeAutocryptHeader *g_mime_autocrypt_header_new_from_string (const char *string);
 
 void g_mime_autocrypt_header_set_address (GMimeAutocryptHeader *ah, InternetAddressMailbox *address);
 InternetAddressMailbox *g_mime_autocrypt_header_get_address (GMimeAutocryptHeader *ah);