All of lore.kernel.org
 help / color / mirror / Atom feed
From: Allain Legacy <allain.legacy@windriver.com>
To: <bruce.richardson@intel.com>, <cristian.dumitrescu@intel.com>
Cc: <yuanhan.liu@linux.intel.com>, <dev@dpdk.org>
Subject: [PATCH v2 6/6] cfgfile: add support for empty value string
Date: Thu, 9 Mar 2017 08:11:00 -0500	[thread overview]
Message-ID: <1489065060-98370-7-git-send-email-allain.legacy@windriver.com> (raw)
In-Reply-To: <1489065060-98370-1-git-send-email-allain.legacy@windriver.com>

This commit adds support to the cfgfile library for parsing a key=value
line that has no value string specified (e.g., "key=").  This can be used
to override a configuration attribute that has a default value or default
list of values to set it back to an undefined value to disable
functionality.

Signed-off-by: Allain Legacy <allain.legacy@windriver.com>
---
 lib/librte_cfgfile/rte_cfgfile.c        | 11 ++++++-----
 test/test/test_cfgfile.c                | 17 +----------------
 test/test/test_cfgfiles/etc/sample1.ini |  2 +-
 test/test/test_cfgfiles/etc/sample2.ini |  2 +-
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/librte_cfgfile/rte_cfgfile.c
index 35c81e4..d3022b9 100644
--- a/lib/librte_cfgfile/rte_cfgfile.c
+++ b/lib/librte_cfgfile/rte_cfgfile.c
@@ -219,11 +219,12 @@ struct rte_cfgfile *
 
 			struct rte_cfgfile_section *sect =
 				cfg->sections[curr_section];
-			char *split[2];
-			if (rte_strsplit(buffer, sizeof(buffer), split, 2, '=')
-				!= 2) {
+			int n;
+			char *split[2] = {NULL};
+			n = rte_strsplit(buffer, sizeof(buffer), split, 2, '=');
+			if ((n < 1) || (n > 2)) {
 				printf("Error at line %d - cannot split "
-					"string\n", lineno);
+				       "string, n=%d\n", lineno, n);
 				goto error1;
 			}
 
@@ -254,7 +255,7 @@ struct rte_cfgfile *
 			snprintf(entry->name, sizeof(entry->name), "%s",
 				split[0]);
 			snprintf(entry->value, sizeof(entry->value), "%s",
-				split[1]);
+				 split[1] ? split[1] : "");
 			_strip(entry->name, strnlen(entry->name,
 				sizeof(entry->name)));
 			_strip(entry->value, strnlen(entry->value,
diff --git a/test/test/test_cfgfile.c b/test/test/test_cfgfile.c
index eab8ccc..d8214d1 100644
--- a/test/test/test_cfgfile.c
+++ b/test/test/test_cfgfile.c
@@ -105,8 +105,7 @@
 		    "key2 unexpected value: %s", value);
 
 	value = rte_cfgfile_get_entry(cfgfile, "section2", "key3");
-	TEST_ASSERT(strcmp("value3", value) == 0,
-		    "key3 unexpected value: %s", value);
+	TEST_ASSERT(strlen(value) == 0, "key3 unexpected value: %s", value);
 
 	return 0;
 }
@@ -167,17 +166,6 @@
 }
 
 static int
