util: error: Export virErrorMsg for use in testsuite

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Peter Krempa 2018-11-12 15:33:02 +01:00
parent 2de10ac492
commit 631f72fc7b
4 changed files with 35 additions and 1 deletions

View File

@ -1752,6 +1752,7 @@ ebtablesRemoveForwardAllowIn;
virDispatchError; virDispatchError;
virErrorCopyNew; virErrorCopyNew;
virErrorInitialize; virErrorInitialize;
virErrorMsg;
virErrorPreserveLast; virErrorPreserveLast;
virErrorRestore; virErrorRestore;
virErrorSetErrnoFromLastError; virErrorSetErrnoFromLastError;

View File

@ -50,6 +50,7 @@ UTIL_SOURCES = \
util/virendian.h \ util/virendian.h \
util/virerror.c \ util/virerror.c \
util/virerror.h \ util/virerror.h \
util/virerrorpriv.h \
util/virevent.c \ util/virevent.c \
util/virevent.h \ util/virevent.h \
util/vireventpoll.c \ util/vireventpoll.c \

View File

@ -29,6 +29,10 @@
#include "virutil.h" #include "virutil.h"
#include "virstring.h" #include "virstring.h"
#define LIBVIRT_VIRERRORPRIV_H_ALLOW
#include "virerrorpriv.h"
#undef LIBVIRT_VIRERRORPRIV_H_ALLOW
VIR_LOG_INIT("util.error"); VIR_LOG_INIT("util.error");
virThreadLocal virLastErr; virThreadLocal virLastErr;
@ -908,7 +912,7 @@ void virRaiseErrorObject(const char *filename,
* *
* Returns the constant string associated to @error * Returns the constant string associated to @error
*/ */
static const char * const char *
virErrorMsg(virErrorNumber error, const char *info) virErrorMsg(virErrorNumber error, const char *info)
{ {
const char *errmsg = NULL; const char *errmsg = NULL;

28
src/util/virerrorpriv.h Normal file
View File

@ -0,0 +1,28 @@
/*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*/
#ifndef LIBVIRT_VIRERRORPRIV_H_ALLOW
# error "virerrorpriv.h may only be included by virerror.c or its test suite"
#endif /* LIBVIRT_VIRERRORPRIV_H_ALLOW */
#ifndef LIBVIRT_VIRERRORPRIV_H
# define LIBVIRT_VIRERRORPRIV_H
const char *
virErrorMsg(virErrorNumber error,
const char *info);
#endif /* LIBVIRT_VIRERRORPRIV_H */