altcloud/fence-virt
3
0
Fork 1
Code Issues Pull Requests Releases Activity

Compiler warning cleanups in virt-serial.c

Browse Source 
Signed-off-by: Lon Hohberger <lon@users.sourceforge.net>
This commit is contained in:
Lon Hohberger 2010-01-12 17:36:03 -05:00
parent e87de14344
commit 274a828933
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/virt-serial.c
View File

@ -48,7 +48,6 @@ int myEventAddTimeoutFunc(int timeout,
void *opaque, virFreeCallback ff); void *opaque, virFreeCallback ff);
void myEventUpdateTimeoutFunc(int timer, int timout); void myEventUpdateTimeoutFunc(int timer, int timout);
int myEventRemoveTimeoutFunc(int timer); int myEventRemoveTimeoutFunc(int timer);
static int registerDomain(virDomainPtr mojaDomain);
int myEventHandleTypeToPollEvent(virEventHandleType events); int myEventHandleTypeToPollEvent(virEventHandleType events);
virEventHandleType myPollEventToEventHandleType(int events); virEventHandleType myPollEventToEventHandleType(int events);
@ -60,6 +59,7 @@ struct domain_info {
virDomainEventType event; virDomainEventType event;
}; };
int int
myDomainEventCallback1(virConnectPtr conn, myDomainEventCallback1(virConnectPtr conn,
virDomainPtr dom, int event, int detail, void *opaque) virDomainPtr dom, int event, int detail, void *opaque)
@ -78,13 +78,6 @@ myDomainEventCallback1(virConnectPtr conn,
return 0; return 0;
} }
static void
myFreeFunc(void *opaque)
{
char *str = opaque;
printf("%s: Freeing [%s]\n", __func__, str);
free(str);
}
/* EventImpl Functions */ /* EventImpl Functions */
int int
@ -249,7 +242,7 @@ domainStarted(virDomainPtr mojaDomain)
continue; continue;
} }
attr = xmlHasProp(child, "type"); attr = xmlHasProp(child, (const xmlChar *)"type");
if (attr == NULL) if (attr == NULL)
continue; continue;
@ -265,8 +258,8 @@ domainStarted(virDomainPtr mojaDomain)
continue; continue;
} }
attr_mode = xmlHasProp(serial, "mode"); attr_mode = xmlHasProp(serial, (const xmlChar *)"mode");
attr_path = xmlHasProp(serial, "path"); attr_path = xmlHasProp(serial, (const xmlChar *)"path");
if ((attr_path != NULL) && if ((attr_path != NULL) &&
(attr_mode != NULL) && (attr_mode != NULL) &&
@ -294,14 +287,14 @@ registerExisting(virConnectPtr vp)
errno = EINVAL; errno = EINVAL;
if (!vp) if (!vp)
return NULL; return -1;
d_count = virConnectNumOfDomains(vp); d_count = virConnectNumOfDomains(vp);
if (d_count <= 0) { if (d_count <= 0) {
if (d_count == 0) { if (d_count == 0) {
/* Successful, but no domains running */ /* Successful, but no domains running */
errno = 0; errno = 0;
return NULL; return 0;
} }
goto out_fail; goto out_fail;
} }
@ -343,7 +336,6 @@ static int
domainStopped(virDomainPtr mojaDomain) domainStopped(virDomainPtr mojaDomain)
{ {
char dom_uuid[42]; char dom_uuid[42];
char *xml;
if (!mojaDomain) if (!mojaDomain)
return -1; return -1;
@ -366,7 +358,6 @@ main(int argc, char **argv)
int sts; int sts;
int callback1ret = -1; int callback1ret = -1;
int callback2ret = -1;
if (argc > 1 && STREQ(argv[1], "--help")) { if (argc > 1 && STREQ(argv[1], "--help")) {
usage(argv[0]); usage(argv[0]);