summaryrefslogtreecommitdiffstats
path: root/fs/udf/unicode.c
diff options
context:
space:
mode:
authorAndrew Gabbasov <andrew_gabbasov@mentor.com>2016-01-15 03:44:19 -0500
committerJan Kara <jack@suse.cz>2016-02-09 07:05:23 -0500
commit525e2c56c341cb8b31bbe1694f0582077f454969 (patch)
treebc3abd9e1f07f0e4322d290fac0fcac90a38d63e /fs/udf/unicode.c
parent7955118eafc4a2621fd88e92b505919af344583f (diff)
udf: Parameterize output length in udf_put_filename
Make the desired output length a parameter rather than have it hard-coded to UDF_NAME_LEN. Although all call sites still have this length the same, this parameterization will make the function more universal and also consistent with udf_get_filename. Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/unicode.c')
-rw-r--r--fs/udf/unicode.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c
index e788a05aab83..47e61883275d 100644
--- a/fs/udf/unicode.c
+++ b/fs/udf/unicode.c
@@ -395,22 +395,22 @@ out1:
395 return ret; 395 return ret;
396} 396}
397 397
398int udf_put_filename(struct super_block *sb, const uint8_t *sname, 398int udf_put_filename(struct super_block *sb, const uint8_t *sname, int slen,
399 uint8_t *dname, int flen) 399 uint8_t *dname, int dlen)
400{ 400{
401 struct ustr unifilename; 401 struct ustr unifilename;
402 int namelen; 402 int namelen;
403 403
404 if (!udf_char_to_ustr(&unifilename, sname, flen)) 404 if (!udf_char_to_ustr(&unifilename, sname, slen))
405 return 0; 405 return 0;
406 406
407 if (UDF_QUERY_FLAG(sb, UDF_FLAG_UTF8)) { 407 if (UDF_QUERY_FLAG(sb, UDF_FLAG_UTF8)) {
408 namelen = udf_UTF8toCS0(dname, &unifilename, UDF_NAME_LEN); 408 namelen = udf_UTF8toCS0(dname, &unifilename, dlen);
409 if (!namelen) 409 if (!namelen)
410 return 0; 410 return 0;
411 } else if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP)) { 411 } else if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP)) {
412 namelen = udf_NLStoCS0(UDF_SB(sb)->s_nls_map, dname, 412 namelen = udf_NLStoCS0(UDF_SB(sb)->s_nls_map, dname,
413 &unifilename, UDF_NAME_LEN); 413 &unifilename, dlen);
414 if (!namelen) 414 if (!namelen)
415 return 0; 415 return 0;
416 } else 416 } else