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

libvirt: Use conventional function names

Browse Source 
do_open and winsock_init don't follow the naming pattern of other
functions in this file. Rename them to match
This commit is contained in:
Cole Robinson 2016-04-19 12:18:40 -04:00
parent 3b9100a4d2
commit 0496063f14
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libvirt.c
View File

@ -257,7 +257,7 @@ virConnectAuthPtr virConnectAuthPtrDefault = &virConnectAuthDefault;
#if HAVE_WINSOCK2_H #if HAVE_WINSOCK2_H
static int static int
winsock_init(void) virWinsockInit(void)
{ {
WORD winsock_version, err; WORD winsock_version, err;
WSADATA winsock_data; WSADATA winsock_data;
@ -386,7 +386,7 @@ virGlobalInit(void)
VIR_DEBUG("register drivers"); VIR_DEBUG("register drivers");
#if HAVE_WINSOCK2_H #if HAVE_WINSOCK2_H
if (winsock_init() == -1) if (virWinsockInit() == -1)
goto error; goto error;
#endif #endif
@ -958,7 +958,7 @@ virConnectCheckURIMissingSlash(const char *uristr, virURIPtr uri)
static virConnectPtr static virConnectPtr
do_open(const char *name, virConnectOpenInternal(const char *name,
virConnectAuthPtr auth, virConnectAuthPtr auth,
unsigned int flags) unsigned int flags)
{ {
@ -1161,7 +1161,7 @@ virConnectOpen(const char *name)
VIR_DEBUG("name=%s", NULLSTR(name)); VIR_DEBUG("name=%s", NULLSTR(name));
virResetLastError(); virResetLastError();
ret = do_open(name, NULL, 0); ret = virConnectOpenInternal(name, NULL, 0);
if (!ret) if (!ret)
goto error; goto error;
return ret; return ret;
@ -1197,7 +1197,7 @@ virConnectOpenReadOnly(const char *name)
VIR_DEBUG("name=%s", NULLSTR(name)); VIR_DEBUG("name=%s", NULLSTR(name));
virResetLastError(); virResetLastError();
ret = do_open(name, NULL, VIR_CONNECT_RO); ret = virConnectOpenInternal(name, NULL, VIR_CONNECT_RO);
if (!ret) if (!ret)
goto error; goto error;
return ret; return ret;
@ -1237,7 +1237,7 @@ virConnectOpenAuth(const char *name,
VIR_DEBUG("name=%s, auth=%p, flags=%x", NULLSTR(name), auth, flags); VIR_DEBUG("name=%s, auth=%p, flags=%x", NULLSTR(name), auth, flags);
virResetLastError(); virResetLastError();
ret = do_open(name, auth, flags); ret = virConnectOpenInternal(name, auth, flags);
if (!ret) if (!ret)
goto error; goto error;
return ret; return ret;