> -----Original Message----- > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Jacek Piasecki > Sent: Monday, June 26, 2017 11:59 AM > To: dev@dpdk.org > Cc: Richardson, Bruce <bruce.richard...@intel.com>; Jain, Deepak K > <deepak.k.j...@intel.com>; Piasecki, JacekX <jacekx.piase...@intel.com> > Subject: [dpdk-dev] [PATCH v2 1/7] cfgfile: remove EAL dependency > > This patch removes the dependency to EAL in cfgfile library. > > Signed-off-by: Jacek Piasecki <jacekx.piase...@intel.com> > --- > lib/librte_cfgfile/Makefile | 1 + > lib/librte_cfgfile/rte_cfgfile.c | 29 +++++++++++++++++------------ > 2 files changed, 18 insertions(+), 12 deletions(-) > > diff --git a/lib/librte_cfgfile/Makefile b/lib/librte_cfgfile/Makefile > index 755ef11..0bee43e 100644 > --- a/lib/librte_cfgfile/Makefile > +++ b/lib/librte_cfgfile/Makefile > @@ -38,6 +38,7 @@ LIB = librte_cfgfile.a > > CFLAGS += -O3 > CFLAGS += $(WERROR_FLAGS) > +CFLAGS += -I$(SRCDIR)/../librte_eal/common/include > > EXPORT_MAP := rte_cfgfile_version.map > > diff --git a/lib/librte_cfgfile/rte_cfgfile.c > b/lib/librte_cfgfile/rte_cfgfile.c > index b54a523..c6ae3e3 100644 > --- a/lib/librte_cfgfile/rte_cfgfile.c > +++ b/lib/librte_cfgfile/rte_cfgfile.c > @@ -36,7 +36,6 @@ > #include <string.h> > #include <ctype.h> > #include <rte_common.h> > -#include <rte_string_fns.h> > > #include "rte_cfgfile.h" > > @@ -258,19 +257,25 @@ rte_cfgfile_load_with_params(const char > *filename, int flags, > > struct rte_cfgfile_section *sect = > cfg->sections[curr_section]; > - int n; > + > char *split[2] = {NULL}; > - n = rte_strsplit(buffer, sizeof(buffer), split, 2, '='); > - if (flags & CFG_FLAG_EMPTY_VALUES) { > - if ((n < 1) || (n > 2)) { > - printf("Error at line %d - cannot split > string, n=%d\n", > - lineno, n); > - goto error1; > - } > + split[0] = buffer; > + split[1] = memchr(buffer, '=', len); > + > + /* when delimeter not found */ > + if (split[1] == NULL) { > + printf("Error at line %d - cannot " > + "split string\n", lineno); > + goto error1; > } else { > - if (n != 2) { > - printf("Error at line %d - cannot split > string, n=%d\n", > - lineno, n); > + /* when delimeter found */ > + *split[1] = '\0'; > + split[1]++; > + > + if (!(flags & CFG_FLAG_EMPTY_VALUES) && > + (*split[1] == '\0')) { > + printf("Error at line %d - cannot " > + "split string\n", lineno); > goto error1; > } > } > -- > 2.7.4
Please separate the cfg file functionality from the eal functionality into distinct patch sets.
