Merge pull request zeromq#209 from zebastian/master

sockopts: code condensed by moving to makros

Author: bluca

options/sockopts.gsl

@@ -44,6 +44,7 @@
 #include "php_zmq.h"
 #include "php_zmq_private.h"
 #include "zmq_object_access.c"
+#include "zmq_sockopts_makros.h"
 
 .echo "generating ../zmq_sockopt.c"
 

options/sockopts_get.gsl

@@ -37,44 +37,27 @@ PHP_METHOD(zmqsocket, getsockopt)
 # ifdef ZMQ_$(NAME)
 
         case ZMQ_$(NAME):
-        {
 .        if mode = "rw" | mode = "r"
 .            gsl from "sockopts_restrict.gsl"
 .-
 .            if php_type = "int"
 .-
-            $(c_type) value;
-            value_len = sizeof($(c_type));
-            if (zmq_getsockopt(intern->socket->z_socket, (int) key, &value, &value_len) != 0) {
-                zend_throw_exception_ex(php_zmq_socket_exception_sc_entry_get (), errno, "Failed to get the option ZMQ::SOCKOPT_$(NAME) value: %s", zmq_strerror(errno));
-                return;
-            }
-            RETURN_LONG(value);
+	        SOCKOPTS_GET_INT($(NAME), $(c_type));
 .-
 .            elsif php_type = "string"
 .-
-            $(c_type) value[$(max_length)];
-            value_len = $(max_length);
-
-            if (zmq_getsockopt(intern->socket->z_socket, (int) key, &value, &value_len) != 0) {
-                zend_throw_exception_ex(php_zmq_socket_exception_sc_entry_get (), errno, "Failed to get the option ZMQ::SOCKOPT_$(NAME) value: %s", zmq_strerror(errno));
-                return;
-            }
-.-
-.                if binary = "yes"
-            RETURN_STRINGL(value, value_len);
-.                else
-            RETURN_STRINGL(value, value_len - 1);
-.                endif /* .if binary = "yes" */
+	        SOCKOPTS_GET_STRING($(NAME), $(max_length), $(binary = 'yes'))
 .-
 .            elsif php_type = "resource"
 .-
+        {
             php_stream *stream = php_zmq_create_zmq_fd(getThis());
             if (stream) {
                 php_stream_to_zval(stream, return_value);
                 return;
             }
             RETURN_FALSE;
+        }
 .-
 .            else
 #error "Unknown type: ($type)"
@@ -85,7 +68,6 @@ PHP_METHOD(zmqsocket, getsockopt)
             return;
 .-
 .        endif /* .if mode = "rw" | mode = "r" */
-        }
         break;
 
 # endif /* ZMQ_$(NAME) */

options/sockopts_set.gsl

@@ -74,32 +74,18 @@ PHP_METHOD(zmqsocket, setsockopt)
 .    for option where !defined (is_alias)
 # ifdef ZMQ_$(NAME)
         case ZMQ_$(NAME):
-        {
 .-
 .        if mode = "rw" | mode = "w"
 .            gsl from "sockopts_restrict.gsl"
 .-
 .            if php_type = "int"
 .-
-            $(c_type) value = ($(c_type)) zval_get_long(zv);
-
-            if (zmq_setsockopt(intern->socket->z_socket, key, &value, sizeof($(c_type))) != 0) {
-                zend_throw_exception_ex(php_zmq_socket_exception_sc_entry_get (), errno, "Failed to set socket ZMQ::SOCKOPT_$(NAME) option: %s", zmq_strerror(errno));
-                return;
-            }
+                SOCKOPTS_SET_INT($(NAME), $(c_type))
 .-
 .            elsif php_type = "string"
 .-
-            int rc;
-            zend_string *str = zval_get_string(zv);
-
-            rc = zmq_setsockopt(intern->socket->z_socket, key, str->val, str->len);
-            zend_string_release(str);
+                SOCKOPTS_SET_STRING($(NAME))
 
-            if (rc != 0) {
-                zend_throw_exception_ex(php_zmq_socket_exception_sc_entry_get (), errno, "Failed to set socket ZMQ::SOCKOPT_$(NAME) option: %s", zmq_strerror(errno));
-                return;
-            }
 .-
 .            elsif php_type = "resource"
 .-
@@ -113,7 +99,6 @@ PHP_METHOD(zmqsocket, setsockopt)
 .-
 .        endif /* .if mode = "rw" | mode = "w" */
 .-
-        }
         break;
 
 # endif /* ifdef ZMQ_$(NAME) */