[[email protected]: Warning cleanups]

--ibTvN161/egqYuK8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Actually attaching the patch might help...


----- Forwarded message from Andrea Campi <[email protected]> -----

Date: Tue, 13 May 2003 11:58:13 +0200
From: Andrea Campi <[email protected]>
To: roadrunner <[email protected]>
Subject: Warning cleanups
Organization: I.NET S.p.A.
User-Agent: Mutt/1.5.4i

Hi Jonas and all,

I'm finally updating my local repository to the CVS head, and I've
found a few new warnings. Could you commit the attached patch?

In librr/rr.c, I added an include <string.h> to get the prototype
for memcpy.

Bye,
	Andrea

-- 
Andrea Campi                              mailto:[email protected]
I.NET S.p.A. - BT Ignite                  http://www.inet.it
Technical Dept. - R&D			  phone: +39 02 32863 ext 1
v. Darwin, 85 - I-20019			  fax: +39 02 32863 ext 7705
Settimo Milanese (MI), Italy

----- End forwarded message -----

-- 
Andrea Campi                              mailto:[email protected]
I.NET S.p.A. - BT Ignite                  http://www.inet.it
Technical Dept. - R&D			  phone: +39 02 32863 ext 1
v. Darwin, 85 - I-20019			  fax: +39 02 32863 ext 7705
Settimo Milanese (MI), Italy

--ibTvN161/egqYuK8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="rr.diff"

==== //depot/roadrunner_inet/librr/message/rr-message-close.c#3 - /home/src/acampi/ws/roadrunner_inet/librr/message/rr-message-close.c ====
@@ -249,7 +249,7 @@
 gboolean
 rr_message_close_wait_for_reply (RRMessageClose *mclose, GError **error)
 {
-	g_return_if_fail (RR_IS_MESSAGE_CLOSE (mclose));
+	g_return_val_if_fail (RR_IS_MESSAGE_CLOSE (mclose), FALSE);
 
 	return rr_waiter_wait (mclose->priv->waiter, error);
 }
==== //depot/roadrunner_inet/librr/message/rr-greeting.c#4 - /home/src/acampi/ws/roadrunner_inet/librr/message/rr-greeting.c ====
@@ -261,7 +261,7 @@
 void
 rr_greeting_set_peer_profiles (RRGreeting *greeting, GSList *peer_profiles)
 {
-	g_return_val_if_fail (RR_IS_GREETING (greeting), NULL);
+	g_return_if_fail (RR_IS_GREETING (greeting));
 	
 	greeting->priv->peer_profiles = peer_profiles;
 }
==== //depot/roadrunner_inet/librr/message/rr-message.c#3 - /home/src/acampi/ws/roadrunner_inet/librr/message/rr-message.c ====
@@ -130,7 +130,7 @@
 RRChannel *
 rr_message_get_channel (RRMessage *message)
 {
-	g_return_if_fail (RR_IS_MESSAGE (message));
+	g_return_val_if_fail (RR_IS_MESSAGE (message), NULL);
 
 	return message->channel;
 }
==== //depot/roadrunner_inet/librr/rr-channel.c#6 - /home/src/acampi/ws/roadrunner_inet/librr/rr-channel.c ====
@@ -673,7 +673,7 @@
 gint
 rr_channel_get_max_aggregate_size (RRChannel *channel)
 {
-	g_return_if_fail (RR_IS_CHANNEL (channel));
+	g_return_val_if_fail (RR_IS_CHANNEL (channel), 0);
 
 	return channel->priv->max_aggregate_size;
 }
==== //depot/roadrunner_inet/librr/rr.c#3 - /home/src/acampi/ws/roadrunner_inet/librr/rr.c ====
@@ -14,6 +14,7 @@
 #include <librr/rr.h>
 
 #include <stdlib.h>
+#include <string.h>
 #include <config.h>
 
 #define RR_DEFAULT_MAX_WORK_THREADS 1
==== //depot/roadrunner_inet/librr/rr-waiter.c#1 - /home/src/acampi/ws/roadrunner_inet/librr/rr-waiter.c ====
@@ -97,7 +97,7 @@
 gboolean
 rr_waiter_wait (RRWaiter *waiter, GError **error)
 {
-	g_return_if_fail (waiter != NULL);
+	g_return_val_if_fail (waiter != NULL, FALSE);
 
 	g_mutex_lock (waiter->mutex);
 	while (waiter->done == FALSE) {
@@ -143,7 +143,7 @@
 {
 	gpointer data;
 
-	g_return_if_fail (waiter != NULL);
+	g_return_val_if_fail (waiter != NULL, NULL);
 
 	g_mutex_lock   (waiter->mutex);
 	data = waiter->user_data;

--ibTvN161/egqYuK8
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit

_______________________________________________
Roadrunner mailing list
[email protected]
http://lists.codefactory.se/cgi-bin/mailman/listinfo/roadrunner

--ibTvN161/egqYuK8--