Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cb103b6 authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

fs/befs/btree.c: replace strncpy by strlcpy + coding style fixing 



- strncpy + end of string assignement replaced by strlcpy

- Fix endif };

- Fix typo

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 39d7a29f

fs/befs/btree.c

+3 −4
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ befs_find_key(struct super_block *sb, befs_btree_node * node, 
 * Heres how it works: Key_no is the index of the key/value pair to 

 * return in keybuf/value.

 * Bufsize is the size of keybuf (BEFS_NAME_LEN+1 is a good size). Keysize is 

 * the number of charecters in the key (just a convenience).

 * the number of characters in the key (just a convenience).

 *

 * Algorithm:

 *   Get the first leafnode of the tree. See if the requested key is in that
@@ -502,12 +502,11 @@ befs_btree_read(struct super_block *sb, befs_data_stream * ds, 
			   "for key of size %d", __func__, bufsize, keylen);

		brelse(this_node->bh);

		goto error_alloc;

	};

	}



	strncpy(keybuf, keystart, keylen);

	strlcpy(keybuf, keystart, keylen + 1);

	*value = fs64_to_cpu(sb, valarray[cur_key]);

	*keysize = keylen;

	keybuf[keylen] = '\0';



	befs_debug(sb, "Read [%llu,%d]: Key \"%.*s\", Value %llu", node_off,

		   cur_key, keylen, keybuf, *value);