d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid casting from (int *) to (size_t *) in order to fix udf_iconv on amd64.

Browse Source 
Reviewed by:	scottl
MFC after:	2 weeks
This commit is contained in:
R. Imura 2005-06-05 02:09:48 +00:00
parent b8eb1eccee
commit 181fc3c6ea
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/fs/udf/udf_vnops.c
View File

@ -373,7 +373,8 @@ udf_transname(char *cs0string, char *destname, int len, struct udf_mnt *udfmp)
{
unicode_t *transname;
char *unibuf, *unip;
int i, unilen = 0, destlen;
int i, destlen;
ssize_t unilen = 0;
size_t destleft = MAXNAMLEN;
/* Convert 16-bit Unicode to destname */
@ -381,7 +382,7 @@ udf_transname(char *cs0string, char *destname, int len, struct udf_mnt *udfmp)
/* allocate a buffer big enough to hold an 8->16 bit expansion */
unibuf = uma_zalloc(udf_zone_trans, M_WAITOK);
unip = unibuf;
if ((unilen = udf_UncompressUnicodeByte(len, cs0string, unibuf)) == -1) {
if ((unilen = (ssize_t)udf_UncompressUnicodeByte(len, cs0string, unibuf)) == -1) {
printf("udf: Unicode translation failed\n");
uma_zfree(udf_zone_trans, unibuf);
return 0;
@ -405,7 +406,7 @@ udf_transname(char *cs0string, char *destname, int len, struct udf_mnt *udfmp)
/* allocate a buffer big enough to hold an 8->16 bit expansion */
transname = uma_zalloc(udf_zone_trans, M_WAITOK);
if ((unilen = udf_UncompressUnicode(len, cs0string, transname)) == -1) {
if ((unilen = (ssize_t)udf_UncompressUnicode(len, cs0string, transname)) == -1) {
printf("udf: Unicode translation failed\n");
uma_zfree(udf_zone_trans, transname);
return 0;
@ -420,7 +421,7 @@ udf_transname(char *cs0string, char *destname, int len, struct udf_mnt *udfmp)
}
uma_zfree(udf_zone_trans, transname);
destname[unilen] = 0;
destlen = unilen;
destlen = (int)unilen;
}
return (destlen);