*
* The datapath name is not a mandatory parameter for this command. If it is
* not specified, we retrieve it from the current setup, assuming only one
- * exists. On success stores the opened dpif in '*dpifp', and the next
- * arugment to be parsed in '*indexp'. */
+ * exists. On success stores the opened dpif in '*dpifp'. */
static int
opt_dpif_open(int argc, const char *argv[], struct dpctl_params *dpctl_p,
- int max_args, struct dpif **dpifp, int *indexp)
+ int max_args, struct dpif **dpifp)
{
char *dpname;
- if (indexp) {
- *indexp = 1;
- }
-
if (dp_arg_exists(argc, argv)) {
dpname = xstrdup(argv[1]);
- if (indexp) {
- *indexp = 2;
- }
} else if (argc != max_args) {
dpname = get_one_dp(dpctl_p);
} else {
}
}
- error = opt_dpif_open(argc, argv, dpctl_p, 2, &dpif, NULL);
+ error = opt_dpif_open(argc, argv, dpctl_p, 2, &dpif);
if (error) {
goto out_free;
}
struct simap port_names;
int n, error;
- error = opt_dpif_open(argc, argv, dpctl_p, 4, &dpif, NULL);
+ error = opt_dpif_open(argc, argv, dpctl_p, 4, &dpif);
if (error) {
return error;
}
struct ds ds;
int n, error;
- error = opt_dpif_open(argc, argv, dpctl_p, 3, &dpif, NULL);
+ error = opt_dpif_open(argc, argv, dpctl_p, 3, &dpif);
if (error) {
return error;
}
struct simap port_names;
int n, error;
- error = opt_dpif_open(argc, argv, dpctl_p, 3, &dpif, NULL);
+ error = opt_dpif_open(argc, argv, dpctl_p, 3, &dpif);
if (error) {
return error;
}
{
struct dpif *dpif;
- int error = opt_dpif_open(argc, argv, dpctl_p, 2, &dpif, NULL);
+ int error = opt_dpif_open(argc, argv, dpctl_p, 2, &dpif);
if (error) {
return error;
}
argc--;
}
- error = opt_dpif_open(argc, argv, dpctl_p, 2, &dpif, NULL);
+ error = opt_dpif_open(argc, argv, dpctl_p, 2, &dpif);
if (error) {
return error;
}
goto error;
}
- error = opt_dpif_open(argc, argv, dpctl_p, 4, &dpif, NULL);
+ error = opt_dpif_open(argc, argv, dpctl_p, 4, &dpif);
if (error) {
return error;
}
}
}
- error = opt_dpif_open(argc, argv, dpctl_p, 2, &dpif, NULL);
+ error = opt_dpif_open(argc, argv, dpctl_p, 2, &dpif);
if (error) {
return error;
}
}
}
- error = opt_dpif_open(argc, argv, dpctl_p, 2, &dpif, NULL);
+ error = opt_dpif_open(argc, argv, dpctl_p, 2, &dpif);
if (error) {
return error;
}
struct dpctl_params *dpctl_p)
{
struct dpif *dpif;
- int error = opt_dpif_open(argc, argv, dpctl_p, 3, &dpif, NULL);
+ int error = opt_dpif_open(argc, argv, dpctl_p, 3, &dpif);
if (!error) {
uint32_t maxconns;
if (ovs_scan(argv[argc - 1], "%"SCNu32, &maxconns)) {
struct dpctl_params *dpctl_p)
{
struct dpif *dpif;
- int error = opt_dpif_open(argc, argv, dpctl_p, 2, &dpif, NULL);
+ int error = opt_dpif_open(argc, argv, dpctl_p, 2, &dpif);
if (!error) {
uint32_t maxconns;
error = ct_dpif_get_maxconns(dpif, &maxconns);
struct dpctl_params *dpctl_p)
{
struct dpif *dpif;
- int error = opt_dpif_open(argc, argv, dpctl_p, 2, &dpif, NULL);
+ int error = opt_dpif_open(argc, argv, dpctl_p, 2, &dpif);
if (!error) {
uint32_t nconns;
error = ct_dpif_get_nconns(dpif, &nconns);
{
struct dpif *dpif;
struct ds ds = DS_EMPTY_INITIALIZER;
- int i = 1;
+ int i = dp_arg_exists(argc, argv) ? 2 : 1;
uint32_t default_limit, *p_default_limit = NULL;
struct ovs_list zone_limits = OVS_LIST_INITIALIZER(&zone_limits);
- int error = opt_dpif_open(argc, argv, dpctl_p, INT_MAX, &dpif, &i);
+ int error = opt_dpif_open(argc, argv, dpctl_p, INT_MAX, &dpif);
if (error) {
return error;
}
{
struct dpif *dpif;
struct ds ds = DS_EMPTY_INITIALIZER;
- int error, i = 1;
+ int error;
+ int i = dp_arg_exists(argc, argv) ? 2 : 1;
struct ovs_list zone_limits = OVS_LIST_INITIALIZER(&zone_limits);
- error = opt_dpif_open(argc, argv, dpctl_p, 3, &dpif, &i);
+ error = opt_dpif_open(argc, argv, dpctl_p, 3, &dpif);
if (error) {
return error;
}
struct dpif *dpif;
struct ds ds = DS_EMPTY_INITIALIZER;
uint32_t default_limit;
- int i = 1;
+ int i = dp_arg_exists(argc, argv) ? 2 : 1;
struct ovs_list list_query = OVS_LIST_INITIALIZER(&list_query);
struct ovs_list list_reply = OVS_LIST_INITIALIZER(&list_reply);
- int error = opt_dpif_open(argc, argv, dpctl_p, 3, &dpif, &i);
+ int error = opt_dpif_open(argc, argv, dpctl_p, 3, &dpif);
if (error) {
return error;
}