41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
|
From 1912d374c6fbabc9ac549011cd863c28ee1a55fa Mon Sep 17 00:00:00 2001
|
||
|
|
From: wujing <wujing50@huawei.com>
|
||
|
|
Date: Thu, 24 Dec 2020 11:23:01 +0800
|
||
|
|
Subject: [PATCH 3/3] avoid using void pointers in caclulation
|
||
|
|
|
||
|
|
Signed-off-by: wujing <wujing50@huawei.com>
|
||
|
|
---
|
||
|
|
src/lxc/file_utils.c | 2 +-
|
||
|
|
src/lxc/file_utils.h | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c
|
||
|
|
index 2dbbbd3b..681207b2 100644
|
||
|
|
--- a/src/lxc/file_utils.c
|
||
|
|
+++ b/src/lxc/file_utils.c
|
||
|
|
@@ -123,7 +123,7 @@ int lxc_read_from_file(const char *filename, void *buf, size_t count)
|
||
|
|
}
|
||
|
|
|
||
|
|
#ifdef HAVE_ISULAD
|
||
|
|
-ssize_t lxc_write_nointr_for_fifo(int fd, const void *buf, size_t count)
|
||
|
|
+ssize_t lxc_write_nointr_for_fifo(int fd, const char *buf, size_t count)
|
||
|
|
{
|
||
|
|
ssize_t nret = 0;
|
||
|
|
ssize_t nwritten;
|
||
|
|
diff --git a/src/lxc/file_utils.h b/src/lxc/file_utils.h
|
||
|
|
index 29162b3f..cb959bfb 100644
|
||
|
|
--- a/src/lxc/file_utils.h
|
||
|
|
+++ b/src/lxc/file_utils.h
|
||
|
|
@@ -59,7 +59,7 @@ extern FILE *fopen_cached(const char *path, const char *mode,
|
||
|
|
void **caller_freed_buffer);
|
||
|
|
|
||
|
|
#ifdef HAVE_ISULAD
|
||
|
|
-extern ssize_t lxc_write_nointr_for_fifo(int fd, const void *buf, size_t count);
|
||
|
|
+extern ssize_t lxc_write_nointr_for_fifo(int fd, const char *buf, size_t count);
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#endif /* __LXC_FILE_UTILS_H */
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|