Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fmc: update patch format #1862

Merged
merged 1 commit into from
Jul 10, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 329c8ab2770ab34d887296a35585fac53c8bedb7 Mon Sep 17 00:00:00 2001
From 018249d180705657efbecdce3736c9a415412762 Mon Sep 17 00:00:00 2001
From: Meng Li <[email protected]>
Date: Wed, 5 Jun 2024 18:54:22 +0800
Subject: [PATCH] FMCCFGReader: improve parameter definition of function
Date: Tue, 9 Jul 2024 14:35:06 +0800
Subject: [PATCH] FMCCFGReader: improve parameter definition of function
errorFuncHandler

When building fmc package, there is below error:
Expand Down Expand Up @@ -30,27 +30,27 @@ index a1a87a4..c11742c 100644
--- a/source/FMCGenericError.cpp
+++ b/source/FMCGenericError.cpp
@@ -33,7 +33,7 @@
#include "FMCUtils.h"
#include "logger.hpp"

-void errorFuncHandler( void * ctx, xmlErrorPtr error )
+void errorFuncHandler( void * ctx, const xmlError *error )
{
char *filestr = (char*)"";
char *msgstr = (char*)"";
#include "FMCUtils.h"
#include "logger.hpp"
-void errorFuncHandler( void * ctx, xmlErrorPtr error )
+void errorFuncHandler( void * ctx, const xmlError *error )
{
char *filestr = (char*)"";
char *msgstr = (char*)"";
diff --git a/source/FMCGenericError.h b/source/FMCGenericError.h
index 504a81b..61ab6c1 100644
--- a/source/FMCGenericError.h
+++ b/source/FMCGenericError.h
@@ -35,7 +35,7 @@

const int NO_LINE = -1;

-void errorFuncHandler( void * ctx, xmlErrorPtr error );
+void errorFuncHandler( void * ctx, const xmlError *error );


class CGenericError {
const int NO_LINE = -1;
-void errorFuncHandler( void * ctx, xmlErrorPtr error );
+void errorFuncHandler( void * ctx, const xmlError *error );
class CGenericError {
--
2.34.1

Loading