diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index d1636bcc1bc8bd66219fea8d1bd08bf118603a54..d1274da969d9af176448bedd7332d8aeb93e6b57 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1420,7 +1420,7 @@ struct virNetworkObjListGetHelperData { virConnectPtr conn; virNetworkObjListFilter filter; char **names; - int nnames; + int maxnames; bool active; int got; bool error; @@ -1437,8 +1437,8 @@ virNetworkObjListGetHelper(void *payload, if (data->error) return 0; - if (data->nnames >= 0 && - data->got == data->nnames) + if (data->maxnames >= 0 && + data->got == data->maxnames) return 0; virObjectLock(obj); @@ -1467,14 +1467,14 @@ int virNetworkObjListGetNames(virNetworkObjListPtr nets, bool active, char **names, - int nnames, + int maxnames, virNetworkObjListFilter filter, virConnectPtr conn) { int ret = -1; struct virNetworkObjListGetHelperData data = { - conn, filter, names, nnames, active, 0, false}; + conn, filter, names, maxnames, active, 0, false}; virObjectLock(nets); virHashForEach(nets->objs, virNetworkObjListGetHelper, &data); diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h index 0a8cc24a2afdd7ca3f5277b026be99ee60fc7f42..0bed97c99325c0bf71964b30c6d1e6d2b46774f7 100644 --- a/src/conf/virnetworkobj.h +++ b/src/conf/virnetworkobj.h @@ -227,7 +227,7 @@ int virNetworkObjListGetNames(virNetworkObjListPtr nets, bool active, char **names, - int nnames, + int maxnames, virNetworkObjListFilter filter, virConnectPtr conn); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index b59de78ea5a0a3f85da832e51141849333612775..74ce92e434b5dd0bc2a6eb7e5f13530a3718cd62 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2946,7 +2946,7 @@ networkConnectNumOfNetworks(virConnectPtr conn) static int networkConnectListNetworks(virConnectPtr conn, char **const names, - int nnames) + int maxnames) { virNetworkDriverStatePtr driver = networkGetDriver(); int got = 0; @@ -2955,7 +2955,7 @@ networkConnectListNetworks(virConnectPtr conn, return -1; got = virNetworkObjListGetNames(driver->networks, - true, names, nnames, + true, names, maxnames, virConnectListNetworksCheckACL, conn); @@ -2984,7 +2984,7 @@ networkConnectNumOfDefinedNetworks(virConnectPtr conn) static int networkConnectListDefinedNetworks(virConnectPtr conn, char **const names, - int nnames) + int maxnames) { virNetworkDriverStatePtr driver = networkGetDriver(); int got = 0; @@ -2993,7 +2993,7 @@ networkConnectListDefinedNetworks(virConnectPtr conn, return -1; got = virNetworkObjListGetNames(driver->networks, - false, names, nnames, + false, names, maxnames, virConnectListDefinedNetworksCheckACL, conn); return got; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 284d49ef17bce4d288496aeaeb594d51fd68c61a..aa38f54dd9938db1b6c3d73fac9bd585827962f7 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3299,13 +3299,13 @@ testConnectNumOfNetworks(virConnectPtr conn) static int testConnectListNetworks(virConnectPtr conn, char **const names, - int nnames) + int maxnames) { testDriverPtr privconn = conn->privateData; int n; n = virNetworkObjListGetNames(privconn->networks, - true, names, nnames, NULL, conn); + true, names, maxnames, NULL, conn); return n; } @@ -3325,13 +3325,13 @@ testConnectNumOfDefinedNetworks(virConnectPtr conn) static int testConnectListDefinedNetworks(virConnectPtr conn, char **const names, - int nnames) + int maxnames) { testDriverPtr privconn = conn->privateData; int n; n = virNetworkObjListGetNames(privconn->networks, - false, names, nnames, NULL, conn); + false, names, maxnames, NULL, conn); return n; }