summaryrefslogtreecommitdiff
path: root/fs/udf
diff options
context:
space:
mode:
authormarcin.slusarz@gmail.com <marcin.slusarz@gmail.com>2008-02-27 22:38:36 +0100
committerJan Kara <jack@suse.cz>2008-04-17 14:22:24 +0200
commit34f953ddfd15da8feb5b8383c93c35dc57202b66 (patch)
treeb8876b683dc975327cc51fb3d1019aa5f4ebeb7c /fs/udf
parent6305a0a9d559e97807b8bc6d5250fd525dc571a7 (diff)
downloadlinux-3.10-34f953ddfd15da8feb5b8383c93c35dc57202b66.tar.gz
linux-3.10-34f953ddfd15da8feb5b8383c93c35dc57202b66.tar.bz2
linux-3.10-34f953ddfd15da8feb5b8383c93c35dc57202b66.zip
udf: udf_CS0toNLS cleanup
- fix error handling - always zero output variable - don't zero explicitely fields zeroed by memset - mark "in" paramater as const Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf')
-rw-r--r--fs/udf/unicode.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c
index 24d6165d21a..f5872ae325a 100644
--- a/fs/udf/unicode.c
+++ b/fs/udf/unicode.c
@@ -249,35 +249,32 @@ error_out:
}
static int udf_CS0toNLS(struct nls_table *nls, struct ustr *utf_o,
- struct ustr *ocu_i)
+ const struct ustr *ocu_i)
{
- uint8_t *ocu;
- uint32_t c;
+ const uint8_t *ocu;
uint8_t cmp_id, ocu_len;
int i;
- ocu = ocu_i->u_name;
ocu_len = ocu_i->u_len;
- cmp_id = ocu_i->u_cmpID;
- utf_o->u_len = 0;
-
if (ocu_len == 0) {
memset(utf_o, 0, sizeof(struct ustr));
- utf_o->u_cmpID = 0;
- utf_o->u_len = 0;
return 0;
}
- if ((cmp_id != 8) && (cmp_id != 16)) {
+ cmp_id = ocu_i->u_cmpID;
+ if (cmp_id != 8 && cmp_id != 16) {
+ memset(utf_o, 0, sizeof(struct ustr));
printk(KERN_ERR "udf: unknown compression code (%d) stri=%s\n",
cmp_id, ocu_i->u_name);
return 0;
}
+ ocu = ocu_i->u_name;
+ utf_o->u_len = 0;
for (i = 0; (i < ocu_len) && (utf_o->u_len <= (UDF_NAME_LEN - 3));) {
/* Expand OSTA compressed Unicode to Unicode */
- c = ocu[i++];
+ uint32_t c = ocu[i++];
if (cmp_id == 16)
c = (c << 8) | ocu[i++];