From f6c1bcb8a839c463ff106431bc6eadc489809281 Mon Sep 17 00:00:00 2001
From: Aleksey Yeschenko <aleksey@yeschenko.com>
Date: Tue, 27 Apr 2010 01:28:13 +0300
Subject: [PATCH] Renamed s:getsockopt -> s:getopt, s:setsockopt -> s:setopt

---
 API.md                        |  8 ++++----
 examples/server_multipart.lua |  2 +-
 examples/subscriber.lua       |  2 +-
 perf/local_thr.lua            |  2 +-
 zmq.c                         | 16 ++++++++--------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/API.md b/API.md
index 39e6c6b..6dacbca 100644
--- a/API.md
+++ b/API.md
@@ -38,19 +38,19 @@ See [zmq_close(3)](http://api.zeromq.org/zmq_close.html).
 
 s:close()
 
-## setsockopt
+## setopt
 
 Sets a specified option on a ØMQ socket.
 See [zmq_setsockopt(3)](http://api.zeromq.org/zmq_setsockopt.html).
 
-s:setsockopt(option, optval)
+s:setopt(option, optval)
 
-## getsockopt
+## getopt
 
 Gets a specified option of a ØMQ socket.
 See [zmq_getsockopt(3)](http://api.zeromq.org/zmq_getsockopt.html).
 
-s:getsockopt(option)
+s:getopt(option)
 
 ## bind
 
diff --git a/examples/server_multipart.lua b/examples/server_multipart.lua
index 2be3937..974e83d 100644
--- a/examples/server_multipart.lua
+++ b/examples/server_multipart.lua
@@ -27,7 +27,7 @@ s:bind("tcp://lo:5555")
 
 while true do
     local query = s:recv()
-    while s:getsockopt(zmq.RCVMORE) == 1 do
+    while s:getopt(zmq.RCVMORE) == 1 do
         query = query .. s:recv()
     end
     print(string.format("Received query: '%s'", query))
diff --git a/examples/subscriber.lua b/examples/subscriber.lua
index d587a84..bec04e9 100644
--- a/examples/subscriber.lua
+++ b/examples/subscriber.lua
@@ -22,7 +22,7 @@ require("zmq")
 
 local ctx = zmq.init(1, 1, 0)
 local s = ctx:socket(zmq.SUB)
-s:setsockopt(zmq.SUBSCRIBE, "")
+s:setopt(zmq.SUBSCRIBE, "")
 s:connect("tcp://localhost:5555")
 while true do
     local msg = s:recv()
diff --git a/perf/local_thr.lua b/perf/local_thr.lua
index 246236a..5f4363f 100644
--- a/perf/local_thr.lua
+++ b/perf/local_thr.lua
@@ -31,7 +31,7 @@ local message_count = tonumber(arg[3])
 
 local ctx = zmq.init(1, 1)
 local s = ctx:socket(zmq.SUB)
-s:setsockopt(zmq.SUBSCRIBE, "");
+s:setopt(zmq.SUBSCRIBE, "");
 s:bind(bind_to)
 
 local msg = s:recv()
diff --git a/zmq.c b/zmq.c
index 37910cd..70ce0d2 100644
--- a/zmq.c
+++ b/zmq.c
@@ -305,14 +305,14 @@ static const luaL_reg ctxmethods[] = {
 };
 
 static const luaL_reg sockmethods[] = {
-    {"close",      Lzmq_close},
-    {"setsockopt", Lzmq_setsockopt},
-    {"getsockopt", Lzmq_getsockopt},
-    {"bind",       Lzmq_bind},
-    {"connect",    Lzmq_connect},
-    {"send",       Lzmq_send},
-    {"recv",       Lzmq_recv},
-    {NULL,         NULL}
+    {"close",   Lzmq_close},
+    {"setopt",  Lzmq_setsockopt},
+    {"getopt",  Lzmq_getsockopt},
+    {"bind",    Lzmq_bind},
+    {"connect", Lzmq_connect},
+    {"send",    Lzmq_send},
+    {"recv",    Lzmq_recv},
+    {NULL,      NULL}
 };
 
 #define set_zmq_const(s) lua_pushinteger(L,ZMQ_##s); lua_setfield(L, -2, #s);