b9549313d9
* add 0002-Add-lexer-parser-prototypes.patch,
and 0003-Fix-format-string-for-64bit-values.patch
- adapt %patch syntax
- drop %clean section
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:wbem/sblim-cmpi-nfsv3?expand=0&rev=14
66 lines
2.5 KiB
Diff
66 lines
2.5 KiB
Diff
From ac5c92f7793efb7b1e4a66833b3e290375bb5c3c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@gmail.com>
|
|
Date: Mon, 3 Feb 2025 14:46:19 +0100
|
|
Subject: [PATCH 2/3] Add lexer/parser prototypes
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Klaus Kämpf <kkaempf@gmail.com>
|
|
---
|
|
GLOBALS.h | 10 ++++++++++
|
|
util/Linux_NFSv3SystemConfigurationUtil.c | 7 -------
|
|
util/xmlparser/setProperty.c | 1 +
|
|
3 files changed, 11 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/GLOBALS.h b/GLOBALS.h
|
|
index a4fadf9..59087c3 100644
|
|
--- a/GLOBALS.h
|
|
+++ b/GLOBALS.h
|
|
@@ -9,3 +9,13 @@ static char * _CONFIGFILE_ETAB = "/var/lib/nfs/etab";
|
|
#define USE_EXPORTS_CFG 1
|
|
#define USE_ETAB_CFG 2
|
|
|
|
+#include <stdio.h>
|
|
+int NFSv3yylex (void);
|
|
+int NFSv3yyparsefile(FILE * infile, FILE * outfile); /* Config file parser */
|
|
+void NFSv3yyrestart (FILE *input_file );
|
|
+void NFSv3yyerror(char *errmsg);
|
|
+
|
|
+int NFSv3xmlyylex (void);
|
|
+int NFSv3xmlyyparse(void); /* XML instance parser */
|
|
+void NFSv3xmlyyrestart (FILE *input_file); /* Redirect XML parser input to a file */
|
|
+void NFSv3xmlyyerror(char *errmsg);
|
|
diff --git a/util/Linux_NFSv3SystemConfigurationUtil.c b/util/Linux_NFSv3SystemConfigurationUtil.c
|
|
index c40b53b..7b91601 100644
|
|
--- a/util/Linux_NFSv3SystemConfigurationUtil.c
|
|
+++ b/util/Linux_NFSv3SystemConfigurationUtil.c
|
|
@@ -59,13 +59,6 @@ typedef struct {
|
|
static int cfg_used = USE_ETAB_CFG;
|
|
|
|
|
|
-/* ---------------------------------------------------------------------------
|
|
- * IMPORTED EXTERNALLY DEFINED FUNCTIONS
|
|
- * --------------------------------------------------------------------------- */
|
|
-
|
|
-extern int NFSv3yyparsefile( FILE * infile, FILE * outfile ); /* Config file parser */
|
|
-extern int NFSv3xmlyyparse(); /* XML instance parser */
|
|
-extern int NFSv3xmlyyrestart( FILE * infile ); /* Redirect XML parser input to a file */
|
|
extern int Linux_NFSv3_instance2string( const CMPIInstance * instance, char ** buffer ); /* Instance-to-text formatter */
|
|
|
|
|
|
diff --git a/util/xmlparser/setProperty.c b/util/xmlparser/setProperty.c
|
|
index 8a143ee..c7b9a77 100644
|
|
--- a/util/xmlparser/setProperty.c
|
|
+++ b/util/xmlparser/setProperty.c
|
|
@@ -1,5 +1,6 @@
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
+#include "GLOBALS.h"
|
|
|
|
/* Stand-in for the real setProperty() to test the XML parser in isolation */
|
|
int NFSv3setProperty( char * name, char * typename, char * valuebuffer)
|
|
--
|
|
2.48.1
|
|
|