-test_cfgfile_invalid_key_value_pair(void)
-{
-	struct rte_cfgfile *cfgfile;
-
-	cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/invalid_key_value.ini", 0);
-	TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur");
-
-	return 0;
-}
-
-static int
 test_cfgfile_missing_section(void)
 {
 	struct rte_cfgfile *cfgfile;
@@ -251,9 +239,6 @@
 	if (test_cfgfile_invalid_section_header())
 		return -1;
 
-	if (test_cfgfile_invalid_key_value_pair())
-		return -1;
-
 	if (test_cfgfile_missing_section())
 		return -1;
 
diff --git a/test/test/test_cfgfiles/etc/sample1.ini b/test/test/test_cfgfiles/etc/sample1.ini
index aef91c2..5b001d3 100644
--- a/test/test/test_cfgfiles/etc/sample1.ini
+++ b/test/test/test_cfgfiles/etc/sample1.ini
@@ -8,5 +8,5 @@ key1=value1
 ; this is section 2
 ;key1=value1
 key2=value2
-key3=value3 ; this is key3
+key3= ; this is key3
 ignore-missing-separator
diff --git a/test/test/test_cfgfiles/etc/sample2.ini b/test/test/test_cfgfiles/etc/sample2.ini
index 21075e9..8fee5a7 100644
--- a/test/test/test_cfgfiles/etc/sample2.ini
+++ b/test/test/test_cfgfiles/etc/sample2.ini
@@ -8,5 +8,5 @@ key1=value1
 # this is section 2
 #key1=value1
 key2=value2
-key3=value3 # this is key3
+key3= # this is key3
 ignore-missing-separator
-- 
1.8.3.1

  parent reply	other threads:[~2017-03-09 13:11 UTC|newest]

Thread overview: 81+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-02 19:29 [PATCH 0/5] librte_cfgfile enhancement Allain Legacy
2017-03-02 19:29 ` [PATCH 1/5] cfgfile: configurable comment character Allain Legacy
2017-03-02 21:10   ` Bruce Richardson
2017-03-02 21:22     ` Legacy, Allain
2017-03-03  0:53     ` Yuanhan Liu
2017-03-03 11:17       ` Dumitrescu, Cristian
2017-03-03 11:31         ` Legacy, Allain
2017-03-03 12:07           ` Dumitrescu, Cristian
2017-03-03 12:14             ` Legacy, Allain
2017-03-03 12:17               ` Dumitrescu, Cristian
2017-03-03 12:18                 ` Legacy, Allain
2017-03-03 12:52                   ` Dumitrescu, Cristian
2017-03-03 12:10           ` Bruce Richardson
2017-03-03 12:17             ` Legacy, Allain
2017-03-03 13:10               ` Bruce Richardson
2017-03-02 19:29 ` [PATCH 2/5] cfgfile: cfg object not initialized after allocation Allain Legacy
2017-03-02 19:29 ` [PATCH 3/5] cfgfile: add support for unamed global section Allain Legacy
2017-03-03 10:53   ` Dumitrescu, Cristian
2017-03-03 11:03     ` Legacy, Allain
2017-03-03 11:06       ` Dumitrescu, Cristian
2017-03-03 11:15         ` Legacy, Allain
2017-03-03 11:18           ` Dumitrescu, Cristian
2017-03-02 19:29 ` [PATCH 4/5] cfgfile: use strnlen to constrain memchr search Allain Legacy
2017-03-02 19:29 ` [PATCH 5/5] cfgfile: increase local buffer size for max name and value Allain Legacy
2017-03-09 13:46   ` Wiles, Keith
2017-03-09 15:16     ` Legacy, Allain
2017-03-09 15:23       ` Wiles, Keith
2017-03-09 13:10 ` [PATCH v2 0/6] librte_cfgfile enhancements Allain Legacy
2017-03-09 13:10   ` [PATCH v2 1/6] test: basic unit tests for cfgfile Allain Legacy
2017-03-09 13:10   ` [PATCH v2 2/6] cfgfile: add support for unamed global section Allain Legacy
2017-03-09 13:10   ` [PATCH v2 3/6] cfgfile: configurable comment character Allain Legacy
2017-03-27 11:19     ` Dumitrescu, Cristian
2017-03-09 13:10   ` [PATCH v2 4/6] cfgfile: use strnlen to constrain memchr search Allain Legacy
2017-03-09 13:10   ` [PATCH v2 5/6] cfgfile: increase local buffer size for max name and value Allain Legacy
2017-03-09 13:11   ` Allain Legacy [this message]
2017-03-27 10:54     ` [PATCH v2 6/6] cfgfile: add support for empty value string Dumitrescu, Cristian
2017-03-27 11:12       ` Legacy, Allain
2017-03-27 11:24         ` Dumitrescu, Cristian
2017-03-27 11:15       ` Legacy, Allain
2017-03-28  8:29   ` [PATCH v2 0/6] librte_cfgfile enhancements Thomas Monjalon
2017-03-28  9:18     ` Bruce Richardson
2017-03-28  9:22       ` Bruce Richardson
2017-03-28  9:41         ` Thomas Monjalon
2017-03-28  9:58           ` Dumitrescu, Cristian
2017-03-28 10:12             ` Thomas Monjalon
2017-03-28 10:20               ` Dumitrescu, Cristian
2017-03-28 15:24               ` Bruce Richardson
2017-03-28 15:41                 ` Thomas Monjalon
2017-03-28 15:42                   ` Bruce Richardson
2017-03-28 16:44   ` [PATCH v3 " Allain Legacy
2017-03-28 16:44     ` [PATCH v3 1/6] test: basic unit tests for cfgfile Allain Legacy
2017-03-28 16:44     ` [PATCH v3 3/6] cfgfile: add support for configurable comment character Allain Legacy
2017-03-28 16:44     ` [PATCH v3 4/6] cfgfile: use strnlen to constrain memchr search Allain Legacy
2017-03-28 16:44     ` [PATCH v3 6/6] cfgfile: add support for empty value string Allain Legacy
2017-03-30 18:54     ` [PATCH v4 0/6] librte_cfgfile enhancements Allain Legacy
2017-03-30 18:54       ` [PATCH v4 1/6] test: basic unit tests for cfgfile Allain Legacy
2017-03-30 18:54       ` [PATCH v4 2/6] cfgfile: add support for global properties section Allain Legacy
2017-03-30 18:54       ` [PATCH v4 3/6] cfgfile: add support for configurable comment character Allain Legacy
2017-03-31 10:08         ` Thomas Monjalon
2017-03-31 11:08           ` Legacy, Allain
2017-03-30 18:54       ` [PATCH v4 4/6] cfgfile: use strnlen to constrain memchr search Allain Legacy
2017-03-30 18:54       ` [PATCH v4 5/6] cfgfile: increase local buffer size for max name and value Allain Legacy
2017-03-30 18:54       ` [PATCH v4 6/6] cfgfile: add support for empty value string Allain Legacy
2017-03-31  8:57       ` [PATCH v4 0/6] librte_cfgfile enhancements Dumitrescu, Cristian
2017-03-31 13:51       ` [PATCH v5 " Allain Legacy
2017-03-31 13:51         ` [PATCH v5 1/6] test: basic unit tests for cfgfile Allain Legacy
2017-03-31 13:51         ` [PATCH v5 2/6] cfgfile: add support for global properties section Allain Legacy
2017-03-31 13:52         ` [PATCH v5 3/6] cfgfile: add support for configurable comment character Allain Legacy
2017-03-31 13:52         ` [PATCH v5 4/6] cfgfile: use strnlen to constrain memchr search Allain Legacy
2017-03-31 13:52         ` [PATCH v5 5/6] cfgfile: increase local buffer size for max name and value Allain Legacy
2017-03-31 13:52         ` [PATCH v5 6/6] cfgfile: add support for empty value string Allain Legacy
2017-04-04 14:23         ` [PATCH v5 0/6] librte_cfgfile enhancements Thomas Monjalon
     [not found]   ` <20170329004737.44249-1-allain.legacy@windriver.com>
2017-03-29  0:47     ` [PATCH v3 1/6] test: basic unit tests for cfgfile Allain Legacy
2017-03-29  0:47     ` [PATCH v3 3/6] cfgfile: add support for configurable comment character Allain Legacy
2017-03-29  9:22       ` Dumitrescu, Cristian
2017-03-29 11:31         ` Legacy, Allain
2017-03-29  0:47     ` [PATCH v3 5/6] cfgfile: increase local buffer size for max name and value Allain Legacy
     [not found]     ` <20170329004737.44249-7-allain.legacy@windriver.com>
2017-03-29  9:31       ` [PATCH v3 6/6] cfgfile: add support for empty value string Dumitrescu, Cristian
2017-03-29 11:33         ` Legacy, Allain
     [not found]     ` <20170329004737.44249-3-allain.legacy@windriver.com>
2017-03-29  9:33       ` [PATCH v3 2/6] cfgfile: add support for global properties section Dumitrescu, Cristian
2017-03-29 11:35         ` Legacy, Allain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1489065060-98370-7-git-send-email-allain.legacy@windriver.com \
    --to=allain.legacy@windriver.com \
    --cc=bruce.richardson@intel.com \
    --cc=cristian.dumitrescu@intel.com \
    --cc=dev@dpdk.org \
    --cc=yuanhan.liu@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.