NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cast pointer to int using intptr_t

Browse Source 
Fix a few warnings with mingw64 x86_64.
This commit is contained in:
Marc-André Lureau 2012-01-25 21:13:25 +01:00 committed by Eric Blake
parent 3d5c139c49
commit d553554b75
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/util/logging.c
View File

@ -1,7 +1,7 @@
/* /*
* logging.c: internal logging and debugging * logging.c: internal logging and debugging
* *
* Copyright (C) 2008, 2010-2011 Red Hat, Inc. * Copyright (C) 2008, 2010-2012 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -329,7 +329,7 @@ static void virLogDumpAllFD(const char *msg, int len) {
for (i = 0; i < virLogNbOutputs;i++) { for (i = 0; i < virLogNbOutputs;i++) {
if (virLogOutputs[i].f == virLogOutputToFd) { if (virLogOutputs[i].f == virLogOutputToFd) {
int fd = (long) virLogOutputs[i].data; int fd = (intptr_t) virLogOutputs[i].data;
if (fd >= 0) { if (fd >= 0) {
ignore_value (safewrite(fd, msg, len)); ignore_value (safewrite(fd, msg, len));
@ -791,7 +791,7 @@ static int virLogOutputToFd(const char *category ATTRIBUTE_UNUSED,
const char *str, const char *str,
void *data) void *data)
{ {
int fd = (long) data; int fd = (intptr_t) data;
int ret; int ret;
char *msg; char *msg;
@ -808,7 +808,7 @@ static int virLogOutputToFd(const char *category ATTRIBUTE_UNUSED,
} }
static void virLogCloseFd(void *data) { static void virLogCloseFd(void *data) {
int fd = (long) data; int fd = (intptr_t) data;
VIR_FORCE_CLOSE(fd); VIR_FORCE_CLOSE(fd);
} }
@ -826,7 +826,8 @@ static int virLogAddOutputToFile(int priority, const char *file) {
fd = open(file, O_CREAT | O_APPEND | O_WRONLY, S_IRUSR | S_IWUSR); fd = open(file, O_CREAT | O_APPEND | O_WRONLY, S_IRUSR | S_IWUSR);
if (fd < 0) if (fd < 0)
return -1; return -1;
if (virLogDefineOutput(virLogOutputToFd, virLogCloseFd, (void *)(long)fd, if (virLogDefineOutput(virLogOutputToFd, virLogCloseFd,
(void *)(intptr_t)fd,
priority, VIR_LOG_TO_FILE, file, 0) < 0) { priority, VIR_LOG_TO_FILE, file, 0) < 0) {
VIR_FORCE_CLOSE(fd); VIR_FORCE_CLOSE(fd);
return -1; return -1;

2
src/util/threads-win32.c
View File

@ -336,7 +336,7 @@ int virThreadSelfID(void)
/* For debugging use only; see comments in threads-pthread.c. */ /* For debugging use only; see comments in threads-pthread.c. */
int virThreadID(virThreadPtr thread) int virThreadID(virThreadPtr thread)
{ {
return (int)thread->thread; return (intptr_t)thread->thread;
} }