floppy: make local variable non-static
authorRasmus Villemoes <linux@rasmusvillemoes.dk>
Tue, 1 Dec 2015 14:54:01 +0000 (15:54 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 8 Dec 2015 14:15:32 +0000 (15:15 +0100)
There's no reason for temparea to be static, since it's only used for
temporary sprintf output. It's not immediately obvious that the output
will always fit (in the worst case, the output including '\0' is
exactly 32 bytes), so save a future reader from worrying about that.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/block/floppy.c

index 331363e7de0f1d5682d7ca2756c2e2e59cbabbe4..9e251201dd48ef2a850b8069edf7ffc05be98a4e 100644 (file)
@@ -3585,7 +3585,7 @@ static void __init config_types(void)
                unsigned int type = UDP->cmos;
                struct floppy_drive_params *params;
                const char *name = NULL;
-               static char temparea[32];
+               char temparea[32];
 
                if (type < ARRAY_SIZE(default_drive_params)) {
                        params = &default_drive_params[type].params;
@@ -3596,7 +3596,8 @@ static void __init config_types(void)
                                allowed_drive_mask &= ~(1 << drive);
                } else {
                        params = &default_drive_params[0].params;
-                       sprintf(temparea, "unknown type %d (usb?)", type);
+                       snprintf(temparea, sizeof(temparea),
+                                "unknown type %d (usb?)", type);
                        name = temparea;
                }
                if (name) {