diff options
author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2008-02-08 07:20:48 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:36 -0500 |
commit | 1ed161718a8f763130e6e349f2bbb1b764e6c5b3 (patch) | |
tree | 5bcb9e0c1320f184977345b604449dd7b9bc21f4 /fs/udf/directory.c | |
parent | 934c5e6019758305b9cb1eb977c5eac997cd0180 (diff) |
udf: fix 3 signedness & 1 unitialized variable warnings
sparse generated:
fs/udf/inode.c:324:41: warning: incorrect type in argument 4 (different signedness)
fs/udf/inode.c:324:41: expected long *<noident>
fs/udf/inode.c:324:41: got unsigned long *<noident>
inode_getblk always set 4th argument to uint32_t value
3rd parameter of map_bh is sector_t (which is unsigned long or u64)
so convert phys value to sector_t
fs/udf/inode.c:1818:47: warning: incorrect type in argument 3 (different signedness)
fs/udf/inode.c:1818:47: expected int *<noident>
fs/udf/inode.c:1818:47: got unsigned int *<noident>
fs/udf/inode.c:1826:46: warning: incorrect type in argument 3 (different signedness)
fs/udf/inode.c:1826:46: expected int *<noident>
fs/udf/inode.c:1826:46: got unsigned int *<noident>
udf_get_filelongad and udf_get_shortad are called always for uint32_t
values (struct extent_position->offset), so it's safe to convert offset
parameter to uint32_t
gcc warned:
fs/udf/inode.c: In function 'udf_get_block':
fs/udf/inode.c:299: warning: 'phys' may be used uninitialized in this function
initialize it to 0 (if someday someone will break inode_getblk we will catch it immediately)
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Ben Fennema <bfennema@falcon.csc.calpoly.edu>
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/udf/directory.c')
-rw-r--r-- | fs/udf/directory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/udf/directory.c b/fs/udf/directory.c index d8ceb44f4f22..be16d7698a8c 100644 --- a/fs/udf/directory.c +++ b/fs/udf/directory.c | |||
@@ -282,7 +282,7 @@ static extent_ad *udf_get_fileextent(void *buffer, int bufsize, int *offset) | |||
282 | } | 282 | } |
283 | #endif | 283 | #endif |
284 | 284 | ||
285 | short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, int *offset, | 285 | short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, uint32_t *offset, |
286 | int inc) | 286 | int inc) |
287 | { | 287 | { |
288 | short_ad *sa; | 288 | short_ad *sa; |
@@ -292,7 +292,7 @@ short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, int *offset, | |||
292 | return NULL; | 292 | return NULL; |
293 | } | 293 | } |
294 | 294 | ||
295 | if ((*offset < 0) || ((*offset + sizeof(short_ad)) > maxoffset)) | 295 | if ((*offset + sizeof(short_ad)) > maxoffset) |
296 | return NULL; | 296 | return NULL; |
297 | else { | 297 | else { |
298 | sa = (short_ad *)ptr; | 298 | sa = (short_ad *)ptr; |
@@ -305,7 +305,7 @@ short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, int *offset, | |||
305 | return sa; | 305 | return sa; |
306 | } | 306 | } |
307 | 307 | ||
308 | long_ad *udf_get_filelongad(uint8_t *ptr, int maxoffset, int *offset, int inc) | 308 | long_ad *udf_get_filelongad(uint8_t *ptr, int maxoffset, uint32_t *offset, int inc) |
309 | { | 309 | { |
310 | long_ad *la; | 310 | long_ad *la; |
311 | 311 | ||
@@ -314,7 +314,7 @@ long_ad *udf_get_filelongad(uint8_t *ptr, int maxoffset, int *offset, int inc) | |||
314 | return NULL; | 314 | return NULL; |
315 | } | 315 | } |
316 | 316 | ||
317 | if ((*offset < 0) || ((*offset + sizeof(long_ad)) > maxoffset)) | 317 | if ((*offset + sizeof(long_ad)) > maxoffset) |
318 | return NULL; | 318 | return NULL; |
319 | else { | 319 | else { |
320 | la = (long_ad *)ptr; | 320 | la = (long_ad *)ptr; |