close(fd);
if (error) {
- VLOG_ERR("%s: read error (%s)", urandom,
- error == EOF ? "unexpected end of file" : strerror(error));
+ VLOG_ERR("%s: read error (%s)", urandom, ovs_retval_to_string(error));
}
return error;
}
}
}
-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)
{
}
if (error->errno_) {
json_object_put_string(json, "io-error",
- ovsdb_errno_string(error->errno_));
+ ovs_retval_to_string(error->errno_));
}
return json;
}
ds_put_format(&ds, ": %s", error->details);
}
if (error->errno_) {
- ds_put_format(&ds, " (%s)", ovsdb_errno_string(error->errno_));
+ ds_put_format(&ds, " (%s)", ovs_retval_to_string(error->errno_));
}
return ds_steal_cstr(&ds);
}
/*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
if (error) {
VLOG_WARN("error reading reply from %s: %s",
client->connect_path,
- (error == EOF ? "unexpected end of file"
- : strerror(error)));
+ ovs_retval_to_string(error));
goto error;
}
[[file: open successful
file: read: [0]
file: read: [1]
-file: read failed: I/O error: file: error reading 4 bytes starting at offset 170 (unexpected end of file)
+file: read failed: I/O error: file: error reading 4 bytes starting at offset 170 (End of file)
file: write:["longer data"] successful
]], [ignore])
AT_CHECK(