From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 21 Aug 2013 19:02:14 +0000 (+0200)
Subject: 	* grub-core/disk/ahci.c: Add needed explicit cast.
X-Git-Tag: grub-2.02-beta1~884
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54ea2f4401cfbb085ae35b6bbc9f848f29771ed7;p=thirdparty%2Fgrub.git

	* grub-core/disk/ahci.c: Add needed explicit cast.
	* grub-core/lib/backtrace.c: Likewise.
	* grub-core/net/ip.c: Likewise.
	* grub-core/net/tcp.c: Likewise.
	* grub-core/net/udp.c: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 0dc6d3b66..feea67176 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-08-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/disk/ahci.c: Add needed explicit cast.
+	* grub-core/lib/backtrace.c: Likewise.
+	* grub-core/net/ip.c: Likewise.
+	* grub-core/net/tcp.c: Likewise.
+	* grub-core/net/udp.c: Likewise.
+
 2013-08-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/lib/posix_wrap/wchar.h: Fix typo.
diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c
index 58bc190f2..0f5785662 100644
--- a/grub-core/disk/ahci.c
+++ b/grub-core/disk/ahci.c
@@ -970,8 +970,8 @@ grub_ahci_readwrite_real (struct grub_ahci_device *dev,
 		dev->command_table[0].prdt[0].data_base,
 		dev->command_table[0].prdt[0].unused,
 		dev->command_table[0].prdt[0].size,
-		(char *) &dev->command_table[0].prdt[0]
-		- (char *) &dev->command_table[0]);
+		(grub_size_t) ((char *) &dev->command_table[0].prdt[0]
+			       - (char *) &dev->command_table[0]));
 
   if (parms->write)
     grub_memcpy ((char *) grub_dma_get_virt (bufc), parms->buffer, parms->size);
diff --git a/grub-core/lib/backtrace.c b/grub-core/lib/backtrace.c
index 32945d9f8..825a8800e 100644
--- a/grub-core/lib/backtrace.c
+++ b/grub-core/lib/backtrace.c
@@ -39,7 +39,7 @@ grub_backtrace_print_address (void *addr)
 	  + segment->size > (grub_uint8_t *) addr)
 	{
 	  grub_printf ("%s.%x+%" PRIxGRUB_SIZE, mod->name, segment->section,
-		       (grub_uint8_t *) addr - (grub_uint8_t *) segment->addr);
+		       (grub_size_t) ((grub_uint8_t *) addr - (grub_uint8_t *) segment->addr));
 	  return;
 	}
   }
diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
index 3c58d8074..08f225515 100644
--- a/grub-core/net/ip.c
+++ b/grub-core/net/ip.c
@@ -403,7 +403,7 @@ grub_net_recv_ip4_packets (struct grub_net_buff *nb,
 					    * sizeof (grub_uint32_t)))
     {
       grub_dprintf ("net", "IP packet too short: %" PRIdGRUB_SSIZE "\n",
-		    (nb->tail - nb->data));
+		    (grub_ssize_t) (nb->tail - nb->data));
       grub_netbuff_free (nb);
       return GRUB_ERR_NONE;
     }
@@ -654,7 +654,7 @@ grub_net_recv_ip6_packets (struct grub_net_buff *nb,
   if (nb->tail - nb->data < (grub_ssize_t) sizeof (*iph))
     {
       grub_dprintf ("net", "IP packet too short: %" PRIdGRUB_SSIZE "\n",
-		    nb->tail - nb->data);
+		    (grub_ssize_t) (nb->tail - nb->data));
       grub_netbuff_free (nb);
       return GRUB_ERR_NONE;
     }
diff --git a/grub-core/net/tcp.c b/grub-core/net/tcp.c
index e7112a7b7..89bc4cc72 100644
--- a/grub-core/net/tcp.c
+++ b/grub-core/net/tcp.c
@@ -766,7 +766,7 @@ grub_net_recv_tcp_packet (struct grub_net_buff *nb,
 					     >> 12) * sizeof (grub_uint32_t)))
     {
       grub_dprintf ("net", "TCP packet too short: %" PRIuGRUB_SIZE "\n",
-		    nb->tail - nb->data);
+		    (grub_size_t) (nb->tail - nb->data));
       grub_netbuff_free (nb);
       return GRUB_ERR_NONE;
     }
diff --git a/grub-core/net/udp.c b/grub-core/net/udp.c
index 919dca8db..df7fb95e7 100644
--- a/grub-core/net/udp.c
+++ b/grub-core/net/udp.c
@@ -155,7 +155,7 @@ grub_net_recv_udp_packet (struct grub_net_buff *nb,
   if (nb->tail - nb->data < (grub_ssize_t) sizeof (*udph))
     {
       grub_dprintf ("net", "UDP packet too short: %" PRIuGRUB_SIZE "\n",
-		    nb->tail - nb->data);
+		    (grub_size_t) (nb->tail - nb->data));
       grub_netbuff_free (nb);
       return GRUB_ERR_NONE;
     }