From 63a5bc0182881d8f806a9acdf47b708492b8a41b Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Sun, 3 Oct 2010 19:23:43 +0200
Subject: Rename the error functions.
---
lib/examples/client-blocking.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
(limited to 'lib/examples')
diff --git a/lib/examples/client-blocking.c b/lib/examples/client-blocking.c
index 1e6ec25..9a211c8 100644
--- a/lib/examples/client-blocking.c
+++ b/lib/examples/client-blocking.c
@@ -16,7 +16,7 @@
#define USER_PW "hemligt"
struct rs_error *
-rsx_client (const char *srvname, int srvport)
+blocking_client (const char *srvname, int srvport)
{
struct rs_handle *h;
struct rs_connection *conn;
@@ -29,30 +29,30 @@ rsx_client (const char *srvname, int srvport)
return NULL;
if (rs_conn_create (h, &conn))
- return rs_conn_err_pop (conn);
+ return rs_err_conn_pop (conn);
if (rs_conn_add_server (conn, &server, RS_CONN_TYPE_UDP, srvname, srvport))
- return rs_conn_err_pop (conn);
+ return rs_err_conn_pop (conn);
rs_server_set_timeout (server, 1);
rs_server_set_tries (server, 3);
rs_server_set_secret (server, SECRET);
if (rs_packet_create_acc_request (conn, &req, USER_NAME, USER_PW))
- return rs_conn_err_pop (conn);
+ return rs_err_conn_pop (conn);
#if !defined(USE_REQUEST_OBJECT)
if (rs_packet_send (req, NULL))
- return rs_conn_err_pop (conn);
+ return rs_err_conn_pop (conn);
req = NULL;
if (rs_conn_receive_packet (conn, &resp))
- return rs_conn_err_pop (conn);
+ return rs_err_conn_pop (conn);
#else
{
struct rs_request *request;
if (rs_request_new (conn, &request))
- return rs_conn_err_pop (conn);
+ return rs_err_conn_pop (conn);
if (rs_req_send (request, req, &resp))
- return rs_conn_err_pop (conn);
+ return rs_err_conn_pop (conn);
rs_request_destroy (request);
}
#endif /* !defined(USE_REQUEST_OBJECT) */
@@ -76,7 +76,7 @@ main (int argc, char *argv[])
host = strsep (argv + 1, ":");
port = atoi (argv[1]);
- err = rsx_client (host, port);
+ err = blocking_client (host, port);
if (err)
{
fprintf (stderr, "%s\n", rs_err_msg (err, 0));
--
cgit v1.1