Skip to content

Commit

Permalink
Documentation: freefall: simplify pathnames
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pavel Machek authored and Linus Torvalds committed Aug 9, 2014
1 parent efe4a77 commit d74aae4
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions Documentation/laptops/freefall.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit d74aae4

Please sign in to comment.