* 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 0dc6d3b6670d13b493b6a78dba402a3e5852b291..feea67176cbc498f0fe8268e361e45deca205004 100644 (file)
--- 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 58bc190f2b5ca42375d81dfb1362264c5ae9818f..0f57856628c777939002d689563b00d75705794a 100644 (file)
--- 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 32945d9f8fde24583e38ac476393427d34cd686c..825a8800e25d52e3f874141e5a1cd897ebbc57e3 100644 (file)
--- 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 3c58d807452dbdbb45e1a17f82965f377d8e114e..08f22551536586460036add59f41af7ef474d8e0 100644 (file)
--- 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 e7112a7b7d70ba667c3fd7075e311307d676675f..89bc4cc726417ae7e6d322f2ebee39e5fe51c921 100644 (file)
--- 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 919dca8dbd99700a1fa56c70231eff5e660f3c82..df7fb95e710355ae9e883953f7f08273cda72d2a 100644 (file)
--- 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;
     }