Don't allow in to be NULL, so instead of doing if (in == NULL) return;,

2001-07-06  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-mime-utils.c (header_encode_param): Don't allow in to be
	NULL, so instead of doing if (in == NULL) return;, make it a
	g_return_val_if_fail and later we can make it an assert or
	something.

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 08413f1..9c46f55 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,10 @@
 2001-07-06  Jeffrey Stedfast  <fejj@ximian.com>
 
+       * camel-mime-utils.c (header_encode_param): Don't allow in to be
+       NULL, so instead of doing if (in == NULL) return;, make it a
+       g_return_val_if_fail and later we can make it an assert or
+       something.
+
        * providers/local/camel-maildir-store.c (get_inbox): Fixes bug
        #1138.
 

diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index 70b0a3f..10730a4 100644 (file)
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -2730,11 +2730,9 @@ header_encode_param (const unsigned char *in, gboolean *encoded)
        
        *encoded = FALSE;
        
+       g_return_val_if_fail (in != NULL, NULL);
        g_return_val_if_fail (g_utf8_validate (in, -1, NULL), NULL);
        
-       if (in == NULL)
-               return NULL;
-       
        /* do a quick us-ascii check (the common case?) */
        while (*inptr) {
                if (*inptr > 127)