git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure: Remove --with-build-number.
[sliver-openvswitch.git]
/
lib
/
ovsdb-error.c
diff --git
a/lib/ovsdb-error.c
b/lib/ovsdb-error.c
index
3b90b16
..
c5a4ad4
100644
(file)
--- a/
lib/ovsdb-error.c
+++ b/
lib/ovsdb-error.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 2009, 2010, 2011
, 2012
Nicira Networks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-150,7
+150,7
@@
ovsdb_internal_error(struct ovsdb_error *inner_error,
ds_put_char(&ds, ')');
}
ds_put_char(&ds, ')');
}
- ds_put_format(&ds, " (%s %s
%s)", program_name, VERSION, BUILDNR
);
+ ds_put_format(&ds, " (%s %s
)", program_name, VERSION
);
if (inner_error) {
char *s = ovsdb_error_to_string(inner_error);
if (inner_error) {
char *s = ovsdb_error_to_string(inner_error);
@@
-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);
}