提交 8473859a 编写于 作者: J John Ferlan

network: Use @maxnames instead of @nnames

To be consistent with the API definition, use the @maxnames instead
of @nnames when describing/comparing against the maximum names to
be provided for the *ConnectList[Defined]Networks APIs.
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
上级 178ac3d1
...@@ -1420,7 +1420,7 @@ struct virNetworkObjListGetHelperData { ...@@ -1420,7 +1420,7 @@ struct virNetworkObjListGetHelperData {
virConnectPtr conn; virConnectPtr conn;
virNetworkObjListFilter filter; virNetworkObjListFilter filter;
char **names; char **names;
int nnames; int maxnames;
bool active; bool active;
int got; int got;
bool error; bool error;
...@@ -1437,8 +1437,8 @@ virNetworkObjListGetHelper(void *payload, ...@@ -1437,8 +1437,8 @@ virNetworkObjListGetHelper(void *payload,
if (data->error) if (data->error)
return 0; return 0;
if (data->nnames >= 0 && if (data->maxnames >= 0 &&
data->got == data->nnames) data->got == data->maxnames)
return 0; return 0;
virObjectLock(obj); virObjectLock(obj);
...@@ -1467,14 +1467,14 @@ int ...@@ -1467,14 +1467,14 @@ int
virNetworkObjListGetNames(virNetworkObjListPtr nets, virNetworkObjListGetNames(virNetworkObjListPtr nets,
bool active, bool active,
char **names, char **names,
int nnames, int maxnames,
virNetworkObjListFilter filter, virNetworkObjListFilter filter,
virConnectPtr conn) virConnectPtr conn)
{ {
int ret = -1; int ret = -1;
struct virNetworkObjListGetHelperData data = { struct virNetworkObjListGetHelperData data = {
conn, filter, names, nnames, active, 0, false}; conn, filter, names, maxnames, active, 0, false};
virObjectLock(nets); virObjectLock(nets);
virHashForEach(nets->objs, virNetworkObjListGetHelper, &data); virHashForEach(nets->objs, virNetworkObjListGetHelper, &data);
......
...@@ -227,7 +227,7 @@ int ...@@ -227,7 +227,7 @@ int
virNetworkObjListGetNames(virNetworkObjListPtr nets, virNetworkObjListGetNames(virNetworkObjListPtr nets,
bool active, bool active,
char **names, char **names,
int nnames, int maxnames,
virNetworkObjListFilter filter, virNetworkObjListFilter filter,
virConnectPtr conn); virConnectPtr conn);
......
...@@ -2946,7 +2946,7 @@ networkConnectNumOfNetworks(virConnectPtr conn) ...@@ -2946,7 +2946,7 @@ networkConnectNumOfNetworks(virConnectPtr conn)
static int static int
networkConnectListNetworks(virConnectPtr conn, networkConnectListNetworks(virConnectPtr conn,
char **const names, char **const names,
int nnames) int maxnames)
{ {
virNetworkDriverStatePtr driver = networkGetDriver(); virNetworkDriverStatePtr driver = networkGetDriver();
int got = 0; int got = 0;
...@@ -2955,7 +2955,7 @@ networkConnectListNetworks(virConnectPtr conn, ...@@ -2955,7 +2955,7 @@ networkConnectListNetworks(virConnectPtr conn,
return -1; return -1;
got = virNetworkObjListGetNames(driver->networks, got = virNetworkObjListGetNames(driver->networks,
true, names, nnames, true, names, maxnames,
virConnectListNetworksCheckACL, virConnectListNetworksCheckACL,
conn); conn);
...@@ -2984,7 +2984,7 @@ networkConnectNumOfDefinedNetworks(virConnectPtr conn) ...@@ -2984,7 +2984,7 @@ networkConnectNumOfDefinedNetworks(virConnectPtr conn)
static int static int
networkConnectListDefinedNetworks(virConnectPtr conn, networkConnectListDefinedNetworks(virConnectPtr conn,
char **const names, char **const names,
int nnames) int maxnames)
{ {
virNetworkDriverStatePtr driver = networkGetDriver(); virNetworkDriverStatePtr driver = networkGetDriver();
int got = 0; int got = 0;
...@@ -2993,7 +2993,7 @@ networkConnectListDefinedNetworks(virConnectPtr conn, ...@@ -2993,7 +2993,7 @@ networkConnectListDefinedNetworks(virConnectPtr conn,
return -1; return -1;
got = virNetworkObjListGetNames(driver->networks, got = virNetworkObjListGetNames(driver->networks,
false, names, nnames, false, names, maxnames,
virConnectListDefinedNetworksCheckACL, virConnectListDefinedNetworksCheckACL,
conn); conn);
return got; return got;
......
...@@ -3299,13 +3299,13 @@ testConnectNumOfNetworks(virConnectPtr conn) ...@@ -3299,13 +3299,13 @@ testConnectNumOfNetworks(virConnectPtr conn)
static int static int
testConnectListNetworks(virConnectPtr conn, testConnectListNetworks(virConnectPtr conn,
char **const names, char **const names,
int nnames) int maxnames)
{ {
testDriverPtr privconn = conn->privateData; testDriverPtr privconn = conn->privateData;
int n; int n;
n = virNetworkObjListGetNames(privconn->networks, n = virNetworkObjListGetNames(privconn->networks,
true, names, nnames, NULL, conn); true, names, maxnames, NULL, conn);
return n; return n;
} }
...@@ -3325,13 +3325,13 @@ testConnectNumOfDefinedNetworks(virConnectPtr conn) ...@@ -3325,13 +3325,13 @@ testConnectNumOfDefinedNetworks(virConnectPtr conn)
static int static int
testConnectListDefinedNetworks(virConnectPtr conn, testConnectListDefinedNetworks(virConnectPtr conn,
char **const names, char **const names,
int nnames) int maxnames)
{ {
testDriverPtr privconn = conn->privateData; testDriverPtr privconn = conn->privateData;
int n; int n;
n = virNetworkObjListGetNames(privconn->networks, n = virNetworkObjListGetNames(privconn->networks,
false, names, nnames, NULL, conn); false, names, maxnames, NULL, conn);
return n; return n;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册