From b47e2267cfde660406703e56a0bf546053f3744c Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Mon, 27 Apr 2020 10:18:49 -0400 Subject: [PATCH] lib/conf: make INI deprecation less verbose spdk_conf_allocate() was not the best place to put INI deprecation warning. Depending on the application, config could be allocated without passing config file. This resulted in app framework applications to print this error on startup even without config file. Much better place is spdk_conf_read() which requires a file to be passed. Then and only then, deprecation warning is printed with this patch. Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2051 (master) (cherry picked from commit 6395370be136d0b851ba974d63fbda00d4856d8b) Change-Id: I75979655880f9273dfe5ce65262f08934df596cc Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2068 Reviewed-by: Ben Walker Reviewed-by: Seth Howell Reviewed-by: Aleksey Marchuk Tested-by: SPDK CI Jenkins --- lib/conf/conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/conf/conf.c b/lib/conf/conf.c index e9f4b2037..7492bba89 100644 --- a/lib/conf/conf.c +++ b/lib/conf/conf.c @@ -71,7 +71,6 @@ static struct spdk_conf *default_config = NULL; struct spdk_conf * spdk_conf_allocate(void) { - SPDK_ERRLOG("INI configuration has been deprecated and will be removed in a future release. Please switch to JSON-RPC.\n"); return calloc(1, sizeof(struct spdk_conf)); } @@ -611,6 +610,7 @@ spdk_conf_read(struct spdk_conf *cp, const char *file) if (file == NULL || file[0] == '\0') { return -1; } + SPDK_ERRLOG("INI configuration has been deprecated and will be removed in a future release. Please switch to JSON-RPC.\n"); fp = fopen(file, "r"); if (fp == NULL) {