External/libvirt
1
0
Fork 0
Code

fdstream: s/struct virFDStreamData */virFDStreamDataPtr/

Browse Source 
There is really no reason why we should have to have 'struct'
everywhere.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Michal Privoznik 2016-06-16 11:54:42 +02:00
parent b8ef4758f3
commit 58667ddd5b
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/util/virfdstream.c
View File

@ -50,6 +50,8 @@
VIR_LOG_INIT("fdstream"); VIR_LOG_INIT("fdstream");
/* Tunnelled migration stream support */ /* Tunnelled migration stream support */
typedef struct virFDStreamData virFDStreamData;
typedef virFDStreamData *virFDStreamDataPtr;
struct virFDStreamData { struct virFDStreamData {
int fd; int fd;
int errfd; int errfd;
@ -82,7 +84,7 @@ struct virFDStreamData {
static int virFDStreamRemoveCallback(virStreamPtr stream) static int virFDStreamRemoveCallback(virStreamPtr stream)
{ {
struct virFDStreamData *fdst = stream->privateData; virFDStreamDataPtr fdst = stream->privateData;
int ret = -1; int ret = -1;
if (!fdst) { if (!fdst) {
@ -119,7 +121,7 @@ static int virFDStreamRemoveCallback(virStreamPtr stream)
static int virFDStreamUpdateCallback(virStreamPtr stream, int events) static int virFDStreamUpdateCallback(virStreamPtr stream, int events)
{ {
struct virFDStreamData *fdst = stream->privateData; virFDStreamDataPtr fdst = stream->privateData;
int ret = -1; int ret = -1;
if (!fdst) { if (!fdst) {
@ -151,7 +153,7 @@ static void virFDStreamEvent(int watch ATTRIBUTE_UNUSED,
void *opaque) void *opaque)
{ {
virStreamPtr stream = opaque; virStreamPtr stream = opaque;
struct virFDStreamData *fdst = stream->privateData; virFDStreamDataPtr fdst = stream->privateData;
virStreamEventCallback cb; virStreamEventCallback cb;
void *cbopaque; void *cbopaque;
virFreeCallback ff; virFreeCallback ff;
@ -200,7 +202,7 @@ virFDStreamAddCallback(virStreamPtr st,
void *opaque, void *opaque,
virFreeCallback ff) virFreeCallback ff)
{ {
struct virFDStreamData *fdst = st->privateData; virFDStreamDataPtr fdst = st->privateData;
int ret = -1; int ret = -1;
if (!fdst) { if (!fdst) {
@ -242,7 +244,7 @@ virFDStreamAddCallback(virStreamPtr st,
} }
static int static int
virFDStreamCloseCommand(struct virFDStreamData *fdst, bool streamAbort) virFDStreamCloseCommand(virFDStreamDataPtr fdst, bool streamAbort)
{ {
char buf[1024]; char buf[1024];
ssize_t len; ssize_t len;
@ -295,7 +297,7 @@ virFDStreamCloseCommand(struct virFDStreamData *fdst, bool streamAbort)
static int static int
virFDStreamCloseInt(virStreamPtr st, bool streamAbort) virFDStreamCloseInt(virStreamPtr st, bool streamAbort)
{ {
struct virFDStreamData *fdst; virFDStreamDataPtr fdst;
virStreamEventCallback cb; virStreamEventCallback cb;
void *opaque; void *opaque;
int ret; int ret;
@ -378,7 +380,7 @@ virFDStreamAbort(virStreamPtr st)
static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes) static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes)
{ {
struct virFDStreamData *fdst = st->privateData; virFDStreamDataPtr fdst = st->privateData;
int ret; int ret;
if (nbytes > INT_MAX) { if (nbytes > INT_MAX) {
@ -432,7 +434,7 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes)
static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes) static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes)
{ {
struct virFDStreamData *fdst = st->privateData; virFDStreamDataPtr fdst = st->privateData;
int ret; int ret;
if (nbytes > INT_MAX) { if (nbytes > INT_MAX) {
@ -498,7 +500,7 @@ static int virFDStreamOpenInternal(virStreamPtr st,
int errfd, int errfd,
unsigned long long length) unsigned long long length)
{ {
struct virFDStreamData *fdst; virFDStreamDataPtr fdst;
VIR_DEBUG("st=%p fd=%d cmd=%p errfd=%d length=%llu", VIR_DEBUG("st=%p fd=%d cmd=%p errfd=%d length=%llu",
st, fd, cmd, errfd, length); st, fd, cmd, errfd, length);
@ -754,7 +756,7 @@ int virFDStreamOpenPTY(virStreamPtr st,
unsigned long long length, unsigned long long length,
int oflags) int oflags)
{ {
struct virFDStreamData *fdst = NULL; virFDStreamDataPtr fdst = NULL;
struct termios rawattr; struct termios rawattr;
if (virFDStreamOpenFileInternal(st, path, if (virFDStreamOpenFileInternal(st, path,
@ -817,7 +819,7 @@ int virFDStreamSetInternalCloseCb(virStreamPtr st,
void *opaque, void *opaque,
virFDStreamInternalCloseCbFreeOpaque fcb) virFDStreamInternalCloseCbFreeOpaque fcb)
{ {
struct virFDStreamData *fdst = st->privateData; virFDStreamDataPtr fdst = st->privateData;
virMutexLock(&fdst->lock); virMutexLock(&fdst->lock);