提交 0496063f 编写于 作者: C Cole Robinson

libvirt: Use conventional function names

do_open and winsock_init don't follow the naming pattern of other
functions in this file. Rename them to match
上级 3b9100a4
...@@ -257,7 +257,7 @@ virConnectAuthPtr virConnectAuthPtrDefault = &virConnectAuthDefault; ...@@ -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) ...@@ -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,9 +958,9 @@ virConnectCheckURIMissingSlash(const char *uristr, virURIPtr uri) ...@@ -958,9 +958,9 @@ 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)
{ {
size_t i; size_t i;
int res; int res;
...@@ -1161,7 +1161,7 @@ virConnectOpen(const char *name) ...@@ -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) ...@@ -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, ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册