53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
From 26f8126da02bd2d6bd099ab53988a8d1d6fa69e0 Mon Sep 17 00:00:00 2001
|
|
From: liuxu <liuxu156@huawei.com>
|
|
Date: Wed, 15 Nov 2023 03:30:07 +0000
|
|
Subject: [PATCH 10/11] !51 version:support cni_version_info * version:support
|
|
cni_version_info
|
|
|
|
---
|
|
src/version/version.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/version/version.c b/src/version/version.c
|
|
index 058e30f..891f00f 100644
|
|
--- a/src/version/version.c
|
|
+++ b/src/version/version.c
|
|
@@ -20,7 +20,7 @@
|
|
|
|
#include "version.h"
|
|
#include "utils.h"
|
|
-#include "isula_libutils/cni_version.h"
|
|
+#include "isula_libutils/cni_version_info.h"
|
|
#include "isula_libutils/cni_inner_plugin_info.h"
|
|
#include "types.h"
|
|
#include "current.h"
|
|
@@ -161,14 +161,14 @@ out:
|
|
char *cniversion_decode(const char *jsonstr, char **errmsg)
|
|
{
|
|
parser_error err = NULL;
|
|
- cni_version *conf = NULL;
|
|
+ cni_version_info *conf = NULL;
|
|
char *result = NULL;
|
|
int nret = 0;
|
|
|
|
if (errmsg == NULL) {
|
|
return NULL;
|
|
}
|
|
- conf = cni_version_parse_data(jsonstr, NULL, &err);
|
|
+ conf = cni_version_info_parse_data(jsonstr, NULL, &err);
|
|
if (conf == NULL) {
|
|
nret = asprintf(errmsg, "decoding config \"%s\", failed: %s", jsonstr, err);
|
|
if (nret < 0) {
|
|
@@ -185,7 +185,7 @@ char *cniversion_decode(const char *jsonstr, char **errmsg)
|
|
result = clibcni_util_strdup_s(conf->cni_version);
|
|
out:
|
|
free(err);
|
|
- free_cni_version(conf);
|
|
+ free_cni_version_info(conf);
|
|
return result;
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|