[2341] 2009-06-18 Vladimir Serbinenko <address@hidden>

[Vladimir Serbinenko]

Revision: 2341
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2341
Author:   phcoder
Date:     2009-06-18 13:51:06 +0000 (Thu, 18 Jun 2009)
Log Message:
-----------
2009-06-18  Vladimir Serbinenko  <address@hidden>

        Fix warnings

        * fs/ntfscomp.c (decomp_get16): initialize c1 and c2
        (decomp_block): initialize ch
        use grub_memcpy instead of memcpy

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/fs/ntfscomp.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-06-17 19:42:06 UTC (rev 2340)
+++ trunk/grub2/ChangeLog       2009-06-18 13:51:06 UTC (rev 2341)
@@ -1,3 +1,11 @@
+2009-06-18  Vladimir Serbinenko  <address@hidden>
+
+       Fix warnings
+
+       * fs/ntfscomp.c (decomp_get16): initialize c1 and c2
+       (decomp_block): initialize ch
+       use grub_memcpy instead of memcpy
+
 2009-06-17  Pavel Roskin  <address@hidden>
 
        * include/grub/i386/coreboot/console.h: Don't use the i386-pc

Modified: trunk/grub2/fs/ntfscomp.c
===================================================================
--- trunk/grub2/fs/ntfscomp.c   2009-06-17 19:42:06 UTC (rev 2340)
+++ trunk/grub2/fs/ntfscomp.c   2009-06-18 13:51:06 UTC (rev 2341)
@@ -57,7 +57,7 @@
 static grub_err_t
 decomp_get16 (struct grub_ntfs_comp *cc, grub_uint16_t * res)
 {
-  unsigned char c1, c2;
+  unsigned char c1 = 0, c2 = 0;
 
   if ((decomp_getch (cc, &c1)) || (decomp_getch (cc, &c2)))
     return grub_errno;
@@ -134,7 +134,7 @@
                }
              else
                {
-                 unsigned char ch;
+                 unsigned char ch = 0;
 
                  if (decomp_getch (cc, &ch))
                    return grub_errno;
@@ -163,7 +163,7 @@
        n = cnt;
       if ((dest) && (n))
        {
-         memcpy (dest, &cc->cbuf[cc->cbuf_ofs], n);
+         grub_memcpy (dest, &cc->cbuf[cc->cbuf_ofs], n);
          dest += n;
        }
       cnt -= n;