diff options
author | Anton Salikhmetov <alexo@tuxera.com> | 2010-12-16 11:08:38 -0500 |
---|---|---|
committer | Christoph Hellwig <hch@tuxera.com> | 2010-12-16 12:08:45 -0500 |
commit | 2753cc281c9a0e8a0a45ee2b8110866a9fe63bdd (patch) | |
tree | d28794ef990637cfcd734a8b467f119e6d69dac1 /fs/hfsplus/unicode.c | |
parent | 596276c3571e2108f4b336be545ece2eacf3da59 (diff) |
hfsplus: over 80 character lines clean-up
Match coding style line length limitation where checkpatch.pl
reported over-80-character-line warnings.
Signed-off-by: Anton Salikhmetov <alexo@tuxera.com>
Signed-off-by: Christoph Hellwig <hch@tuxera.com>
Diffstat (limited to 'fs/hfsplus/unicode.c')
-rw-r--r-- | fs/hfsplus/unicode.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/fs/hfsplus/unicode.c b/fs/hfsplus/unicode.c index b66d67de882c..15703e81174e 100644 --- a/fs/hfsplus/unicode.c +++ b/fs/hfsplus/unicode.c | |||
@@ -118,7 +118,9 @@ static u16 *hfsplus_compose_lookup(u16 *p, u16 cc) | |||
118 | return NULL; | 118 | return NULL; |
119 | } | 119 | } |
120 | 120 | ||
121 | int hfsplus_uni2asc(struct super_block *sb, const struct hfsplus_unistr *ustr, char *astr, int *len_p) | 121 | int hfsplus_uni2asc(struct super_block *sb, |
122 | const struct hfsplus_unistr *ustr, | ||
123 | char *astr, int *len_p) | ||
122 | { | 124 | { |
123 | const hfsplus_unichr *ip; | 125 | const hfsplus_unichr *ip; |
124 | struct nls_table *nls = HFSPLUS_SB(sb)->nls; | 126 | struct nls_table *nls = HFSPLUS_SB(sb)->nls; |
@@ -171,7 +173,8 @@ int hfsplus_uni2asc(struct super_block *sb, const struct hfsplus_unistr *ustr, c | |||
171 | goto same; | 173 | goto same; |
172 | c1 = be16_to_cpu(*ip); | 174 | c1 = be16_to_cpu(*ip); |
173 | if (likely(compose)) | 175 | if (likely(compose)) |
174 | ce1 = hfsplus_compose_lookup(hfsplus_compose_table, c1); | 176 | ce1 = hfsplus_compose_lookup( |
177 | hfsplus_compose_table, c1); | ||
175 | if (ce1) | 178 | if (ce1) |
176 | break; | 179 | break; |
177 | switch (c0) { | 180 | switch (c0) { |
@@ -199,7 +202,8 @@ int hfsplus_uni2asc(struct super_block *sb, const struct hfsplus_unistr *ustr, c | |||
199 | if (ce2) { | 202 | if (ce2) { |
200 | i = 1; | 203 | i = 1; |
201 | while (i < ustrlen) { | 204 | while (i < ustrlen) { |
202 | ce1 = hfsplus_compose_lookup(ce2, be16_to_cpu(ip[i])); | 205 | ce1 = hfsplus_compose_lookup(ce2, |
206 | be16_to_cpu(ip[i])); | ||
203 | if (!ce1) | 207 | if (!ce1) |
204 | break; | 208 | break; |
205 | i++; | 209 | i++; |
@@ -363,7 +367,8 @@ int hfsplus_hash_dentry(struct dentry *dentry, struct qstr *str) | |||
363 | * Composed unicode characters are decomposed and case-folding is performed | 367 | * Composed unicode characters are decomposed and case-folding is performed |
364 | * if the appropriate bits are (un)set on the superblock. | 368 | * if the appropriate bits are (un)set on the superblock. |
365 | */ | 369 | */ |
366 | int hfsplus_compare_dentry(struct dentry *dentry, struct qstr *s1, struct qstr *s2) | 370 | int hfsplus_compare_dentry(struct dentry *dentry, |
371 | struct qstr *s1, struct qstr *s2) | ||
367 | { | 372 | { |
368 | struct super_block *sb = dentry->d_sb; | 373 | struct super_block *sb = dentry->d_sb; |
369 | int casefold, decompose, size; | 374 | int casefold, decompose, size; |
@@ -388,7 +393,9 @@ int hfsplus_compare_dentry(struct dentry *dentry, struct qstr *s1, struct qstr * | |||
388 | astr1 += size; | 393 | astr1 += size; |
389 | len1 -= size; | 394 | len1 -= size; |
390 | 395 | ||
391 | if (!decompose || !(dstr1 = decompose_unichar(c, &dsize1))) { | 396 | if (decompose) |
397 | dstr1 = decompose_unichar(c, &dsize1); | ||
398 | if (!decompose || !dstr1) { | ||
392 | c1 = c; | 399 | c1 = c; |
393 | dstr1 = &c1; | 400 | dstr1 = &c1; |
394 | dsize1 = 1; | 401 | dsize1 = 1; |
@@ -400,7 +407,9 @@ int hfsplus_compare_dentry(struct dentry *dentry, struct qstr *s1, struct qstr * | |||
400 | astr2 += size; | 407 | astr2 += size; |
401 | len2 -= size; | 408 | len2 -= size; |
402 | 409 | ||
403 | if (!decompose || !(dstr2 = decompose_unichar(c, &dsize2))) { | 410 | if (decompose) |
411 | dstr2 = decompose_unichar(c, &dsize2); | ||
412 | if (!decompose || !dstr2) { | ||
404 | c2 = c; | 413 | c2 = c; |
405 | dstr2 = &c2; | 414 | dstr2 = &c2; |
406 | dsize2 = 1; | 415 | dsize2 = 1; |