Fixed signed comparison warnings

diff --git a/src/build_msg.c b/src/build_msg.c
index 67aabd7..ac57b4d 100644 (file)
--- a/src/build_msg.c
+++ b/src/build_msg.c
@@ -36,7 +36,7 @@
  * to the project. For more information see the website or contact
  * the copyright holders.
  *
  * to the project. For more information see the website or contact
  * the copyright holders.
  *

- * $Id: build_msg.c,v 1.28 2005/02/27 18:39:43 kattemat Exp $
+ * $Id: build_msg.c,v 1.29 2005/03/10 20:43:13 kattemat Exp $

  */
 
 
  */
 
 


@@ -241,7 +241,7 @@ check_buffspace(int msgsize, int buffsize, char *type)
 static olsr_bool
 serialize_hello4(struct hello_message *message, struct interface *ifp)
 {
 static olsr_bool
 serialize_hello4(struct hello_message *message, struct interface *ifp)
 {

-  int remainsize, curr_size;
+  olsr_u16_t remainsize, curr_size;

   struct hello_neighbor *nb;
   union olsr_message *m;
   struct hellomsg *h;
   struct hello_neighbor *nb;
   union olsr_message *m;
   struct hellomsg *h;


@@ -414,7 +414,7 @@ serialize_hello4(struct hello_message *message, struct interface *ifp)
 static olsr_bool
 serialize_hello6(struct hello_message *message, struct interface *ifp)
 {
 static olsr_bool
 serialize_hello6(struct hello_message *message, struct interface *ifp)
 {

-  int remainsize, curr_size;
+  olsr_u16_t remainsize, curr_size;

   struct hello_neighbor *nb;
   union olsr_message *m;
   struct hellomsg6 *h6;
   struct hello_neighbor *nb;
   union olsr_message *m;
   struct hellomsg6 *h6;


@@ -580,7 +580,7 @@ static olsr_bool
 serialize_tc4(struct tc_message *message, struct interface *ifp)           
 {
 
 serialize_tc4(struct tc_message *message, struct interface *ifp)           
 {
 

-  int remainsize, curr_size;
+  olsr_u16_t remainsize, curr_size;

   struct tc_mpr_addr *mprs;
   union olsr_message *m;
   struct tcmsg *tc;
   struct tc_mpr_addr *mprs;
   union olsr_message *m;
   struct tcmsg *tc;


@@ -706,7 +706,7 @@ static olsr_bool
 serialize_tc6(struct tc_message *message, struct interface *ifp)           
 {
 
 serialize_tc6(struct tc_message *message, struct interface *ifp)           
 {
 

-  int remainsize, curr_size;
+  olsr_u16_t remainsize, curr_size;

   struct tc_mpr_addr *mprs;
   union olsr_message *m;
   struct tcmsg6 *tc6;
   struct tc_mpr_addr *mprs;
   union olsr_message *m;
   struct tcmsg6 *tc6;


@@ -823,7 +823,7 @@ serialize_tc6(struct tc_message *message, struct interface *ifp)
 static olsr_bool
 serialize_mid4(struct interface *ifp)
 {
 static olsr_bool
 serialize_mid4(struct interface *ifp)
 {

-  int remainsize, curr_size;
+  olsr_u16_t remainsize, curr_size;

   /* preserve existing data in output buffer */
   union olsr_message *m;
   struct midaddr *addrs;
   /* preserve existing data in output buffer */
   union olsr_message *m;
   struct midaddr *addrs;


@@ -919,7 +919,7 @@ serialize_mid4(struct interface *ifp)
 static olsr_bool
 serialize_mid6(struct interface *ifp)
 {
 static olsr_bool
 serialize_mid6(struct interface *ifp)
 {

-  int remainsize, curr_size;
+  olsr_u16_t remainsize, curr_size;

   /* preserve existing data in output buffer */
   union olsr_message *m;
   struct midaddr6 *addrs6;
   /* preserve existing data in output buffer */
   union olsr_message *m;
   struct midaddr6 *addrs6;


@@ -1014,7 +1014,7 @@ serialize_mid6(struct interface *ifp)
 static olsr_bool
 serialize_hna4(struct interface *ifp)
 {
 static olsr_bool
 serialize_hna4(struct interface *ifp)
 {

-  int remainsize, curr_size;
+  olsr_u16_t remainsize, curr_size;

   /* preserve existing data in output buffer */
   union olsr_message *m;
   struct hnapair *pair;
   /* preserve existing data in output buffer */
   union olsr_message *m;
   struct hnapair *pair;


@@ -1103,7 +1103,7 @@ serialize_hna4(struct interface *ifp)
 static olsr_bool
 serialize_hna6(struct interface *ifp)
 {
 static olsr_bool
 serialize_hna6(struct interface *ifp)
 {

-  int remainsize, curr_size;
+  olsr_u16_t remainsize, curr_size;

   /* preserve existing data in output buffer */
   union olsr_message *m;
   struct hnapair6 *pair6;
   /* preserve existing data in output buffer */
   union olsr_message *m;
   struct hnapair6 *pair6;

diff --git a/src/net.c b/src/net.c
index 3cde165..88dc5c0 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -36,7 +36,7 @@
  * to the project. For more information see the website or contact
  * the copyright holders.
  *
  * to the project. For more information see the website or contact
  * the copyright holders.
  *

- * $Id: net.c,v 1.37 2005/03/04 21:30:16 kattemat Exp $
+ * $Id: net.c,v 1.38 2005/03/10 20:43:13 kattemat Exp $

  */
 
 #include "net.h"
  */
 
 #include "net.h"


@@ -237,16 +237,18 @@ net_outbuffer_push_reserved(struct interface *ifp, olsr_u8_t *data, olsr_u16_t s
  * @param ifp the interface corresponding to the buffer
  *
  * @return the number of bytes available in the buffer or
  * @param ifp the interface corresponding to the buffer
  *
  * @return the number of bytes available in the buffer or

- *  -1 if no buffer was found

  */
 int
 net_outbuffer_bytes_left(struct interface *ifp)
 {
  */
 int
 net_outbuffer_bytes_left(struct interface *ifp)
 {

+  int remaining;

 
   if(!netbufs[ifp->if_nr])
 
   if(!netbufs[ifp->if_nr])

-    return -1;
+    return 0;
+
+  remaining = netbufs[ifp->if_nr]->maxsize - netbufs[ifp->if_nr]->pending;

 
 

-  return (netbufs[ifp->if_nr]->maxsize - netbufs[ifp->if_nr]->pending);
+  return remaining ? remaining : 0;

 }
 
 
 }