diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/multipath-tools')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch index 57d04d02b..95624ad7a 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch @@ -1,4 +1,4 @@ -From d16de70b76919269561b4e404825f78286ea9a40 Mon Sep 17 00:00:00 2001 +From 56d65ecb1c6d814929f6ff3159ade09dc203cc83 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Mon, 26 Nov 2018 10:31:30 +0800 Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 @@ -18,14 +18,15 @@ Upstream-Status: Pending update this patch to new version Signed-off-by: Changqing Li <changqing.li@windriver.com> + --- libmultipath/dict.c | 29 ++++++++++++++++++++++------- libmultipath/parser.c | 13 +++++++++++++ - libmultipath/parser.h | 2 +- - 3 files changed, 36 insertions(+), 8 deletions(-) + libmultipath/parser.h | 1 + + 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/libmultipath/dict.c b/libmultipath/dict.c -index a81c051..0689763 100644 +index eaad4f1..fb30577 100644 --- a/libmultipath/dict.c +++ b/libmultipath/dict.c @@ -59,6 +59,21 @@ set_str(vector strvec, void *ptr) @@ -50,7 +51,7 @@ index a81c051..0689763 100644 set_yes_no(vector strvec, void *ptr) { char * buff; -@@ -1346,8 +1361,8 @@ ble_ ## option ## _handler (struct config *conf, vector strvec) \ +@@ -1373,8 +1388,8 @@ ble_ ## option ## _handler (struct config *conf, vector strvec) \ \ if (!conf->option) \ return 1; \ @@ -61,7 +62,7 @@ index a81c051..0689763 100644 if (!buff) \ return 1; \ \ -@@ -1363,7 +1378,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec) \ +@@ -1390,7 +1405,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec) \ if (!conf->option) \ return 1; \ \ @@ -70,7 +71,7 @@ index a81c051..0689763 100644 if (!buff) \ return 1; \ \ -@@ -1466,16 +1481,16 @@ device_handler(struct config *conf, vector strvec) +@@ -1493,16 +1508,16 @@ device_handler(struct config *conf, vector strvec) return 0; } @@ -116,18 +117,14 @@ index 92ef7cf..0e2cf49 100644 static int kw_level = 0; diff --git a/libmultipath/parser.h b/libmultipath/parser.h -index 62906e9..b6899fc 100644 +index 62906e9..b791705 100644 --- a/libmultipath/parser.h +++ b/libmultipath/parser.h -@@ -76,7 +76,7 @@ extern int _install_keyword(vector keywords, char *string, - extern void dump_keywords(vector keydump, int level); +@@ -77,6 +77,7 @@ extern void dump_keywords(vector keydump, int level); extern void free_keywords(vector keywords); extern vector alloc_strvec(char *string); --extern void *set_value(vector strvec); + extern void *set_value(vector strvec); +extern void *set_regex_value(vector strvec); extern int process_file(struct config *conf, char *conf_file); extern struct keyword * find_keyword(vector keywords, vector v, char * name); int snprint_keyword(char *buff, int len, char *fmt, struct keyword *kw, --- -2.7.4 - |