2009-07-19 Vladimir Serbinenko <phcoder@gmail.com>

	* disk/usbms.c (grub_usbms_transfer): Fix double semicolon.
	* fs/xfs.c (grub_xfs_dir): Likewise.
	* fs/afs.c (grub_afs_dir): Likewise.
	* fs/iso9660.c (grub_iso9660_iterate_dir): Likewise.
	(grub_iso9660_open): Likewise.
	* fs/jfs.c (grub_jfs_open): Likewise.
	* fs/ext2.c (grub_ext2_dir): Likewise.
	* include/grub/macho.h (grub_macho_fat_arch): Likewise.
	* script/sh/lexer.c (grub_script_yylex): Likewise.

diff --git a/ChangeLog b/ChangeLog
index e38ebc5f7053bedbb544d68ebc95207c15ea8158..bfceb235609d73073a33b290d456740778f25789 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-07-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * disk/usbms.c (grub_usbms_transfer): Fix double semicolon.
+       * fs/xfs.c (grub_xfs_dir): Likewise.
+       * fs/afs.c (grub_afs_dir): Likewise.
+       * fs/iso9660.c (grub_iso9660_iterate_dir): Likewise.
+       (grub_iso9660_open): Likewise.
+       * fs/jfs.c (grub_jfs_open): Likewise.
+       * fs/ext2.c (grub_ext2_dir): Likewise.
+       * include/grub/macho.h (grub_macho_fat_arch): Likewise.
+       * script/sh/lexer.c (grub_script_yylex): Likewise.
+       
 2009-07-16  Pavel Roskin  <proski@gnu.org>
 
        * configure.ac: Never add "-c" to CFLAGS.

diff --git a/disk/usbms.c b/disk/usbms.c
index 671e145e6156e6bae96e1ac7b075691b2cf150bb..51e886520f726ab539f198cc3c8d64842b84b5ec 100644 (file)
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -247,7 +247,7 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
          grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
          goto retry;
        }
-      return grub_error (GRUB_ERR_IO, "USB Mass Storage request failed");;
+      return grub_error (GRUB_ERR_IO, "USB Mass Storage request failed");
     }
 
   /* Read/write the data.  */

diff --git a/fs/afs.c b/fs/afs.c
index 1f6e1633c6a8dea0331652f06757bb77d3daabd1..832a95c38a618435008a941d30ba635a3a0f3cf8 100644 (file)
--- a/fs/afs.c
+++ b/fs/afs.c
@@ -557,7 +557,7 @@ grub_afs_dir (grub_device_t device, const char *path,
               int (*hook) (const char *filename,
                           const struct grub_dirhook_info *info))
 {
-  struct grub_afs_data *data = 0;;
+  struct grub_afs_data *data = 0;
   struct grub_fshelp_node *fdiro = 0;
 
   auto int NESTED_FUNC_ATTR iterate (const char *filename,

diff --git a/fs/ext2.c b/fs/ext2.c
index 0fff2fef8e97b70c46f75890a19d381cd6118ba1..0341680ea869dd50a465a775a786517b4c835bc1 100644 (file)
--- a/fs/ext2.c
+++ b/fs/ext2.c
@@ -786,7 +786,7 @@ grub_ext2_dir (grub_device_t device, const char *path,
               int (*hook) (const char *filename,
                            const struct grub_dirhook_info *info))
 {
-  struct grub_ext2_data *data = 0;;
+  struct grub_ext2_data *data = 0;
   struct grub_fshelp_node *fdiro = 0;
 
   auto int NESTED_FUNC_ATTR iterate (const char *filename,

diff --git a/fs/iso9660.c b/fs/iso9660.c
index 63d43b047f074d26af76459682c4b6ea3b4d52e6..9b7ce765b32b9e7416029c8e8bc7364873642946 100644 (file)
--- a/fs/iso9660.c
+++ b/fs/iso9660.c
@@ -562,7 +562,7 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
        int nameoffset = offset + sizeof (dirent);
        struct grub_fshelp_node *node;
        int sua_off = (sizeof (dirent) + dirent.namelen + 1
-                      - (dirent.namelen % 2));;
+                      - (dirent.namelen % 2));
        int sua_size = dirent.len - sua_off;
 
        sua_off += offset + dir->data->susp_skip;
@@ -756,7 +756,7 @@ grub_iso9660_open (struct grub_file *file, const char *name)
 
   grub_free (data);
 
-  return grub_errno;;
+  return grub_errno;
 }
 
 

diff --git a/fs/jfs.c b/fs/jfs.c
index 4ec03d6aa57fe454a925840f77e4f454c4d1a502..ae7486a2fefd0d33bff005947ff2ab345e8122a8 100644 (file)
--- a/fs/jfs.c
+++ b/fs/jfs.c
@@ -808,7 +808,7 @@ grub_jfs_open (struct grub_file *file, const char *name)
 
   grub_free (data);
 
-  return grub_errno;;
+  return grub_errno;
 }
 
 

diff --git a/fs/xfs.c b/fs/xfs.c
index 68a4b4f5603bffc37f979a9a19fe9abeb923aeb5..ddaba57206e8196fe832a1ae82431abbe12f1124 100644 (file)
--- a/fs/xfs.c
+++ b/fs/xfs.c
@@ -621,7 +621,7 @@ grub_xfs_dir (grub_device_t device, const char *path,
              int (*hook) (const char *filename,
                           const struct grub_dirhook_info *info))
 {
-  struct grub_xfs_data *data = 0;;
+  struct grub_xfs_data *data = 0;
   struct grub_fshelp_node *fdiro = 0;
 
   auto int NESTED_FUNC_ATTR iterate (const char *filename,

diff --git a/include/grub/macho.h b/include/grub/macho.h
index 0463d3753f2a9786b74a55fe9db7595630e0c4c5..0604100e90f34d37d1cd6e0ab7625a7e236e42cc 100644 (file)
--- a/include/grub/macho.h
+++ b/include/grub/macho.h
@@ -39,7 +39,7 @@ struct grub_macho_fat_arch
   grub_uint32_t offset;
   grub_uint32_t size;
   grub_uint32_t align;
-} __attribute__ ((packed));;
+} __attribute__ ((packed));
 
 /* File header for 32-bit. Always in native-endian. */
 struct grub_macho_header32

diff --git a/script/sh/lexer.c b/script/sh/lexer.c
index 2a56c30a6f669cde241dfaa452f2a00a41a490fe..44d7da2adfce5be3b16b32587862511a037b7282 100644 (file)
--- a/script/sh/lexer.c
+++ b/script/sh/lexer.c
@@ -246,7 +246,7 @@ grub_script_yylex (union YYSTYPE *yylval, struct grub_parser_param *parsestate)
                  {
                    char c;
                    grub_dprintf ("scripting", "token=`%c'\n", *state->script);
-                   c = *state->script;;
+                   c = *state->script;
                    nextchar (state);
                    state->tokenonhold = c;
                    doexit = 1;