projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Rework and fix bugs in port change detection.
[openvswitch]
/
utilities
/
ovs-dpctl.c
diff --git
a/utilities/ovs-dpctl.c
b/utilities/ovs-dpctl.c
index 658f6ba106b3f6c0da6b7790edea15acc20e5037..9d6bf98520def196206c0b552aa87ca0649a4cf1 100644
(file)
--- a/
utilities/ovs-dpctl.c
+++ b/
utilities/ovs-dpctl.c
@@
-38,7
+38,7
@@
#include "netdev.h"
#include "odp-util.h"
#include "shash.h"
#include "netdev.h"
#include "odp-util.h"
#include "shash.h"
-#include "s
vec
.h"
+#include "s
set
.h"
#include "timeval.h"
#include "util.h"
#include "vlog.h"
#include "timeval.h"
#include "util.h"
#include "vlog.h"
@@
-146,17
+146,8
@@
static void run(int retval, const char *message, ...)
if (retval) {
va_list args;
if (retval) {
va_list args;
- fprintf(stderr, "%s: ", program_name);
va_start(args, message);
va_start(args, message);
- vfprintf(stderr, message, args);
- va_end(args);
- if (retval == EOF) {
- fputs(": unexpected end of file\n", stderr);
- } else {
- fprintf(stderr, ": %s\n", strerror(retval));
- }
-
- exit(EXIT_FAILURE);
+ ovs_fatal_valist(retval, message, args);
}
}
\f
}
}
\f
@@
-404,23
+395,21
@@
do_show(int argc, char *argv[])
}
}
} else {
}
}
} else {
- struct s
vec
types;
+ struct s
set
types;
const char *type;
const char *type;
- size_t i;
- s
vec
_init(&types);
+ s
set
_init(&types);
dp_enumerate_types(&types);
dp_enumerate_types(&types);
- S
VEC_FOR_EACH (i,
type, &types) {
- struct s
vec
names;
+ S
SET_FOR_EACH (
type, &types) {
+ struct s
set
names;
const char *name;
const char *name;
- size_t j;
- s
vec
_init(&names);
+ s
set
_init(&names);
if (dp_enumerate_names(type, &names)) {
failure = true;
continue;
}
if (dp_enumerate_names(type, &names)) {
failure = true;
continue;
}
- S
VEC_FOR_EACH (j,
name, &names) {
+ S
SET_FOR_EACH (
name, &names) {
struct dpif *dpif;
int error;
struct dpif *dpif;
int error;
@@
-432,9
+421,9
@@
do_show(int argc, char *argv[])
failure = true;
}
}
failure = true;
}
}
- s
vec
_destroy(&names);
+ s
set
_destroy(&names);
}
}
- s
vec
_destroy(&types);
+ s
set
_destroy(&types);
}
if (failure) {
exit(EXIT_FAILURE);
}
if (failure) {
exit(EXIT_FAILURE);
@@
-444,34
+433,34
@@
do_show(int argc, char *argv[])
static void
do_dump_dps(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
{
static void
do_dump_dps(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
{
- struct s
vec
dpif_names, dpif_types;
-
unsigned int i
;
+ struct s
set
dpif_names, dpif_types;
+
const char *type
;
int error = 0;
int error = 0;
- s
vec
_init(&dpif_names);
- s
vec
_init(&dpif_types);
+ s
set
_init(&dpif_names);
+ s
set
_init(&dpif_types);
dp_enumerate_types(&dpif_types);
dp_enumerate_types(&dpif_types);
-
for (i = 0; i < dpif_types.n; i++
) {
-
unsigned int j
;
+
SSET_FOR_EACH (type, &dpif_types
) {
+
const char *name
;
int retval;
int retval;
- retval = dp_enumerate_names(
dpif_types.names[i]
, &dpif_names);
+ retval = dp_enumerate_names(
type
, &dpif_names);
if (retval) {
error = retval;
}
if (retval) {
error = retval;
}
-
for (j = 0; j < dpif_names.n; j++
) {
+
SSET_FOR_EACH (name, &dpif_names
) {
struct dpif *dpif;
struct dpif *dpif;
- if (!dpif_open(
dpif_names.names[j], dpif_types.names[i]
, &dpif)) {
+ if (!dpif_open(
name, type
, &dpif)) {
printf("%s\n", dpif_name(dpif));
dpif_close(dpif);
}
}
}
printf("%s\n", dpif_name(dpif));
dpif_close(dpif);
}
}
}
- s
vec
_destroy(&dpif_names);
- s
vec
_destroy(&dpif_types);
+ s
set
_destroy(&dpif_names);
+ s
set
_destroy(&dpif_types);
if (error) {
exit(EXIT_FAILURE);
}
if (error) {
exit(EXIT_FAILURE);
}