projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Fix intermittent failure in ovs-monitor-ipsec test.
[openvswitch]
/
lib
/
ovsdb-error.c
diff --git
a/lib/ovsdb-error.c
b/lib/ovsdb-error.c
index 3b90b1616b3545c6b9e17c43b0d63f50f3006afa..0ac93dc65cdc21a41d5c0147aa061162e9a6dde8 100644
(file)
--- a/
lib/ovsdb-error.c
+++ b/
lib/ovsdb-error.c
@@
-192,12
+192,6
@@
ovsdb_error_clone(const struct ovsdb_error *old)
}
}
}
}
-static const char *
-ovsdb_errno_string(int error)
-{
- return error == EOF ? "unexpected end of file" : strerror(error);
-}
-
struct json *
ovsdb_error_to_json(const struct ovsdb_error *error)
{
struct json *
ovsdb_error_to_json(const struct ovsdb_error *error)
{
@@
-211,7
+205,7
@@
ovsdb_error_to_json(const struct ovsdb_error *error)
}
if (error->errno_) {
json_object_put_string(json, "io-error",
}
if (error->errno_) {
json_object_put_string(json, "io-error",
- ovs
db_errn
o_string(error->errno_));
+ ovs
_retval_t
o_string(error->errno_));
}
return json;
}
}
return json;
}
@@
-228,7
+222,7
@@
ovsdb_error_to_string(const struct ovsdb_error *error)
ds_put_format(&ds, ": %s", error->details);
}
if (error->errno_) {
ds_put_format(&ds, ": %s", error->details);
}
if (error->errno_) {
- ds_put_format(&ds, " (%s)", ovs
db_errn
o_string(error->errno_));
+ ds_put_format(&ds, " (%s)", ovs
_retval_t
o_string(error->errno_));
}
return ds_steal_cstr(&ds);
}
}
return ds_steal_cstr(&ds);
}