[ekg2-commit] r3903 - in trunk: ekg plugins/autoresponder plugins/feed plugins/jogger plugins/logs plugins/sim plugins/sms plugins/xosd: trunk/ekg/events.c trunk/plugins/autoresponder/autoresponder.c trunk/plugins/feed/feed.c trunk/plugins/jogger/messages.c trunk/plugins/logs/main.c trunk/plugins/sim/simlite.c trunk/plugins/sms/sms.c trunk/plugins/xosd/xosd.c
SVN commit
svn w toxygen.net
Sob, 15 Mar 2008, 09:48:12 CET
Author: peres
Date: 2008-03-15 09:48:11 +0100 (Sat, 15 Mar 2008)
New Revision: 3903
Modified:
trunk/ekg/events.c
trunk/plugins/autoresponder/autoresponder.c
trunk/plugins/feed/feed.c
trunk/plugins/jogger/messages.c
trunk/plugins/logs/main.c
trunk/plugins/sim/simlite.c
trunk/plugins/sms/sms.c
trunk/plugins/xosd/xosd.c
Log:
Don't localize UNUSED() vars, and use (void) when don't use va_arg.
This shall restore variables/code separation.
Modified: trunk/ekg/events.c
===================================================================
--- trunk/ekg/events.c 2008-03-15 08:28:19 UTC (rev 3902)
+++ trunk/ekg/events.c 2008-03-15 08:48:11 UTC (rev 3903)
@@ -456,7 +456,7 @@
static QUERY(event_protocol_message) {
char *session = *(va_arg(ap, char**));
char *uid = *(va_arg(ap, char**));
- { char ***UNUSED(rcpts) = va_arg(ap, char***); }
+ char ***UNUSED(rcpts) = va_arg(ap, char***);
char *text = *(va_arg(ap, char**));
event_check(session, "protocol-message", uid, text);
Modified: trunk/plugins/autoresponder/autoresponder.c
===================================================================
--- trunk/plugins/autoresponder/autoresponder.c 2008-03-15 08:28:19 UTC (rev 3902)
+++ trunk/plugins/autoresponder/autoresponder.c 2008-03-15 08:48:11 UTC (rev 3903)
@@ -47,14 +47,14 @@
{
char *session = *(va_arg(ap, char**));
char *uid = *(va_arg(ap, char**));
- { char **UNUSED(rcpts) = *(va_arg(ap, char***)); }
+ char **UNUSED(rcpts) = *(va_arg(ap, char***));
char *text = *(va_arg(ap, char**));
- { uint32_t *UNUSED(format)= *(va_arg(ap, uint32_t**));
- time_t UNUSED(sent) = *(va_arg(ap, time_t*)); }
+ uint32_t *UNUSED(format)= *(va_arg(ap, uint32_t**));
+ time_t UNUSED(sent) = *(va_arg(ap, time_t*));
int class = *(va_arg(ap, int*));
- { char *UNUSED(seq) = *(va_arg(ap, char**));
+ char *UNUSED(seq) = *(va_arg(ap, char**));
int UNUSED(dobeep) = *(va_arg(ap, int*));
- int UNUSED(secure) = *(va_arg(ap, int*)); }
+ int UNUSED(secure) = *(va_arg(ap, int*));
session_t *s;
/* if user didn't give us any answer to his question, we assume that sender should rewrite the question string */
Modified: trunk/plugins/feed/feed.c
===================================================================
--- trunk/plugins/feed/feed.c 2008-03-15 08:28:19 UTC (rev 3902)
+++ trunk/plugins/feed/feed.c 2008-03-15 08:48:11 UTC (rev 3903)
@@ -120,7 +120,7 @@
char *body = *(va_arg(ap, char **));
int *new = va_arg(ap, int *); /* 0 - old; 1 - new; 2 - modified */
- { int UNUSED(mtags) = *(va_arg(ap, int *)); }
+ int UNUSED(mtags) = *(va_arg(ap, int *));
session_t *s = session_find(session);
char *tmp;
Modified: trunk/plugins/jogger/messages.c
===================================================================
--- trunk/plugins/jogger/messages.c 2008-03-15 08:28:19 UTC (rev 3902)
+++ trunk/plugins/jogger/messages.c 2008-03-15 08:48:11 UTC (rev 3903)
@@ -84,7 +84,7 @@
const char *uid = *(va_arg(ap, char **));
char **rcpts = *(va_arg(ap, char ***));
const char *msg = *(va_arg(ap, char **));
- { uint32_t **UNUSED(format) = va_arg(ap, uint32_t **); }
+ uint32_t **UNUSED(format) = va_arg(ap, uint32_t **);
time_t sent = *(va_arg(ap, const time_t *));
const int class = *(va_arg(ap, const int *));
const char *seq = *(va_arg(ap, char**));
Modified: trunk/plugins/logs/main.c
===================================================================
--- trunk/plugins/logs/main.c 2008-03-15 08:28:19 UTC (rev 3902)
+++ trunk/plugins/logs/main.c 2008-03-15 08:48:11 UTC (rev 3903)
@@ -854,10 +854,10 @@
char *uid = *(va_arg(ap, char**));
char **rcpts = *(va_arg(ap, char***));
char *text = *(va_arg(ap, char**));
- { uint32_t **UNUSED(format)= va_arg(ap, uint32_t**); }
+ uint32_t **UNUSED(format) = va_arg(ap, uint32_t**);
time_t sent = *(va_arg(ap, time_t*));
int class = *(va_arg(ap, int*));
- { char **UNUSED(seq) = va_arg(ap, char**); }
+ char **UNUSED(seq) = va_arg(ap, char**);
session_t *s = session_find(session); // session pointer
log_window_t *lw;
@@ -952,9 +952,9 @@
char *session = *(va_arg(ap, char**));
char *uid = *(va_arg(ap, char**));
char *text = *(va_arg(ap, char**));
- { int *UNUSED(isour) = va_arg(ap, int*); }
- { int *UNUSED(foryou) = va_arg(ap, int*); }
- { int *UNUSED(private) = va_arg(ap, int*); }
+ int *UNUSED(isour) = va_arg(ap, int*);
+ int *UNUSED(foryou) = va_arg(ap, int*);
+ int *UNUSED(private) = va_arg(ap, int*);
char *channame = *(va_arg(ap, char**));
log_window_t *lw = logs_log_find(session, channame, 1)->lw;
Modified: trunk/plugins/sim/simlite.c
===================================================================
--- trunk/plugins/sim/simlite.c 2008-03-15 08:28:19 UTC (rev 3902)
+++ trunk/plugins/sim/simlite.c 2008-03-15 08:48:11 UTC (rev 3903)
@@ -351,7 +351,7 @@
BIO_write(cbio, &head, sizeof(head));
BIO_write(cbio, message, xstrlen((char*) message));
- { int UNUSED(ret) = BIO_flush(cbio); }
+ (void) BIO_flush(cbio);
/* zachowaj wynik */
res_len = BIO_get_mem_data(mbio, (unsigned char*) &tmp);
@@ -418,7 +418,7 @@
BIO_set_flags(bbio, BIO_FLAGS_BASE64_NO_NL);
BIO_push(bbio, mbio);
BIO_write(mbio, message, xstrlen((char*) message));
- { int UNUSED(ret) = BIO_flush(mbio); }
+ (void) BIO_flush(mbio);
if (BIO_read(bbio, bf_key_rsa, sizeof(bf_key_rsa)) < sizeof(bf_key_rsa)) {
sim_errno = SIM_ERROR_INVALID;
@@ -459,7 +459,7 @@
BIO_push(cbio, mbio);
BIO_write(cbio, buf, len);
- { int UNUSED(ret) = BIO_flush(cbio); }
+ (void) BIO_flush(cbio);
free(buf);
buf = NULL;
Modified: trunk/plugins/sms/sms.c
===================================================================
--- trunk/plugins/sms/sms.c 2008-03-15 08:28:19 UTC (rev 3902)
+++ trunk/plugins/sms/sms.c 2008-03-15 08:48:11 UTC (rev 3903)
@@ -272,7 +272,7 @@
*/
static QUERY(sms_session_status)
{
- { char **UNUSED(session) = va_arg(ap, char**); }
+ char **UNUSED(session) = va_arg(ap, char**);
int status = *(va_arg(ap, int*));
if ((status <= EKG_STATUS_NA) || (status >= EKG_STATUS_AVAIL))
@@ -290,7 +290,7 @@
{
char *session = *(va_arg(ap, char**));
char *uid = *(va_arg(ap, char**));
- { char ***UNUSED(rcpts) = va_arg(ap, char***); }
+ char ***UNUSED(rcpts) = va_arg(ap, char***);
char *text = *(va_arg(ap, char**));
const int status = session_status_get_n(session);
Modified: trunk/plugins/xosd/xosd.c
===================================================================
--- trunk/plugins/xosd/xosd.c 2008-03-15 08:28:19 UTC (rev 3902)
+++ trunk/plugins/xosd/xosd.c 2008-03-15 08:48:11 UTC (rev 3903)
@@ -189,10 +189,10 @@
{
char *session = *(va_arg(ap, char**));
char *uid = *(va_arg(ap, char**));
- { char **UNUSED(rcpts) = *(va_arg(ap, char***)); }
+ char **UNUSED(rcpts) = *(va_arg(ap, char***));
char *text = *(va_arg(ap, char**));
- { uint32_t *UNUSED(format) = *(va_arg(ap, uint32_t**)); }
- { time_t UNUSED(sent) = *(va_arg(ap, time_t*)); }
+ uint32_t *UNUSED(format) = *(va_arg(ap, uint32_t**));
+ time_t UNUSED(sent) = *(va_arg(ap, time_t*));
int class = *(va_arg(ap, int*));
userlist_t *u;
Więcej informacji o liście dyskusyjnej ekg2-commit