Remove a shadowed variable and an unnecessary local variable in cbfstool/fs.c.

It is nearly trivial.

Signed-off-by: Myles Watson<mylesgw@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4279 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/util/cbfstool/fs.c b/util/cbfstool/fs.c
index 536804c30e9963e1230b3cce7e1ae64f8bd12a51..f617159563aba6f1b6fcaa3944d714bca895c54f 100644 (file)
--- a/util/cbfstool/fs.c
+++ b/util/cbfstool/fs.c
@@ -103,7 +103,6 @@ struct cbfs_file * rom_alloc(struct rom *rom, const char *name, unsigned long si
        struct cbfs_file *c = NULL;
        unsigned long nextoffset, truncoffset;
        struct cbfs_file *newfile = NULL;
-       unsigned int csize;
 
        while (offset < rom->fssize) {
 
@@ -150,11 +149,9 @@ struct cbfs_file * rom_alloc(struct rom *rom, const char *name, unsigned long si
 
        c->len = htonl(size);
 
-       csize = headersize(name);
-
        strcpy(c->magic, COMPONENT_MAGIC);
 
-       c->offset = htonl(csize);
+       c->offset = htonl(headersize(name));
 
        c->type = htonl(type);
 
@@ -249,7 +246,6 @@ int rom_remove(struct rom *rom, const char *name)
 int rom_extract(struct rom *rom, const char *name, void** buf, int *size )
 {
        struct cbfs_file *c = rom_find_by_name(rom, name);
-       unsigned int csize;
 
        if (c == NULL) {
                ERROR("Component %s does not exist\n", name);
@@ -257,9 +253,7 @@ int rom_extract(struct rom *rom, const char *name, void** buf, int *size )
        }
 
        *size = ntohl(c->len);
-
-       csize = headersize(name);
-       *buf = ((unsigned char *)c) + csize;
+       *buf = ((unsigned char *)c) + headersize(name);
        return 0;
 }