Deprecate the conn, dom and net fields in the _virError structure.

* include/libvirt/libvirt.h.in: Add VIR_DEPRECATED macro.
	* src/internal.h: Internal code is allowed to use deprecated
	features, so override VIR_DEPRECATED here.
	* include/libvirt/virterror.h: Deprecate the conn, dom and net
	fields in the _virError structure.
This commit is contained in:
Richard W.M. Jones 2008-05-23 08:32:08 +00:00
parent 1d8d4f86b6
commit f60dc0bc09
5 changed files with 37 additions and 5 deletions

View File

@ -1,3 +1,12 @@
Fri May 23 09:23:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
Deprecate the conn, dom and net fields in the _virError structure.
* include/libvirt/libvirt.h.in: Add VIR_DEPRECATED macro.
* src/internal.h: Internal code is allowed to use deprecated
features, so override VIR_DEPRECATED here.
* include/libvirt/virterror.h: Deprecate the conn, dom and net
fields in the _virError structure.
Fri May 23 08:56:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
Standardize use of header files, making internal.h primary.

View File

@ -1,4 +1,3 @@
/* -*- c -*-
* libvirt.h:
* Summary: core interfaces for the libvirt library
@ -21,6 +20,15 @@
extern "C" {
#endif
#ifndef VIR_DEPRECATED
/* The feature is present in gcc-3.1 and newer. */
# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
# define VIR_DEPRECATED __attribute__((__deprecated__))
# else
# define VIR_DEPRECATED /* nothing */
# endif
#endif /* VIR_DEPRECATED */
/**
* virConnect:
*

View File

@ -1,4 +1,3 @@
/* -*- c -*-
* libvirt.h:
* Summary: core interfaces for the libvirt library
@ -21,6 +20,15 @@
extern "C" {
#endif
#ifndef VIR_DEPRECATED
/* The feature is present in gcc-3.1 and newer. */
# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
# define VIR_DEPRECATED __attribute__((__deprecated__))
# else
# define VIR_DEPRECATED /* nothing */
# endif
#endif /* VIR_DEPRECATED */
/**
* virConnect:
*

View File

@ -76,14 +76,15 @@ struct _virError {
int domain; /* What part of the library raised this error */
char *message;/* human-readable informative error message */
virErrorLevel level;/* how consequent is the error */
virConnectPtr conn; /* connection if available, see note above */
virDomainPtr dom; /* domain if available, see note above */
virConnectPtr conn VIR_DEPRECATED; /* connection if available,
see note above */
virDomainPtr dom VIR_DEPRECATED; /* domain if available, see note above */
char *str1; /* extra string information */
char *str2; /* extra string information */
char *str3; /* extra string information */
int int1; /* extra number information */
int int2; /* extra number information */
virNetworkPtr net; /* network if available, see note above */
virNetworkPtr net VIR_DEPRECATED; /* network if available, see note above */
};
/**

View File

@ -24,6 +24,12 @@
#define pthread_mutex_unlock(lk) /*empty*/
#endif
/* The library itself is allowed to use deprecated functions /
* variables, so effectively undefine the deprecated attribute
* which would otherwise be defined in libvirt.h.
*/
#define VIR_DEPRECATED /*empty*/
#include "gettext.h"
#include "hash.h"