diff options
3 files changed, 81 insertions, 81 deletions
diff --git a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-function-declararions.patch b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-function-declararions.patch deleted file mode 100644 index c498c55692..0000000000 --- a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-function-declararions.patch +++ /dev/null | |||
@@ -1,80 +0,0 @@ | |||
1 | From f97c26f5effd4372f7e03f9e4178d42a9ad8d4b3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 2 Sep 2022 13:33:16 -0700 | ||
4 | Subject: [PATCH] Fix function declararions | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | TEST/v2test_ec.c | 2 ++ | ||
11 | TEST/v2test_ein.c | 1 + | ||
12 | backend/cimxml/cimXmlParser.c | 6 +++++- | ||
13 | backend/cimxml/grammar.c | 2 ++ | ||
14 | 4 files changed, 10 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/TEST/v2test_ec.c b/TEST/v2test_ec.c | ||
17 | index ad34dcc..d3e566d 100644 | ||
18 | --- a/TEST/v2test_ec.c | ||
19 | +++ b/TEST/v2test_ec.c | ||
20 | @@ -6,6 +6,8 @@ | ||
21 | #include "cmcimacs.h" | ||
22 | |||
23 | extern char *value2Chars(CMPIType type, CMPIValue * value); | ||
24 | +extern void showClass( CMPIConstClass * in_class ); | ||
25 | + | ||
26 | /* | ||
27 | * comment out this define to use v2 http XML interface | ||
28 | */ | ||
29 | diff --git a/TEST/v2test_ein.c b/TEST/v2test_ein.c | ||
30 | index c1b4692..5d5ef5d 100644 | ||
31 | --- a/TEST/v2test_ein.c | ||
32 | +++ b/TEST/v2test_ein.c | ||
33 | @@ -6,6 +6,7 @@ | ||
34 | #include "cmcimacs.h" | ||
35 | |||
36 | extern char *value2Chars(CMPIType type, CMPIValue * value); | ||
37 | +extern void showObjectPath( CMPIObjectPath * objectpath ); | ||
38 | void showProperty( CMPIData , char * ); | ||
39 | void showInstance( CMPIInstance * ); | ||
40 | static char * CMPIState_str(CMPIValueState); | ||
41 | diff --git a/backend/cimxml/cimXmlParser.c b/backend/cimxml/cimXmlParser.c | ||
42 | index d1ab86e..9f5d1ca 100644 | ||
43 | --- a/backend/cimxml/cimXmlParser.c | ||
44 | +++ b/backend/cimxml/cimXmlParser.c | ||
45 | @@ -34,6 +34,8 @@ | ||
46 | |||
47 | #include <pthread.h> | ||
48 | |||
49 | +void startParsing(ParserControl *parm); | ||
50 | + | ||
51 | static int attrsOk(XmlBuffer * xb, const XmlElement * e, XmlAttr * r, | ||
52 | const char *tag, int etag); | ||
53 | static char *getValue(XmlBuffer * xb, const char *v); | ||
54 | @@ -1350,7 +1352,9 @@ ResponseHdr scanCimXmlResponse(const char *xmlData, CMPIObjectPath *cop) | ||
55 | |||
56 | control.heap = parser_heap_init(); | ||
57 | |||
58 | - control.respHdr.rc = startParsing(&control); | ||
59 | + control.respHdr.rc = 0; | ||
60 | + | ||
61 | + startParsing(&control); | ||
62 | |||
63 | parser_heap_term(control.heap); | ||
64 | |||
65 | diff --git a/backend/cimxml/grammar.c b/backend/cimxml/grammar.c | ||
66 | index 6a0a969..a3dcdea 100644 | ||
67 | --- a/backend/cimxml/grammar.c | ||
68 | +++ b/backend/cimxml/grammar.c | ||
69 | @@ -23,6 +23,8 @@ | ||
70 | #include "sfcUtil/utilft.h" | ||
71 | #include "parserUtil.h" | ||
72 | |||
73 | +CMPIType guessType(char *val); | ||
74 | +void setClassMethods(CMPIConstClass *cls, XtokMethods *ms); | ||
75 | |||
76 | static int ct = 0; | ||
77 | static int dontLex = 0; | ||
78 | -- | ||
79 | 2.37.3 | ||
80 | |||
diff --git a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-implicit-function-declarations.patch b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-implicit-function-declarations.patch new file mode 100644 index 0000000000..08cd15ab0c --- /dev/null +++ b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-implicit-function-declarations.patch | |||
@@ -0,0 +1,80 @@ | |||
1 | From 1e1ed4d58909360997648ca9524ab16441f5474b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 6 Jul 2023 10:15:41 -0700 | ||
4 | Subject: [PATCH] Fix implicit function declarations | ||
5 | |||
6 | Clang 17+ has been finding these errors since its enforcing C99 | ||
7 | more than other compilers | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | TEST/v2test_ec.c | 1 + | ||
13 | TEST/v2test_ein.c | 1 + | ||
14 | backend/cimxml/cimXmlParser.c | 2 +- | ||
15 | backend/cimxml/grammar.c | 2 ++ | ||
16 | backend/cimxml/grammar.h | 1 + | ||
17 | 5 files changed, 6 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/TEST/v2test_ec.c b/TEST/v2test_ec.c | ||
20 | index ad34dcc..940ca57 100644 | ||
21 | --- a/TEST/v2test_ec.c | ||
22 | +++ b/TEST/v2test_ec.c | ||
23 | @@ -4,6 +4,7 @@ | ||
24 | #include <unistd.h> | ||
25 | #include <stdlib.h> | ||
26 | #include "cmcimacs.h" | ||
27 | +#include "show.h" | ||
28 | |||
29 | extern char *value2Chars(CMPIType type, CMPIValue * value); | ||
30 | /* | ||
31 | diff --git a/TEST/v2test_ein.c b/TEST/v2test_ein.c | ||
32 | index c1b4692..ede95c1 100644 | ||
33 | --- a/TEST/v2test_ein.c | ||
34 | +++ b/TEST/v2test_ein.c | ||
35 | @@ -4,6 +4,7 @@ | ||
36 | #include <unistd.h> | ||
37 | #include <stdlib.h> | ||
38 | #include "cmcimacs.h" | ||
39 | +#include "show.h" | ||
40 | |||
41 | extern char *value2Chars(CMPIType type, CMPIValue * value); | ||
42 | void showProperty( CMPIData , char * ); | ||
43 | diff --git a/backend/cimxml/cimXmlParser.c b/backend/cimxml/cimXmlParser.c | ||
44 | index d1ab86e..14f5f5c 100644 | ||
45 | --- a/backend/cimxml/cimXmlParser.c | ||
46 | +++ b/backend/cimxml/cimXmlParser.c | ||
47 | @@ -1350,7 +1350,7 @@ ResponseHdr scanCimXmlResponse(const char *xmlData, CMPIObjectPath *cop) | ||
48 | |||
49 | control.heap = parser_heap_init(); | ||
50 | |||
51 | - control.respHdr.rc = startParsing(&control); | ||
52 | + startParsing(&control); | ||
53 | |||
54 | parser_heap_term(control.heap); | ||
55 | |||
56 | diff --git a/backend/cimxml/grammar.c b/backend/cimxml/grammar.c | ||
57 | index 6a0a969..522ca9e 100644 | ||
58 | --- a/backend/cimxml/grammar.c | ||
59 | +++ b/backend/cimxml/grammar.c | ||
60 | @@ -23,6 +23,8 @@ | ||
61 | #include "sfcUtil/utilft.h" | ||
62 | #include "parserUtil.h" | ||
63 | |||
64 | +extern CMPIType guessType(char *val); | ||
65 | +extern void setClassMethods(CMPIConstClass *cls, XtokMethods *ms); | ||
66 | |||
67 | static int ct = 0; | ||
68 | static int dontLex = 0; | ||
69 | diff --git a/backend/cimxml/grammar.h b/backend/cimxml/grammar.h | ||
70 | index 00d364f..bafdd42 100644 | ||
71 | --- a/backend/cimxml/grammar.h | ||
72 | +++ b/backend/cimxml/grammar.h | ||
73 | @@ -79,3 +79,4 @@ static void valueRefArray(ParserControl *parm, parseUnion *stateUnion); | ||
74 | static void valueReference(ParserControl *parm, parseUnion *stateUnion); | ||
75 | static void valueReferenceData(ParserControl *parm, parseUnion *stateUnion); | ||
76 | |||
77 | +void startParsing(ParserControl *parm); | ||
78 | -- | ||
79 | 2.41.0 | ||
80 | |||
diff --git a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb index 20bd2b6fc1..c9d3ddd6b2 100644 --- a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb +++ b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sblim.org" | |||
4 | 4 | ||
5 | SRC_URI = "http://netcologne.dl.sourceforge.net/project/sblim/${BPN}/${BPN}-${PV}.tar.bz2 \ | 5 | SRC_URI = "http://netcologne.dl.sourceforge.net/project/sblim/${BPN}/${BPN}-${PV}.tar.bz2 \ |
6 | file://0001-cimxml-Include-sys-select.h-for-fd_set.patch \ | 6 | file://0001-cimxml-Include-sys-select.h-for-fd_set.patch \ |
7 | file://0001-Fix-function-declararions.patch \ | 7 | file://0001-Fix-implicit-function-declarations.patch \ |
8 | " | 8 | " |
9 | 9 | ||
10 | SRC_URI[md5sum] = "0bac0dec19f17ec065b6c332a56d7bae" | 10 | SRC_URI[md5sum] = "0bac0dec19f17ec065b6c332a56d7bae" |