diff options
author | Maciej Wereski <m.wereski@partner.samsung.com> | 2014-01-15 16:15:00 +0100 |
---|---|---|
committer | Maciej Wereski <m.wereski@partner.samsung.com> | 2014-01-15 16:15:00 +0100 |
commit | bcca19a055cbdb0d67985ac08fef491f6d4bb42b (patch) | |
tree | 1d49ec65d242cf1dec494570622b3737aef06a03 /libcap/cap_extint.c | |
parent | b138da4a4b9d57b850ca4d0061969f5e3299861d (diff) | |
download | libcap-bcca19a055cbdb0d67985ac08fef491f6d4bb42b.tar.gz libcap-bcca19a055cbdb0d67985ac08fef491f6d4bb42b.tar.bz2 libcap-bcca19a055cbdb0d67985ac08fef491f6d4bb42b.zip |
Imported Upstream version 2.24upstream/2.24
Diffstat (limited to 'libcap/cap_extint.c')
-rw-r--r-- | libcap/cap_extint.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libcap/cap_extint.c b/libcap/cap_extint.c index 5a0cc8e..7d6e7ad 100644 --- a/libcap/cap_extint.c +++ b/libcap/cap_extint.c @@ -31,7 +31,7 @@ struct cap_ext_struct { ssize_t cap_size(cap_t caps) { - return sizeof(struct cap_ext_struct); + return ssizeof(struct cap_ext_struct); } /* @@ -46,7 +46,7 @@ ssize_t cap_copy_ext(void *cap_ext, cap_t cap_d, ssize_t length) int i; /* valid arguments? */ - if (!good_cap_t(cap_d) || length < sizeof(struct cap_ext_struct) + if (!good_cap_t(cap_d) || length < ssizeof(struct cap_ext_struct) || cap_ext == NULL) { errno = EINVAL; return -1; @@ -57,7 +57,7 @@ ssize_t cap_copy_ext(void *cap_ext, cap_t cap_d, ssize_t length) result->length_of_capset = CAP_SET_SIZE; for (i=0; i<NUMBER_OF_CAP_SETS; ++i) { - int j; + size_t j; for (j=0; j<CAP_SET_SIZE; ) { __u32 val; @@ -71,7 +71,7 @@ ssize_t cap_copy_ext(void *cap_ext, cap_t cap_d, ssize_t length) } /* All done: return length of external representation */ - return (sizeof(struct cap_ext_struct)); + return (ssizeof(struct cap_ext_struct)); } /* @@ -99,7 +99,7 @@ cap_t cap_copy_int(const void *cap_ext) blen = export->length_of_capset; for (set=0; set<NUMBER_OF_CAP_SETS; ++set) { - int blk; + unsigned blk; int bno = 0; for (blk=0; blk<(CAP_SET_SIZE/sizeof(__u32)); ++blk) { __u32 val = 0; |