revert patch from OPENZAP-12

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@533 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/freetdm/src/include/zap_types.h b/libs/freetdm/src/include/zap_types.h
index ace40c8698a255101a8c7a0cc0f1f02eda83a190..3c04b8db8d450e4ea4d0e3f8d598f70e874f2ff8 100644 (file)
--- a/libs/freetdm/src/include/zap_types.h
+++ b/libs/freetdm/src/include/zap_types.h
@@ -409,7 +409,7 @@ typedef struct zap_io_interface zap_io_interface_t;
 #define ZIO_IO_LOAD_ARGS (zap_io_interface_t **zio)
 #define ZIO_IO_UNLOAD_ARGS (void)
 #define ZIO_SIG_LOAD_ARGS (void)
-#define ZIO_SIG_CONFIGURE_ARGS (zap_span_t *span, zio_signal_cb_t sig_cb, ...)
+#define ZIO_SIG_CONFIGURE_ARGS (zap_span_t *span, zio_signal_cb_t sig_cb, va_list ap)
 #define ZIO_SIG_UNLOAD_ARGS (void)
 
 typedef zap_status_t (*zio_channel_request_t) ZIO_CHANNEL_REQUEST_ARGS ;

diff --git a/libs/freetdm/src/ozmod/ozmod_analog/ozmod_analog.c b/libs/freetdm/src/ozmod/ozmod_analog/ozmod_analog.c
index c149f0cf7ad2583427c80f667f0c1293cad7a142..6bf8b869770678cf865df16d4fa8cac9c02922bd 100644 (file)
--- a/libs/freetdm/src/ozmod/ozmod_analog/ozmod_analog.c
+++ b/libs/freetdm/src/ozmod/ozmod_analog/ozmod_analog.c
@@ -87,7 +87,6 @@ static ZIO_SIG_CONFIGURE_FUNCTION(zap_analog_configure_span)
        uint32_t max_dialstr = 11;
        const char *var, *val;
        int *intval;
-       va_list ap;
 
        assert(sig_cb != NULL);
 
@@ -105,10 +104,9 @@ static ZIO_SIG_CONFIGURE_FUNCTION(zap_analog_configure_span)
        }
 
        analog_data = malloc(sizeof(*analog_data));
-       assert(analog_data != NULL);
        memset(analog_data, 0, sizeof(*analog_data));
+       assert(analog_data != NULL);
 
-       va_start(ap, sig_cb);
        while ((var = va_arg(ap, char *))) {
                if (!strcasecmp(var, "tonemap")) {
                        if (!(val = va_arg(ap, char *))) {
@@ -127,7 +125,6 @@ static ZIO_SIG_CONFIGURE_FUNCTION(zap_analog_configure_span)
                        max_dialstr = *intval;
                }
        }
-       va_end(ap);
 
        span->start = zap_analog_start;
        analog_data->digit_timeout = digit_timeout;

diff --git a/libs/freetdm/src/ozmod/ozmod_isdn/ozmod_isdn.c b/libs/freetdm/src/ozmod/ozmod_isdn/ozmod_isdn.c
index 73ef91f38fe03909dcabc80be6a70949ddea0d28..5e86199d892ec56597d9f4132a038263eacbc4ce 100644 (file)
--- a/libs/freetdm/src/ozmod/ozmod_isdn/ozmod_isdn.c
+++ b/libs/freetdm/src/ozmod/ozmod_isdn/ozmod_isdn.c
@@ -1327,7 +1327,6 @@ static ZIO_SIG_CONFIGURE_FUNCTION(zap_isdn_configure_span)
        char *var, *val;
        Q931Dialect_t dialect = Q931_Dialect_National;
        uint32_t opts = 0;
-       va_list ap;
 
        if (span->signal_type) {
                snprintf(span->last_error, sizeof(span->last_error), "Span is already configured for signalling [%d].", span->signal_type);
@@ -1366,7 +1365,6 @@ static ZIO_SIG_CONFIGURE_FUNCTION(zap_isdn_configure_span)
        isdn_data->mode = Q931_TE;
        dialect = Q931_Dialect_National;
        
-       va_start(ap, sig_cb);
        while((var = va_arg(ap, char *))) {
                if (!strcasecmp(var, "mode")) {
                        if (!(val = va_arg(ap, char *))) {
@@ -1389,7 +1387,6 @@ static ZIO_SIG_CONFIGURE_FUNCTION(zap_isdn_configure_span)
                        opts = isdn_data->opts = *optp;
                }
        }
-       va_end(ap);
 
        span->start = zap_isdn_start;
        isdn_data->sig_cb = sig_cb;

diff --git a/libs/freetdm/src/ozmod/ozmod_ss7_boost/ozmod_ss7_boost.c b/libs/freetdm/src/ozmod/ozmod_ss7_boost/ozmod_ss7_boost.c
index a58781adc53af6035d2f2d353e2cba22342c04c4..7a3e08d2ce82827a5935cdded4058f32370ff15d 100644 (file)
--- a/libs/freetdm/src/ozmod/ozmod_ss7_boost/ozmod_ss7_boost.c
+++ b/libs/freetdm/src/ozmod/ozmod_ss7_boost/ozmod_ss7_boost.c
@@ -1095,9 +1095,7 @@ static ZIO_SIG_CONFIGURE_FUNCTION(zap_ss7_boost_configure_span)
        int local_port = 5300, remote_port = 5300;
        char *var, *val;
        int *intval;
-       va_list ap;
 
-       va_start(ap, sig_cb);
        while((var = va_arg(ap, char *))) {
                if (!strcasecmp(var, "local_ip")) {
                        if (!(val = va_arg(ap, char *))) {
@@ -1121,7 +1119,6 @@ static ZIO_SIG_CONFIGURE_FUNCTION(zap_ss7_boost_configure_span)
                        remote_port = *intval;
                }
        }
-       va_end(ap);
 
 
        if (!local_ip && local_port && remote_ip && remote_port && sig_cb) {