X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Funixctl.c;h=253e9538915fdbec860c3a31f9d46a4e77a2f3c3;hb=6b900de4efd368be88ef3db88b1eff8f835a7cf7;hp=e59056ef2a5dc8a3b5066655674c345f75e25fbd;hpb=cb22974d773942d66da42b700b8bca0db27a0920;p=sliver-openvswitch.git diff --git a/lib/unixctl.c b/lib/unixctl.c index e59056ef2..253e95389 100644 --- a/lib/unixctl.c +++ b/lib/unixctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -168,7 +168,7 @@ unixctl_command_reply(struct unixctl_conn *conn, const char *result) } /* Replies to the active unixctl connection 'conn'. 'error' is sent to the - * client indicating an error occured processing the command. Only one call to + * client indicating an error occurred processing the command. Only one call to * unixctl_command_reply() or unixctl_command_reply_error() may be made per * request. */ void @@ -358,7 +358,7 @@ unixctl_server_run(struct unixctl_server *server) } else { VLOG_WARN_RL(&rl, "%s: accept failed: %s", pstream_get_name(server->listener), - strerror(error)); + ovs_strerror(error)); } } @@ -462,7 +462,7 @@ unixctl_client_transact(struct jsonrpc *client, const char *command, int argc, error = jsonrpc_transact_block(client, request, &reply); if (error) { VLOG_WARN("error communicating with %s: %s", jsonrpc_get_name(client), - strerror(error)); + ovs_retval_to_string(error)); return error; }