vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
(main): Rename read to curread to avoid shadowing.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-10 12:54:40 +01:00
parent 56c98584c7
commit 76fb2ea93b
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
* util/misc.c (grub_util_write_image_at): Fix format specification. * util/misc.c (grub_util_write_image_at): Fix format specification.

8
util/grub-script-check.c
View file

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