diff options
| author | Kozlov Dmitry <xeb@mail.ru> | 2013-01-24 23:58:56 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2013-01-24 23:58:56 +0400 |
| commit | cf3de06a3346854d770ba147f081e3b22e93c1bc (patch) | |
| tree | 0c1a138d292c140c2547361615bf556ff2b98f9f /accel-pppd/triton | |
| parent | 35b55103979145284d63bc1db4ebd6e9d6666b34 (diff) | |
| download | accel-ppp-cf3de06a3346854d770ba147f081e3b22e93c1bc.tar.gz accel-ppp-cf3de06a3346854d770ba147f081e3b22e93c1bc.zip | |
backport 1.7
* l2tp: Fix allocation checking when adding octets AVP
* cli, tcp: Fix non-NULL terminated string reception
* Fix va_end() missing calls
* chap-secrets: implemented encryption
* auth_pap: make messages like other auth modules
* cli: check xmit_buf is not null at enter to write function
* pppoe: implemented regular expression support
* chap-secrets: implemented encryption
* ippool: fixed initialization order
* optional shaper compiling
* ppp: dns/wins code cleanup
Diffstat (limited to 'accel-pppd/triton')
| -rw-r--r-- | accel-pppd/triton/log.c | 2 | ||||
| -rw-r--r-- | accel-pppd/triton/triton.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/accel-pppd/triton/log.c b/accel-pppd/triton/log.c index 95304284..9226e117 100644 --- a/accel-pppd/triton/log.c +++ b/accel-pppd/triton/log.c @@ -59,6 +59,7 @@ void triton_log_error(const char *fmt,...) va_start(ap, fmt); do_log(f_error, fmt, ap); + va_end(ap); } void triton_log_debug(const char *fmt,...) @@ -70,5 +71,6 @@ void triton_log_debug(const char *fmt,...) va_start(ap, fmt); do_log(f_debug, fmt, ap); + va_end(ap); } diff --git a/accel-pppd/triton/triton.h b/accel-pppd/triton/triton.h index 98955dfc..e47eb369 100644 --- a/accel-pppd/triton/triton.h +++ b/accel-pppd/triton/triton.h @@ -128,6 +128,7 @@ void triton_terminate(void); #define __init __attribute__((constructor)) #define __exit __attribute__((destructor)) #define __export __attribute__((visibility("default"))) +#define __unused __attribute__((unused)) #undef offsetof #ifdef __compiler_offsetof @@ -141,5 +142,6 @@ void triton_terminate(void); (type *)( (char *)__mptr - offsetof(type,member) );}) #define DEFINE_INIT(o, func) static void __init __init__(void){triton_register_init(o,func);} +#define DEFINE_INIT2(o, func) static void __init __init2__(void){triton_register_init(o,func);} #endif |