diff options
| author | Jes Sorensen <jsorensen@fb.com> | 2020-04-03 14:09:18 -0400 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2020-05-13 11:07:49 +0300 |
| commit | f34030816d84dfbf52f259404b32b81e53c21fbb (patch) | |
| tree | a0d6ebf85ca5f800aea78b3761c418a14071e705 /lib | |
| parent | 022b48d21092f8a79103fa9318376fb26911e571 (diff) | |
| download | rpm-f34030816d84dfbf52f259404b32b81e53c21fbb.tar.gz | |
rpmfiArchiveRead() use signed return value to handle -1 on error
size_t is unsigned, so returning -1 is not going to have the expected
behavior. Fix it to return ssize_t.
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rpmarchive.h | 4 | ||||
| -rw-r--r-- | lib/rpmfi.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/rpmarchive.h b/lib/rpmarchive.h index c864e5b56..2484b4d71 100644 --- a/lib/rpmarchive.h +++ b/lib/rpmarchive.h @@ -122,9 +122,9 @@ int rpmfiArchiveWriteFile(rpmfi fi, FD_t fd); * @param fi file info * @param buf pointer to buffer * @param size number of bytes to read - * @return bytes actually read + * @return bytes actually read, -1 on error */ -size_t rpmfiArchiveRead(rpmfi fi, void * buf, size_t size); +ssize_t rpmfiArchiveRead(rpmfi fi, void * buf, size_t size); /** \ingroup payload * Has current file content stored in the archive diff --git a/lib/rpmfi.c b/lib/rpmfi.c index c314a8b29..af428468c 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -2261,7 +2261,7 @@ int rpmfiArchiveHasContent(rpmfi fi) return res; } -size_t rpmfiArchiveRead(rpmfi fi, void * buf, size_t size) +ssize_t rpmfiArchiveRead(rpmfi fi, void * buf, size_t size) { if (fi == NULL || fi->archive == NULL) return -1; |