From e77b4004104da30649eaf7dc7912044e0295939d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbaeder@redhat.com>
Date: Wed, 18 Jan 2023 12:00:50 +0100
Subject: [PATCH] Port to C99

https://fedoraproject.org/wiki/Changes/PortingToModernC
---
 c99.patch       | 68 +++++++++++++++++++++++++++++++++++++++++++++++++
 sblim-sfcc.spec |  8 +++++-
 2 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 c99.patch

diff --git a/c99.patch b/c99.patch
new file mode 100644
index 0000000..bbc3972
--- /dev/null
+++ b/c99.patch
@@ -0,0 +1,68 @@
+diff -ruN sblim-sfcc-2.2.8.orig/backend/cimxml/cimXmlParser.h sblim-sfcc-2.2.8/backend/cimxml/cimXmlParser.h
+--- sblim-sfcc-2.2.8.orig/backend/cimxml/cimXmlParser.h	2014-11-26 17:26:46.000000000 +0100
++++ sblim-sfcc-2.2.8/backend/cimxml/cimXmlParser.h	2023-01-18 11:29:06.707034147 +0100
+@@ -588,6 +588,7 @@
+ void* parser_calloc(ParserHeap *ph, size_t num, size_t sz);
+ void* parser_realloc(ParserHeap *ph, void *p, size_t sz);
+ void* parser_strdup(ParserHeap *ph, const char *s);
++int startParsing(ParserControl *parm);
+ 
+ extern ResponseHdr scanCimXmlResponse(const char *xmlData, CMPIObjectPath *cop);
+ extern void freeCimXmlResponse(ResponseHdr * hdr);
+diff -ruN sblim-sfcc-2.2.8.orig/backend/cimxml/grammar.c sblim-sfcc-2.2.8/backend/cimxml/grammar.c
+--- sblim-sfcc-2.2.8.orig/backend/cimxml/grammar.c	2014-11-26 17:26:46.000000000 +0100
++++ sblim-sfcc-2.2.8/backend/cimxml/grammar.c	2023-01-18 11:28:53.914945664 +0100
+@@ -27,6 +27,7 @@
+ static int ct = 0;
+ static int dontLex = 0;
+ 
++extern CMPIType guessType(char *val);
+ 
+ static void parseError(char* tokExp, int tokFound, ParserControl *parm)
+ {
+@@ -48,10 +49,11 @@
+ }
+ 
+ 
+-void startParsing(ParserControl *parm)
++int startParsing(ParserControl *parm)
+ {
+     parseUnion stateUnion;
+     start(parm, &stateUnion);
++    return 0;
+ }
+ 
+ static void start(ParserControl *parm, parseUnion *stateUnion)
+diff -ruN sblim-sfcc-2.2.8.orig/backend/cimxml/parserUtil.h sblim-sfcc-2.2.8/backend/cimxml/parserUtil.h
+--- sblim-sfcc-2.2.8.orig/backend/cimxml/parserUtil.h	2014-11-26 17:26:46.000000000 +0100
++++ sblim-sfcc-2.2.8/backend/cimxml/parserUtil.h	2023-01-17 10:44:29.215845637 +0100
+@@ -31,6 +31,7 @@
+ void setInstProperties(CMPIInstance *ci, XtokProperties *ps);
+ void setInstQualifiers(CMPIInstance *ci, XtokQualifiers *qs);
+ void setClassProperties(CMPIConstClass *cls, XtokProperties *ps);
++void setClassMethods(CMPIConstClass *cls, XtokMethods *ms);
+ void setClassQualifiers(CMPIConstClass *cls, XtokQualifiers *qs);
+ void addProperty(ParserControl *parm, XtokProperties *ps, XtokProperty *p);
+ void addParamValue(ParserControl *parm, XtokParamValues *vs, XtokParamValue *v);
+diff -ruN sblim-sfcc-2.2.8.orig/TEST/v2test_ec.c sblim-sfcc-2.2.8/TEST/v2test_ec.c
+--- sblim-sfcc-2.2.8.orig/TEST/v2test_ec.c	2014-11-26 17:26:46.000000000 +0100
++++ sblim-sfcc-2.2.8/TEST/v2test_ec.c	2023-01-18 11:35:32.990725766 +0100
+@@ -4,6 +4,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include "cmcimacs.h"
++#include "show.h"
+ 
+ extern char *value2Chars(CMPIType type, CMPIValue * value);
+ /*
+diff -ruN sblim-sfcc-2.2.8.orig/TEST/v2test_ein.c sblim-sfcc-2.2.8/TEST/v2test_ein.c
+--- sblim-sfcc-2.2.8.orig/TEST/v2test_ein.c	2014-11-26 17:26:46.000000000 +0100
++++ sblim-sfcc-2.2.8/TEST/v2test_ein.c	2023-01-18 11:44:44.223586290 +0100
+@@ -4,6 +4,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include "cmcimacs.h"
++#include "show.h"
+ 
+ extern char *value2Chars(CMPIType type, CMPIValue * value);
+ void showProperty( CMPIData , char * );
diff --git a/sblim-sfcc.spec b/sblim-sfcc.spec
index aff3bfd..3f13fe5 100644
--- a/sblim-sfcc.spec
+++ b/sblim-sfcc.spec
@@ -7,13 +7,14 @@
 Summary: Small Footprint CIM Client Library
 Name: sblim-sfcc
 Version: 2.2.8
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: EPL-1.0
 URL: http://www.sblim.org
 Source0: http://downloads.sourceforge.net/project/sblim/%{name}/%{name}-%{version}.tar.bz2
 # Patch0: fixes docdir name and removes install of COPYING with license
 #   which is included through %%license
 Patch0: sblim-sfcc-2.2.8-docdir-license.patch
+Patch1: c99.patch
 BuildRequires: make
 BuildRequires: curl-devel chrpath
 BuildRequires: gcc gcc-c++
@@ -33,6 +34,7 @@ Small Footprint CIM Client Library Header Files and Link Libraries
 
 %setup -q
 %patch0 -p1 -b .docdir-license
+%patch1 -p1 -b .c99
 
 %build
 chmod a-x backend/cimxml/*.[ch]
@@ -64,6 +66,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcmpisfcc.so.1.0.0
 %{_libdir}/libcmpisfcc.so
 
 %changelog
+* Wed Jan 18 2023 Timm Bäder <tbaeder@redhat.com> - 2.2.8-21
+- Add downstream patch to fix c99 incompatibilities
+- https://fedoraproject.org/wiki/Changes/PortingToModernC
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild