summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config.h.cmake6
-rw-r--r--examples/parse_text.c4
-rw-r--r--src/libical/icalparser.c2
-rw-r--r--src/libical/icalrecur.c2
-rw-r--r--src/libicalss/icalclassify.c24
-rw-r--r--src/libicalss/icalspanlist.c2
-rw-r--r--src/libicalvcal/icalvcal.c42
-rw-r--r--src/test/icaltestparser.c6
-rw-r--r--src/test/process.c4
-rw-r--r--src/test/regression-recur.c8
10 files changed, 56 insertions, 44 deletions
diff --git a/config.h.cmake b/config.h.cmake
index c543e89f..2d16a851 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -171,3 +171,9 @@ typedef int pid_t;
#endif
#cmakedefine SIZEOF_TIME_T ${SIZEOF_TIME_T}
+
+#if !defined(_MSC_VER)
+#define _unused(x) (void)x;
+#else
+#define _unused(x)
+#endif
diff --git a/examples/parse_text.c b/examples/parse_text.c
index 75f88f2c..3b6d37b1 100644
--- a/examples/parse_text.c
+++ b/examples/parse_text.c
@@ -22,10 +22,8 @@ char* read_stream(char *s, size_t size, void *d)
return fgets(s, (int)size, (FILE*)d);
}
-void parse_text(int argc, char* argv[])
+void parse_text(char* argv[])
{
- (void)argc;/*unused*/
-
char* line;
FILE* stream;
icalcomponent *c;
diff --git a/src/libical/icalparser.c b/src/libical/icalparser.c
index 65f6efff..1d369c50 100644
--- a/src/libical/icalparser.c
+++ b/src/libical/icalparser.c
@@ -317,7 +317,7 @@ char* parser_get_next_paramvalue(char* line, char **end)
char* icalparser_get_value(char* line, char **end, icalvalue_kind kind)
{
- (void)kind;/*unused*/
+ _unused(kind)
char *str;
size_t length = strlen(line);
diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c
index 85ee8b1c..73683f95 100644
--- a/src/libical/icalrecur.c
+++ b/src/libical/icalrecur.c
@@ -285,7 +285,7 @@ void icalrecur_clause_name_and_value(struct icalrecur_parser *parser,
void icalrecur_add_byrules(struct icalrecur_parser *parser, short *array,
int size, char* vals)
{
- (void)parser;/*unused*/
+ _unused(parser)
char *t, *n;
int i=0;
int sign = 1;
diff --git a/src/libicalss/icalclassify.c b/src/libicalss/icalclassify.c
index b37a1c37..040bec80 100644
--- a/src/libicalss/icalclassify.c
+++ b/src/libicalss/icalclassify.c
@@ -472,9 +472,9 @@ int icalclassify_request_new_organizer(
struct icalclassify_parts *match,
const char* user)
{
- (void)comp;/*unused*/
- (void)match;/*unused*/
- (void)user;/*unused*/
+ _unused(comp)
+ _unused(match)
+ _unused(user)
/* Organizer has changed between match and component */
icalclassify_pre
@@ -487,9 +487,9 @@ int icalclassify_request_status(
struct icalclassify_parts *match,
const char* user)
{
- (void)comp;/*unused*/
- (void)match;/*unused*/
- (void)user;/*unused*/
+ _unused(comp)
+ _unused(match)
+ _unused(user)
icalclassify_pre
icalerror_set_errno(ICAL_UNIMPLEMENTED_ERROR);
@@ -501,9 +501,9 @@ int icalclassify_request_forward(
struct icalclassify_parts *match,
const char* user)
{
- (void)comp;/*unused*/
- (void)match;/*unused*/
- (void)user;/*unused*/
+ _unused(comp)
+ _unused(match)
+ _unused(user)
icalclassify_pre
icalerror_set_errno(ICAL_UNIMPLEMENTED_ERROR);
@@ -515,9 +515,9 @@ int icalclassify_request_freebusy(
struct icalclassify_parts *match,
const char* user)
{
- (void)comp;/*unused*/
- (void)match;/*unused*/
- (void)user;/*unused*/
+ _unused(comp)
+ _unused(match)
+ _unused(user)
icalclassify_pre
icalerror_set_errno(ICAL_UNIMPLEMENTED_ERROR);
diff --git a/src/libicalss/icalspanlist.c b/src/libicalss/icalspanlist.c
index f1cc1fb6..2b1b7668 100644
--- a/src/libicalss/icalspanlist.c
+++ b/src/libicalss/icalspanlist.c
@@ -78,7 +78,7 @@ static void icalspanlist_new_callback(icalcomponent *comp,
struct icaltime_span *span,
void *data)
{
- (void)comp;/*unused*/
+ _unused(comp)
icaltime_span *s;
icalspanlist *sl = (icalspanlist*) data;
diff --git a/src/libicalvcal/icalvcal.c b/src/libicalvcal/icalvcal.c
index 39b75b4e..5263d0e5 100644
--- a/src/libicalvcal/icalvcal.c
+++ b/src/libicalvcal/icalvcal.c
@@ -234,9 +234,9 @@ icalcomponent* icalvcal_convert (VObject *object)
void* comp(int icaltype, VObject *o, icalcomponent *comp,
icalvcal_defaults *defaults)
{
- (void)o;/*unused*/
- (void)comp;/*unused*/
- (void)defaults;/*unused*/
+ _unused(o)
+ _unused(comp)
+ _unused(defaults)
icalcomponent_kind kind = (icalcomponent_kind)icaltype;
@@ -579,7 +579,7 @@ static int get_alarm_properties (icalcomponent *comp, VObject *object,
void* alarm_comp(int icaltype, VObject *o, icalcomponent *comp,
icalvcal_defaults *defaults)
{
- (void)comp;/*unused*/
+ _unused(comp)
/* icalcomponent_kind kind = (icalcomponent_kind)icaltype; */
int is_valid_alarm;
@@ -604,9 +604,9 @@ void* alarm_comp(int icaltype, VObject *o, icalcomponent *comp,
void* transp_prop(int icaltype, VObject *object, icalcomponent *comp,
icalvcal_defaults *defaults)
{
- (void)icaltype;/*unused*/
- (void)comp;/*unused*/
- (void)defaults;/*unused*/
+ _unused(icaltype)
+ _unused(comp)
+ _unused(defaults)
icalproperty *prop = NULL;
char *s;
@@ -631,9 +631,9 @@ void* transp_prop(int icaltype, VObject *object, icalcomponent *comp,
void* sequence_prop(int icaltype, VObject *object, icalcomponent *comp,
icalvcal_defaults *defaults)
{
- (void)icaltype;/*unused*/
- (void)comp;/*unused*/
- (void)defaults;/*unused*/
+ _unused(icaltype)
+ _unused(comp)
+ _unused(defaults)
icalproperty *prop = NULL;
char *s;
@@ -661,8 +661,8 @@ void* sequence_prop(int icaltype, VObject *object, icalcomponent *comp,
void* multivalued_prop(int icaltype, VObject *object, icalcomponent *comp,
icalvcal_defaults *defaults)
{
- (void)comp;/*unused*/
- (void)defaults;/*unused*/
+ _unused(comp)
+ _unused(defaults)
icalproperty_kind kind = (icalproperty_kind)icaltype;
icalproperty *prop = NULL;
@@ -701,8 +701,8 @@ void* multivalued_prop(int icaltype, VObject *object, icalcomponent *comp,
void* status_prop(int icaltype, VObject *object, icalcomponent *comp,
icalvcal_defaults *defaults)
{
- (void)icaltype;/*unused*/
- (void)defaults;/*unused*/
+ _unused(icaltype)
+ _unused(defaults)
icalproperty *prop = NULL;
char *s;
@@ -754,8 +754,8 @@ void* status_prop(int icaltype, VObject *object, icalcomponent *comp,
void* utc_datetime_prop(int icaltype, VObject *object, icalcomponent *comp,
icalvcal_defaults *defaults)
{
- (void)comp;/*unused*/
- (void)defaults;/*unused*/
+ _unused(comp)
+ _unused(defaults)
icalproperty_kind kind = (icalproperty_kind)icaltype;
icalproperty *prop;
@@ -1212,9 +1212,9 @@ static char* rrule_parse_yearly_days (char *s,
void* rule_prop(int icaltype, VObject *object, icalcomponent *comp,
icalvcal_defaults *defaults)
{
- (void)icaltype;/*unused*/
- (void)comp;/*unused*/
- (void)defaults;/*unused*/
+ _unused(icaltype)
+ _unused(comp)
+ _unused(defaults)
/* icalproperty_kind kind = (icalproperty_kind)icaltype;*/
icalproperty *prop = NULL;
@@ -1294,8 +1294,8 @@ void* rule_prop(int icaltype, VObject *object, icalcomponent *comp,
void* dc_prop(int icaltype, VObject *object, icalcomponent *comp,
icalvcal_defaults *defaults)
{
- (void)comp;/*unused*/
- (void)defaults;/*unused*/
+ _unused(comp)
+ _unused(defaults)
icalproperty_kind kind = (icalproperty_kind)icaltype;
icalproperty *prop;
diff --git a/src/test/icaltestparser.c b/src/test/icaltestparser.c
index fd9c8455..60100a90 100644
--- a/src/test/icaltestparser.c
+++ b/src/test/icaltestparser.c
@@ -25,6 +25,10 @@
======================================================================*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <errno.h>
#include <stdio.h>
@@ -90,7 +94,7 @@ char* read_stream(char *s, size_t size, void *d)
int main(int argc, char* argv[])
{
- (void)argc;/*unused*/
+ _unused(argc)
char* line;
FILE* stream;
icalcomponent *c;
diff --git a/src/test/process.c b/src/test/process.c
index 168934fd..1d507bf6 100644
--- a/src/test/process.c
+++ b/src/test/process.c
@@ -47,8 +47,8 @@ void send_message(icalcomponent *reply,const char* this_user)
int main(int argc, char* argv[])
{
- (void)argc;/*unused*/
- (void)argv;/*unused*/
+ _unused(argc)
+ _unused(argv)
icalcomponent *c, *next_c = NULL;
int i=0;
diff --git a/src/test/regression-recur.c b/src/test/regression-recur.c
index aa16c3a4..1947a901 100644
--- a/src/test/regression-recur.c
+++ b/src/test/regression-recur.c
@@ -20,6 +20,10 @@
======================================================================*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <assert.h>
#include <string.h> /* for strdup */
#include <stdlib.h> /* for malloc */
@@ -45,7 +49,7 @@ extern int VERBOSE;
static void sig_alrm(int i){
- (void)i;/*unused*/
+ _unused(i)
fprintf(stderr,"Could not get lock on file\n");
exit(1);
}
@@ -82,7 +86,7 @@ static void recur_callback(icalcomponent *comp,
struct icaltime_span *span,
void *data)
{
- (void)comp;/*unused*/
+ _unused(comp)
int *num_recurs = data;
if (VERBOSE) {
View Lorry Controller Status