lxc/0102-lxc-fix-compile-warnings.patch

85 lines
2.4 KiB
Diff
Raw Normal View History

2019-12-25 15:57:42 +08:00
From 7fbfd6a0e45744d9f779da857ddcf82e5eb92a30 Mon Sep 17 00:00:00 2001
2019-09-30 11:03:07 -04:00
From: LiFeng <lifeng68@huawei.com>
Date: Mon, 3 Jun 2019 06:19:07 -0400
2019-12-25 15:57:42 +08:00
Subject: [PATCH 102/131] lxc: fix compile warnings
2019-09-30 11:03:07 -04:00
Signed-off-by: LiFeng <lifeng68@huawei.com>
---
src/lxc/conf.c | 1 -
src/lxc/path.c | 5 -----
src/lxc/utils.c | 2 +-
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
2019-12-25 15:57:42 +08:00
index ec1667d4..e7df3363 100644
2019-09-30 11:03:07 -04:00
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -4992,7 +4992,6 @@ int run_lxc_hooks(const char *name, char *hookname, struct lxc_conf *conf,
int run_oci_hooks(const char *name, char *hookname, struct lxc_conf *conf, const char *lxcpath)
{
- struct lxc_list *it;
int which = -1;
if (strcmp(hookname, "oci-prestart") == 0) {
diff --git a/src/lxc/path.c b/src/lxc/path.c
2019-12-25 15:57:42 +08:00
index 45ab4c3b..92692dea 100644
2019-09-30 11:03:07 -04:00
--- a/src/lxc/path.c
+++ b/src/lxc/path.c
@@ -141,7 +141,6 @@ int do_clean_path(const char *respath, const char *limit_respath,
{
char *dest = *dst;
const char *endpos = NULL;
- errno_t ret;
for (endpos = stpos; *stpos; stpos = endpos) {
while (ISSLASH(*stpos)) {
@@ -184,7 +183,6 @@ char *cleanpath(const char *path, char *realpath, size_t realpath_len)
char *dest = NULL;
const char *stpos = NULL;
const char *limit_respath = NULL;
- errno_t ret;
if (path == NULL || path[0] == '\0' || \
realpath == NULL || (realpath_len < PATH_MAX)) {
@@ -293,7 +291,6 @@ static int do_get_symlinks(const char **fullpath, const char *prefix, size_t pre
{
char *buf = NULL;
size_t len;
- errno_t rc = EOK;
ssize_t n;
int ret = -1;
@@ -398,7 +395,6 @@ static int do_eval_symlinks_in_scope(const char *fullpath, const char *prefix,
const char *start = NULL;
const char *end = NULL;
char *extra_buf = NULL;
- errno_t rc = EOK;
int nret = 0;
int num_links = 0;
@@ -450,7 +446,6 @@ static char *eval_symlinks_in_scope(const char *fullpath, const char *rootpath)
char *prefix = NULL;
const char *rpath_limit = NULL;
size_t prefix_len;
- errno_t rc = EOK;
if (fullpath == NULL || rootpath == NULL) {
return NULL;
diff --git a/src/lxc/utils.c b/src/lxc/utils.c
2019-12-25 15:57:42 +08:00
index 9ce24739..e6749471 100644
2019-09-30 11:03:07 -04:00
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -2106,7 +2106,7 @@ void *lxc_common_calloc_s(size_t size)
int lxc_mem_realloc(void **newptr, size_t newsize, void *oldptr, size_t oldsize)
{
void *tmp = NULL;
- int nret = 0;
+
if (newsize == 0) {
goto err_out;
}
--
2019-12-25 15:57:42 +08:00
2.23.0
2019-09-30 11:03:07 -04:00