External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

debug: Annotate some variables as unused

Browse Source 
as they are not used with debugging turned off.
This commit is contained in:
Michal Privoznik 2011-09-26 18:51:47 +02:00
parent 05e2fc51d1
commit 45ad3d6962
10 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/stream.c
View File

@ -94,7 +94,7 @@ daemonStreamUpdateEvents(daemonClientStream *stream)
* fast stream, but slow client * fast stream, but slow client
*/ */
static void static void
daemonStreamMessageFinished(virNetMessagePtr msg, daemonStreamMessageFinished(virNetMessagePtr msg ATTRIBUTE_UNUSED,
void *opaque) void *opaque)
{ {
daemonClientStream *stream = opaque; daemonClientStream *stream = opaque;
@ -244,7 +244,7 @@ cleanup:
* -1 on fatal client error * -1 on fatal client error
*/ */
static int static int
daemonStreamFilter(virNetServerClientPtr client, daemonStreamFilter(virNetServerClientPtr client ATTRIBUTE_UNUSED,
virNetMessagePtr msg, virNetMessagePtr msg,
void *opaque) void *opaque)
{ {

6
src/locking/lock_driver_nop.c
View File

@ -27,9 +27,9 @@
#include "uuid.h" #include "uuid.h"
static int virLockManagerNopInit(unsigned int version, static int virLockManagerNopInit(unsigned int version ATTRIBUTE_UNUSED,
const char *configFile, const char *configFile ATTRIBUTE_UNUSED,
unsigned int flags) unsigned int flags ATTRIBUTE_UNUSED)
{ {
VIR_DEBUG("version=%u configFile=%s flags=%x", VIR_DEBUG("version=%u configFile=%s flags=%x",
version, NULLSTR(configFile), flags); version, NULLSTR(configFile), flags);

2
src/lxc/lxc_container.c
View File

@ -1245,7 +1245,7 @@ int lxcContainerAvailable(int features)
cpid = clone(lxcContainerDummyChild, childStack, flags, NULL); cpid = clone(lxcContainerDummyChild, childStack, flags, NULL);
VIR_FREE(stack); VIR_FREE(stack);
if (cpid < 0) { if (cpid < 0) {
char ebuf[1024]; char ebuf[1024] ATTRIBUTE_UNUSED;
VIR_DEBUG("clone call returned %s, container support is not enabled", VIR_DEBUG("clone call returned %s, container support is not enabled",
virStrerror(errno, ebuf, sizeof ebuf)); virStrerror(errno, ebuf, sizeof ebuf));
return -1; return -1;

2
src/lxc/lxc_driver.c
View File

@ -2165,7 +2165,7 @@ static int lxcStartup(int privileged)
rc = virCgroupForDriver("lxc", &lxc_driver->cgroup, privileged, 1); rc = virCgroupForDriver("lxc", &lxc_driver->cgroup, privileged, 1);
if (rc < 0) { if (rc < 0) {
char buf[1024]; char buf[1024] ATTRIBUTE_UNUSED;
VIR_DEBUG("Unable to create cgroup for LXC driver: %s", VIR_DEBUG("Unable to create cgroup for LXC driver: %s",
virStrerror(-rc, buf, sizeof(buf))); virStrerror(-rc, buf, sizeof(buf)));
/* Don't abort startup. We will explicitly report to /* Don't abort startup. We will explicitly report to

2
src/node_device/node_device_udev.c
View File

@ -703,7 +703,7 @@ out:
} }
static int udevGetSCSIType(virNodeDeviceDefPtr def, static int udevGetSCSIType(virNodeDeviceDefPtr def ATTRIBUTE_UNUSED,
unsigned int type, char **typestring) unsigned int type, char **typestring)
{ {
int ret = 0; int ret = 0;

2
src/qemu/qemu_migration.c
View File

@ -1829,7 +1829,7 @@ cleanup:
* instead of client app context & also adding in tunnel * instead of client app context & also adding in tunnel
* handling */ * handling */
static int doPeer2PeerMigrate2(struct qemud_driver *driver, static int doPeer2PeerMigrate2(struct qemud_driver *driver,
virConnectPtr sconn, virConnectPtr sconn ATTRIBUTE_UNUSED,
virConnectPtr dconn, virConnectPtr dconn,
virDomainObjPtr vm, virDomainObjPtr vm,
const char *dconnuri, const char *dconnuri,

5
src/rpc/virnettlscontext.c
View File

@ -96,7 +96,8 @@ virNetTLSContextCheckCertFile(const char *type, const char *file, bool allowMiss
} }
static void virNetTLSLog(int level, const char *str) { static void virNetTLSLog(int level ATTRIBUTE_UNUSED,
const char *str ATTRIBUTE_UNUSED) {
VIR_DEBUG("%d %s", level, str); VIR_DEBUG("%d %s", level, str);
} }
@ -490,7 +491,7 @@ static int virNetTLSContextCheckCertPair(gnutls_x509_crt_t cert,
static gnutls_x509_crt_t virNetTLSContextLoadCertFromFile(const char *certFile, static gnutls_x509_crt_t virNetTLSContextLoadCertFromFile(const char *certFile,
bool isServer, bool isServer,
bool isCA) bool isCA ATTRIBUTE_UNUSED)
{ {
gnutls_datum_t data; gnutls_datum_t data;
gnutls_x509_crt_t cert = NULL; gnutls_x509_crt_t cert = NULL;

9
src/util/command.c
View File

@ -1686,7 +1686,8 @@ virCommandProcessIO(virCommandPtr cmd)
} else { } else {
inoff += done; inoff += done;
if (inoff == inlen) { if (inoff == inlen) {
int tmpfd = infd; int tmpfd ATTRIBUTE_UNUSED;
tmpfd = infd;
if (VIR_CLOSE(infd) < 0) if (VIR_CLOSE(infd) < 0)
VIR_DEBUG("ignoring failed close on fd %d", tmpfd); VIR_DEBUG("ignoring failed close on fd %d", tmpfd);
} }
@ -1877,7 +1878,8 @@ virCommandRun(virCommandPtr cmd, int *exitstatus)
VIR_DEBUG("ignoring failed close on fd %d", tmpfd); VIR_DEBUG("ignoring failed close on fd %d", tmpfd);
} }
if (cmd->outbuf == &outbuf) { if (cmd->outbuf == &outbuf) {
int tmpfd = cmd->outfd; int tmpfd ATTRIBUTE_UNUSED;
tmpfd = cmd->outfd;
if (VIR_CLOSE(cmd->outfd) < 0) if (VIR_CLOSE(cmd->outfd) < 0)
VIR_DEBUG("ignoring failed close on fd %d", tmpfd); VIR_DEBUG("ignoring failed close on fd %d", tmpfd);
cmd->outfdptr = NULL; cmd->outfdptr = NULL;
@ -1885,7 +1887,8 @@ virCommandRun(virCommandPtr cmd, int *exitstatus)
VIR_FREE(outbuf); VIR_FREE(outbuf);
} }
if (cmd->errbuf == &errbuf) { if (cmd->errbuf == &errbuf) {
int tmpfd = cmd->errfd; int tmpfd ATTRIBUTE_UNUSED;
tmpfd = cmd->errfd;
if (VIR_CLOSE(cmd->errfd) < 0) if (VIR_CLOSE(cmd->errfd) < 0)
VIR_DEBUG("ignoring failed close on fd %d", tmpfd); VIR_DEBUG("ignoring failed close on fd %d", tmpfd);
cmd->errfdptr = NULL; cmd->errfdptr = NULL;

2
src/util/virpidfile.c
View File

@ -351,7 +351,7 @@ int virPidFileAcquirePath(const char *path,
* one that now exists on the filesystem * one that now exists on the filesystem
*/ */
if (stat(path, &a) < 0) { if (stat(path, &a) < 0) {
char ebuf[1024]; char ebuf[1024] ATTRIBUTE_UNUSED;
VIR_DEBUG("Pid file '%s' disappeared: %s", VIR_DEBUG("Pid file '%s' disappeared: %s",
path, virStrerror(errno, ebuf, sizeof ebuf)); path, virStrerror(errno, ebuf, sizeof ebuf));
VIR_FORCE_CLOSE(fd); VIR_FORCE_CLOSE(fd);

37
src/vbox/vbox_tmpl.c
View File

@ -6447,7 +6447,7 @@ cleanup:
/* Functions needed for Callbacks */ /* Functions needed for Callbacks */
static nsresult PR_COM_METHOD static nsresult PR_COM_METHOD
vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis, vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
PRUnichar *machineId, PRUint32 state) PRUnichar *machineId, PRUint32 state)
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
@ -6521,7 +6521,7 @@ vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis,
} }
static nsresult PR_COM_METHOD static nsresult PR_COM_METHOD
vboxCallbackOnMachineDataChange(IVirtualBoxCallback *pThis, vboxCallbackOnMachineDataChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
PRUnichar *machineId) PRUnichar *machineId)
{ {
VIR_DEBUG("IVirtualBoxCallback: %p", pThis); VIR_DEBUG("IVirtualBoxCallback: %p", pThis);
@ -6531,11 +6531,11 @@ vboxCallbackOnMachineDataChange(IVirtualBoxCallback *pThis,
} }
static nsresult PR_COM_METHOD static nsresult PR_COM_METHOD
vboxCallbackOnExtraDataCanChange(IVirtualBoxCallback *pThis, vboxCallbackOnExtraDataCanChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
PRUnichar *machineId, PRUnichar *key, PRUnichar *machineId, PRUnichar *key,
PRUnichar *value, PRUnichar *value,
PRUnichar **error ATTRIBUTE_UNUSED, PRUnichar **error ATTRIBUTE_UNUSED,
PRBool *allowChange) PRBool *allowChange ATTRIBUTE_UNUSED)
{ {
VIR_DEBUG("IVirtualBoxCallback: %p, allowChange: %s", pThis, *allowChange ? "true" : "false"); VIR_DEBUG("IVirtualBoxCallback: %p, allowChange: %s", pThis, *allowChange ? "true" : "false");
DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("machineId", machineId);
@ -6546,7 +6546,8 @@ vboxCallbackOnExtraDataCanChange(IVirtualBoxCallback *pThis,
} }
static nsresult PR_COM_METHOD static nsresult PR_COM_METHOD
vboxCallbackOnExtraDataChange(IVirtualBoxCallback *pThis, PRUnichar *machineId, vboxCallbackOnExtraDataChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
PRUnichar *machineId,
PRUnichar *key, PRUnichar *value) PRUnichar *key, PRUnichar *value)
{ {
VIR_DEBUG("IVirtualBoxCallback: %p", pThis); VIR_DEBUG("IVirtualBoxCallback: %p", pThis);
@ -6559,8 +6560,10 @@ vboxCallbackOnExtraDataChange(IVirtualBoxCallback *pThis, PRUnichar *machineId,
# if VBOX_API_VERSION < 3001 # if VBOX_API_VERSION < 3001
static nsresult PR_COM_METHOD static nsresult PR_COM_METHOD
vboxCallbackOnMediaRegistered(IVirtualBoxCallback *pThis, PRUnichar *mediaId, vboxCallbackOnMediaRegistered(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
PRUint32 mediaType, PRBool registered) PRUnichar *mediaId,
PRUint32 mediaType ATTRIBUTE_UNUSED,
PRBool registered ATTRIBUTE_UNUSED)
{ {
VIR_DEBUG("IVirtualBoxCallback: %p, registered: %s", pThis, registered ? "true" : "false"); VIR_DEBUG("IVirtualBoxCallback: %p, registered: %s", pThis, registered ? "true" : "false");
VIR_DEBUG("mediaType: %d", mediaType); VIR_DEBUG("mediaType: %d", mediaType);
@ -6572,7 +6575,7 @@ vboxCallbackOnMediaRegistered(IVirtualBoxCallback *pThis, PRUnichar *mediaId,
# endif /* VBOX_API_VERSION >= 3001 */ # endif /* VBOX_API_VERSION >= 3001 */
static nsresult PR_COM_METHOD static nsresult PR_COM_METHOD
vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis, vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
PRUnichar *machineId, PRBool registered) PRUnichar *machineId, PRBool registered)
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
@ -6631,8 +6634,9 @@ vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis,
} }
static nsresult PR_COM_METHOD static nsresult PR_COM_METHOD
vboxCallbackOnSessionStateChange(IVirtualBoxCallback *pThis, vboxCallbackOnSessionStateChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
PRUnichar *machineId, PRUint32 state) PRUnichar *machineId,
PRUint32 state ATTRIBUTE_UNUSED)
{ {
VIR_DEBUG("IVirtualBoxCallback: %p, state: %d", pThis, state); VIR_DEBUG("IVirtualBoxCallback: %p, state: %d", pThis, state);
DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("machineId", machineId);
@ -6641,7 +6645,8 @@ vboxCallbackOnSessionStateChange(IVirtualBoxCallback *pThis,
} }
static nsresult PR_COM_METHOD static nsresult PR_COM_METHOD
vboxCallbackOnSnapshotTaken(IVirtualBoxCallback *pThis, PRUnichar *machineId, vboxCallbackOnSnapshotTaken(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
PRUnichar *machineId,
PRUnichar *snapshotId) PRUnichar *snapshotId)
{ {
VIR_DEBUG("IVirtualBoxCallback: %p", pThis); VIR_DEBUG("IVirtualBoxCallback: %p", pThis);
@ -6652,7 +6657,8 @@ vboxCallbackOnSnapshotTaken(IVirtualBoxCallback *pThis, PRUnichar *machineId,
} }
static nsresult PR_COM_METHOD static nsresult PR_COM_METHOD
vboxCallbackOnSnapshotDiscarded(IVirtualBoxCallback *pThis, PRUnichar *machineId, vboxCallbackOnSnapshotDiscarded(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
PRUnichar *machineId,
PRUnichar *snapshotId) PRUnichar *snapshotId)
{ {
VIR_DEBUG("IVirtualBoxCallback: %p", pThis); VIR_DEBUG("IVirtualBoxCallback: %p", pThis);
@ -6663,7 +6669,8 @@ vboxCallbackOnSnapshotDiscarded(IVirtualBoxCallback *pThis, PRUnichar *machineId
} }
static nsresult PR_COM_METHOD static nsresult PR_COM_METHOD
vboxCallbackOnSnapshotChange(IVirtualBoxCallback *pThis, PRUnichar *machineId, vboxCallbackOnSnapshotChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
PRUnichar *machineId,
PRUnichar *snapshotId) PRUnichar *snapshotId)
{ {
VIR_DEBUG("IVirtualBoxCallback: %p", pThis); VIR_DEBUG("IVirtualBoxCallback: %p", pThis);
@ -6674,7 +6681,7 @@ vboxCallbackOnSnapshotChange(IVirtualBoxCallback *pThis, PRUnichar *machineId,
} }
static nsresult PR_COM_METHOD static nsresult PR_COM_METHOD
vboxCallbackOnGuestPropertyChange(IVirtualBoxCallback *pThis, vboxCallbackOnGuestPropertyChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
PRUnichar *machineId, PRUnichar *name, PRUnichar *machineId, PRUnichar *name,
PRUnichar *value, PRUnichar *flags) PRUnichar *value, PRUnichar *flags)
{ {
@ -6688,7 +6695,7 @@ vboxCallbackOnGuestPropertyChange(IVirtualBoxCallback *pThis,
} }
static nsresult PR_COM_METHOD static nsresult PR_COM_METHOD
vboxCallbackAddRef(nsISupports *pThis) vboxCallbackAddRef(nsISupports *pThis ATTRIBUTE_UNUSED)
{ {
nsresult c; nsresult c;