gmime r1524 - in trunk: . gmime

[fejj svn gnome org]

Author: fejj
Date: Tue Mar 31 04:09:49 2009
New Revision: 1524
URL: http://svn.gnome.org/viewvc/gmime?rev=1524&view=rev

Log:
2009-03-31  Jeffrey Stedfast  <fejj novell com>

	* gmime/gmime-parser.c (parser_scan_content): Fixed 'crlf'
	argument to be a guint to make it easier to avoid compile warnings
	about comparison between signed/unsigned ints in the callers.

	* gmime/internet-address.c (internet_address_group_add_member):
	Fixed g_return macros to return a value.
	(internet_address_mailbox_get_addr): Same.



Modified:
   trunk/ChangeLog
   trunk/gmime/gmime-parser.c
   trunk/gmime/internet-address.c

Modified: trunk/gmime/gmime-parser.c
==============================================================================
--- trunk/gmime/gmime-parser.c	(original)
+++ trunk/gmime/gmime-parser.c	Tue Mar 31 04:09:49 2009
@@ -33,8 +33,9 @@
 #include "gmime-parser.h"
 
 #include "gmime-table-private.h"
-#include "gmime-stream-mem.h"
 #include "gmime-message-part.h"
+#include "gmime-parse-utils.h"
+#include "gmime-stream-mem.h"
 #include "gmime-multipart.h"
 #include "gmime-part.h"
 
@@ -1120,7 +1121,6 @@
 parser_content_type (GMimeParser *parser)
 {
 	struct _GMimeParserPrivate *priv = parser->priv;
-	register const char *inptr;
 	ContentType *content_type;
 	const char *value;
 	
@@ -1287,7 +1287,7 @@
 #define MAX_BOUNDARY_LEN(bounds) (bounds ? bounds->boundarylenmax + 2 : 0)
 
 static int
-parser_scan_content (GMimeParser *parser, GByteArray *content, int *crlf)
+parser_scan_content (GMimeParser *parser, GByteArray *content, guint *crlf)
 {
 	struct _GMimeParserPrivate *priv = parser->priv;
 	register char *inptr;
@@ -1389,7 +1389,7 @@
 	GMimeDataWrapper *wrapper;
 	GMimeStream *stream;
 	gint64 start, end;
-	int crlf;
+	guint crlf;
 	
 	g_assert (priv->state >= GMIME_PARSER_STATE_HEADERS_END);
 	
@@ -1539,8 +1539,9 @@
 parser_scan_multipart_face (GMimeParser *parser, GMimeMultipart *multipart, gboolean preface)
 {
 	GByteArray *buffer;
-	int found, crlf;
 	char *face;
+	guint crlf;
+	int found;
 	
 	buffer = g_byte_array_new ();
 	found = parser_scan_content (parser, buffer, &crlf);

Modified: trunk/gmime/internet-address.c
==============================================================================
--- trunk/gmime/internet-address.c	(original)
+++ trunk/gmime/internet-address.c	Tue Mar 31 04:09:49 2009
@@ -152,7 +152,7 @@
 static EventListener *
 event_list_find_listener (List *list, EventCallback callback, gpointer user_data)
 {
-	EventListener *node, *next;
+	EventListener *node;
 	
 	node = (EventListener *) list->head;
 	while (node->next) {
@@ -486,7 +486,7 @@
 const char *
 internet_address_mailbox_get_addr (InternetAddressMailbox *mailbox)
 {
-	g_return_if_fail (INTERNET_ADDRESS_IS_MAILBOX (mailbox));
+	g_return_val_if_fail (INTERNET_ADDRESS_IS_MAILBOX (mailbox), NULL);
 	
 	return mailbox->addr;
 }
@@ -652,8 +652,8 @@
 int
 internet_address_group_add_member (InternetAddressGroup *group, InternetAddress *member)
 {
-	g_return_if_fail (INTERNET_ADDRESS_IS_GROUP (group));
-	g_return_if_fail (IS_INTERNET_ADDRESS (member));
+	g_return_val_if_fail (INTERNET_ADDRESS_IS_GROUP (group), -1);
+	g_return_val_if_fail (IS_INTERNET_ADDRESS (member), -1);
 	
 	return internet_address_list_add (group->members, member);
 }
@@ -988,7 +988,7 @@
 	g_return_val_if_fail (IS_INTERNET_ADDRESS_LIST (list), FALSE);
 	g_return_val_if_fail (index >= 0, FALSE);
 	
-	if (index >= list->array->len)
+	if ((guint) index >= list->array->len)
 		return FALSE;
 	
 	ia = list->array->pdata[index];