* util/grub-script-check.c (argp_parser): Remove unused variable.

	(main): Rename read to curread to avoid shadowing.

diff --git a/ChangeLog b/ChangeLog
index 4606a769e280d9a9313e9e49b41f922bb9861058..2d5a3cd5e1ca460729b46851cc4c288906f01846 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-script-check.c (argp_parser): Remove unused variable.
+       (main): Rename read to curread to avoid shadowing.
+
 2012-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/misc.c (grub_util_write_image_at): Fix format specification.

diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index 5a0e2fc2823900cf59c13cdff30dd115c0fe0488..97b9969ef368bd930dd864dc3513143dcdd77168 100644 (file)
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -56,8 +56,6 @@ argp_parser (int key, char *arg, struct argp_state *state)
      know is a pointer to our arguments structure. */
   struct arguments *arguments = state->input;
 
-  char *p;
-
   switch (key)
     {
     case 'v':
@@ -102,10 +100,10 @@ main (int argc, char *argv[])
     int i;
     char *cmdline = 0;
     size_t len = 0;
-    ssize_t read;
+    ssize_t curread;
 
-    read = getline(&cmdline, &len, (file ?: stdin));
-    if (read == -1)
+    curread = getline(&cmdline, &len, (file ?: stdin));
+    if (curread == -1)
       {
        *line = 0;
        grub_errno = GRUB_ERR_READ_ERROR;