inotify: Clean up some function headers

This commit is contained in:
John Ferlan 2013-01-29 09:22:46 -05:00
parent 2ca9c3cefe
commit d67c2b76c7

View File

@ -4,7 +4,7 @@
* /etc/xen * /etc/xen
* /var/lib/xend/domains * /var/lib/xend/domains
* *
* Copyright (C) 2010-2011 Red Hat, Inc. * Copyright (C) 2010-2013 Red Hat, Inc.
* Copyright (C) 2008 VirtualIron * Copyright (C) 2008 VirtualIron
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -51,7 +51,9 @@ struct xenUnifiedDriver xenInotifyDriver = {
static int static int
xenInotifyXenCacheLookup(virConnectPtr conn, xenInotifyXenCacheLookup(virConnectPtr conn,
const char *filename, const char *filename,
char **name, unsigned char *uuid) { char **name,
unsigned char *uuid)
{
xenUnifiedPrivatePtr priv = conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
xenXMConfCachePtr entry; xenXMConfCachePtr entry;
@ -72,8 +74,11 @@ xenInotifyXenCacheLookup(virConnectPtr conn,
} }
static int static int
xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename, xenInotifyXendDomainsDirLookup(virConnectPtr conn,
char **name, unsigned char *uuid) { const char *filename,
char **name,
unsigned char *uuid)
{
int i; int i;
virDomainPtr dom; virDomainPtr dom;
const char *uuid_str; const char *uuid_str;
@ -131,7 +136,9 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename,
static int static int
xenInotifyDomainLookup(virConnectPtr conn, xenInotifyDomainLookup(virConnectPtr conn,
const char *filename, const char *filename,
char **name, unsigned char *uuid) { char **name,
unsigned char *uuid)
{
xenUnifiedPrivatePtr priv = conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
if (priv->useXenConfigCache) if (priv->useXenConfigCache)
return xenInotifyXenCacheLookup(conn, filename, name, uuid); return xenInotifyXenCacheLookup(conn, filename, name, uuid);
@ -142,7 +149,9 @@ xenInotifyDomainLookup(virConnectPtr conn,
static virDomainEventPtr static virDomainEventPtr
xenInotifyDomainEventFromFile(virConnectPtr conn, xenInotifyDomainEventFromFile(virConnectPtr conn,
const char *filename, const char *filename,
int type, int detail) { int type,
int detail)
{
virDomainEventPtr event; virDomainEventPtr event;
char *name = NULL; char *name = NULL;
unsigned char uuid[VIR_UUID_BUFLEN]; unsigned char uuid[VIR_UUID_BUFLEN];
@ -156,8 +165,8 @@ xenInotifyDomainEventFromFile(virConnectPtr conn,
} }
static int static int
xenInotifyXendDomainsDirRemoveEntry(virConnectPtr conn, xenInotifyXendDomainsDirRemoveEntry(virConnectPtr conn, const char *fname)
const char *fname) { {
xenUnifiedPrivatePtr priv = conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
const char *uuidstr = fname + strlen(XEND_DOMAINS_DIR) + 1; const char *uuidstr = fname + strlen(XEND_DOMAINS_DIR) + 1;
unsigned char uuid[VIR_UUID_BUFLEN]; unsigned char uuid[VIR_UUID_BUFLEN];
@ -193,8 +202,8 @@ xenInotifyXendDomainsDirRemoveEntry(virConnectPtr conn,
} }
static int static int
xenInotifyXendDomainsDirAddEntry(virConnectPtr conn, xenInotifyXendDomainsDirAddEntry(virConnectPtr conn, const char *fname)
const char *fname) { {
char *name = NULL; char *name = NULL;
unsigned char uuid[VIR_UUID_BUFLEN]; unsigned char uuid[VIR_UUID_BUFLEN];
xenUnifiedPrivatePtr priv = conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
@ -217,8 +226,8 @@ xenInotifyXendDomainsDirAddEntry(virConnectPtr conn,
} }
static int static int
xenInotifyRemoveDomainConfigInfo(virConnectPtr conn, xenInotifyRemoveDomainConfigInfo(virConnectPtr conn, const char *fname)
const char *fname) { {
xenUnifiedPrivatePtr priv = conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
return priv->useXenConfigCache ? return priv->useXenConfigCache ?
xenXMConfigCacheRemoveFile(conn, fname) : xenXMConfigCacheRemoveFile(conn, fname) :
@ -226,8 +235,8 @@ xenInotifyRemoveDomainConfigInfo(virConnectPtr conn,
} }
static int static int
xenInotifyAddDomainConfigInfo(virConnectPtr conn, xenInotifyAddDomainConfigInfo(virConnectPtr conn, const char *fname)
const char *fname) { {
xenUnifiedPrivatePtr priv = conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
return priv->useXenConfigCache ? return priv->useXenConfigCache ?
xenXMConfigCacheAddFile(conn, fname) : xenXMConfigCacheAddFile(conn, fname) :
@ -348,7 +357,7 @@ xenInotifyOpen(virConnectPtr conn,
DIR *dh; DIR *dh;
struct dirent *ent; struct dirent *ent;
char *path; char *path;
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);