proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-10 20:13:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix return type of read/write utility functions.

Browse Source 
Signed-off-by: Christian Seiler <christian@iwakd.de>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Christian Seiler 2013-05-21 11:58:35 +02:00 committed by Serge Hallyn
parent b93aac46f2
commit 650468bb4a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lxc/utils.c
View File

@ -359,9 +359,9 @@ again:
return status; return status;
} }
int lxc_write_nointr(int fd, const void* buf, size_t count) ssize_t lxc_write_nointr(int fd, const void* buf, size_t count)
{ {
int ret; ssize_t ret;
again: again:
ret = write(fd, buf, count); ret = write(fd, buf, count);
if (ret < 0 && errno == EINTR) if (ret < 0 && errno == EINTR)
@ -369,9 +369,9 @@ again:
return ret; return ret;
} }
int lxc_read_nointr(int fd, void* buf, size_t count) ssize_t lxc_read_nointr(int fd, void* buf, size_t count)
{ {
int ret; ssize_t ret;
again: again:
ret = read(fd, buf, count); ret = read(fd, buf, count);
if (ret < 0 && errno == EINTR) if (ret < 0 && errno == EINTR)
@ -379,13 +379,13 @@ again:
return ret; return ret;
} }
int lxc_read_nointr_expect(int fd, void* buf, size_t count, const void* expected_buf) ssize_t lxc_read_nointr_expect(int fd, void* buf, size_t count, const void* expected_buf)
{ {
int ret; ssize_t ret;
ret = lxc_read_nointr(fd, buf, count); ret = lxc_read_nointr(fd, buf, count);
if (ret <= 0) if (ret <= 0)
return ret; return ret;
if (ret != count) if ((size_t)ret != count)
return -1; return -1;
if (expected_buf && memcmp(buf, expected_buf, count) != 0) { if (expected_buf && memcmp(buf, expected_buf, count) != 0) {
errno = EINVAL; errno = EINVAL;

6
src/lxc/utils.h
View File

@ -173,9 +173,9 @@ extern int wait_for_pid(pid_t pid);
extern int lxc_wait_for_pid_status(pid_t pid); extern int lxc_wait_for_pid_status(pid_t pid);
/* send and receive buffers completely */ /* send and receive buffers completely */
extern int lxc_write_nointr(int fd, const void* buf, size_t count); extern ssize_t lxc_write_nointr(int fd, const void* buf, size_t count);
extern int lxc_read_nointr(int fd, void* buf, size_t count); extern ssize_t lxc_read_nointr(int fd, void* buf, size_t count);
extern int lxc_read_nointr_expect(int fd, void* buf, size_t count, const void* expected_buf); extern ssize_t lxc_read_nointr_expect(int fd, void* buf, size_t count, const void* expected_buf);
#if HAVE_LIBGNUTLS #if HAVE_LIBGNUTLS
#define SHA_DIGEST_LENGTH 20 #define SHA_DIGEST_LENGTH 20
extern int sha1sum_file(char *fnam, unsigned char *md_value); extern int sha1sum_file(char *fnam, unsigned char *md_value);