Merge branch 'maint' into next

[tools/e2fsprogs.git] / misc / blkid.c

diff --git a/misc/blkid.c b/misc/blkid.c
index 4bbf9fb..388abad 100644 (file)
--- a/misc/blkid.c
+++ b/misc/blkid.c
@@ -170,7 +170,6 @@ static void pretty_print_dev(blkid_dev dev)
        blkid_tag_iterate       iter;
        const char              *type, *value, *devname;
        const char              *uuid = "", *fs_type = "", *label = "";
-       char                    *cp;
        int                     len, mount_flags;
        char                    mtpt[80];
        errcode_t               retval;
@@ -420,10 +419,8 @@ int main(int argc, char **argv)
        }
 
 exit:
-       if (search_type)
-               free(search_type);
-       if (search_value)
-               free(search_value);
+       free(search_type);
+       free(search_value);
        blkid_put_cache(cache);
        return err;
 }