summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2014-08-05 23:32:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-09 09:13:40 -0700
commitd74aae4ea0257f3d6e94ef7a0420ef5074d6eb1e (patch)
tree63fc66293d491d13053bf59573eb200063f9a11c
parentefe4a772215869e780e69d0037dca50e34aee6a7 (diff)
downloadlinux-d74aae4ea0257f3d6e94ef7a0420ef5074d6eb1e.tar.bz2
Documentation: freefall: simplify pathnames
Copying to local variable is actually not neccessary, if all we need to do is snprintf(). This also removes problem where devname could be missing zero termination. Reported-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Documentation/laptops/freefall.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/Documentation/laptops/freefall.c b/Documentation/laptops/freefall.c
index d4173186555c..5e44b20b1848 100644
--- a/Documentation/laptops/freefall.c
+++ b/Documentation/laptops/freefall.c
@@ -29,16 +29,12 @@ static const char app_name[] = "FREE FALL";
static int set_unload_heads_path(char *device)
{
- char devname[64];
-
if (strlen(device) <= 5 || strncmp(device, "/dev/", 5) != 0)
return -EINVAL;
- strncpy(devname, device + 5, sizeof(devname) - 1);
- devname[sizeof(devname) - 1] = '\0';
strncpy(device_path, device, sizeof(device_path) - 1);
snprintf(unload_heads_path, sizeof(unload_heads_path) - 1,
- "/sys/block/%s/device/unload_heads", devname);
+ "/sys/block/%s/device/unload_heads", device+5);
return 0;
}