tmrec: clang-format for coherent indentation and coding style

src/modules/tmrec/period.c

@@ -25,7 +25,8 @@
 #include <sys/time.h>
 #include <stdlib.h>
 
-enum scales {
+enum scales
+{
 	SCALE_YEAR = 0,
 	SCALE_MONTH,
 	SCALE_WEEK,
@@ -40,17 +41,20 @@ enum scales {
 };
 
 #define MAX_CODES 2
-#define MAX_VALUE_LEN 16 /* for spelled out month names, longest is "September" */
+#define MAX_VALUE_LEN \
+	16 /* for spelled out month names, longest is "September" */
 
-typedef int (*scale_match_func)(const int time_var, const char *from, const char *to);
+typedef int (*scale_match_func)(
+		const int time_var, const char *from, const char *to);
 
-struct scale_definition {
-	scale_match_func	func;
-	const char		*codes[MAX_CODES];
-	int			flags;
+struct scale_definition
+{
+	scale_match_func func;
+	const char *codes[MAX_CODES];
+	int flags;
 };
 
-#define FLAG_INTEGER_ARGS		0x1
+#define FLAG_INTEGER_ARGS 0x1
 
 static int year_fn(const int time_var, const char *from, const char *to);
 static int month_fn(const int time_var, const char *from, const char *to);
@@ -63,43 +67,54 @@ static int minute_fn(const int time_var, const char *from, const char *to);
 static int second_fn(const int time_var, const char *from, const char *to);
 
 static const struct scale_definition defs[SCALE_MAX + 1] = {
-	[SCALE_YEAR  ] = { year_fn,   { "year",   "yr"  }, FLAG_INTEGER_ARGS },
-	[SCALE_MONTH ] = { month_fn,  { "month",  "mo"  }, 0                 },
-	[SCALE_WEEK  ] = { week_fn,   { "week",   "wk"  }, FLAG_INTEGER_ARGS },	/* week of the month */
-	[SCALE_MDAY  ] = { mday_fn,   { "mday",   "md"  }, FLAG_INTEGER_ARGS },	/* day of the month */
-	[SCALE_WDAY  ] = { wday_fn,   { "wday",   "wd"  }, 0                 },	/* day of the week */
-	[SCALE_YDAY  ] = { yday_fn,   { "yday",   "yd"  }, FLAG_INTEGER_ARGS },	/* day of the year */
-	[SCALE_HOUR  ] = { hour_fn,   { "hour",   "hr"  }, FLAG_INTEGER_ARGS },
-	[SCALE_MINUTE] = { minute_fn, { "minute", "min" }, FLAG_INTEGER_ARGS },
-	[SCALE_SECOND] = { second_fn, { "second", "sec" }, FLAG_INTEGER_ARGS },
-	/* XXX week of the year? */
-
-	[SCALE_MAX   ] = { NULL, { NULL, } },
+		[SCALE_YEAR] = {year_fn, {"year", "yr"}, FLAG_INTEGER_ARGS},
+		[SCALE_MONTH] = {month_fn, {"month", "mo"}, 0},
+		[SCALE_WEEK] = {week_fn, {"week", "wk"},
+				FLAG_INTEGER_ARGS}, /* week of the month */
+		[SCALE_MDAY] = {mday_fn, {"mday", "md"},
+				FLAG_INTEGER_ARGS},					 /* day of the month */
+		[SCALE_WDAY] = {wday_fn, {"wday", "wd"}, 0}, /* day of the week */
+		[SCALE_YDAY] = {yday_fn, {"yday", "yd"},
+				FLAG_INTEGER_ARGS}, /* day of the year */
+		[SCALE_HOUR] = {hour_fn, {"hour", "hr"}, FLAG_INTEGER_ARGS},
+		[SCALE_MINUTE] = {minute_fn, {"minute", "min"}, FLAG_INTEGER_ARGS},
+		[SCALE_SECOND] = {second_fn, {"second", "sec"}, FLAG_INTEGER_ARGS},
+		/* XXX week of the year? */
+
+		[SCALE_MAX] = {NULL,
+				{
+						NULL,
+				}},
 };
 
-static const char *months[12] = { "jan", "feb", "mar", "apr", "may", "jun", "jul", "aug",
-	"sep", "oct", "nov", "dec" };
-static const char *weekdays[7] = { "su", "mo", "tu", "we", "th", "fr", "sa" };
+static const char *months[12] = {"jan", "feb", "mar", "apr", "may", "jun",
+		"jul", "aug", "sep", "oct", "nov", "dec"};
+static const char *weekdays[7] = {"su", "mo", "tu", "we", "th", "fr", "sa"};
 
-static void get_time_vars(int time_vars[SCALE_MAX], time_t t) {
+static void get_time_vars(int time_vars[SCALE_MAX], time_t t)
+{
 	struct tm tm;
 
 	localtime_r(&t, &tm);
 
-	time_vars[SCALE_YEAR]   = tm.tm_year + 1900;
-	time_vars[SCALE_MONTH]  = tm.tm_mon + 1;
-	time_vars[SCALE_WEEK]   = (tm.tm_mday - 1 + (tm.tm_wday - tm.tm_mday + 1) % 7) / 7 + 1;
-	time_vars[SCALE_MDAY]   = tm.tm_mday;
-	time_vars[SCALE_WDAY]   = tm.tm_wday + 1;
-	time_vars[SCALE_YDAY]   = tm.tm_yday + 1;
-	time_vars[SCALE_HOUR]   = tm.tm_hour;
+	time_vars[SCALE_YEAR] = tm.tm_year + 1900;
+	time_vars[SCALE_MONTH] = tm.tm_mon + 1;
+	time_vars[SCALE_WEEK] =
+			(tm.tm_mday - 1 + (tm.tm_wday - tm.tm_mday + 1) % 7) / 7 + 1;
+	time_vars[SCALE_MDAY] = tm.tm_mday;
+	time_vars[SCALE_WDAY] = tm.tm_wday + 1;
+	time_vars[SCALE_YDAY] = tm.tm_yday + 1;
+	time_vars[SCALE_HOUR] = tm.tm_hour;
 	time_vars[SCALE_MINUTE] = tm.tm_min;
 	time_vars[SCALE_SECOND] = tm.tm_sec;
 }
 
-#define WS_SKIP() while (*p == ' ') p++;
+#define WS_SKIP()    \
+	while(*p == ' ') \
+		p++;
 
-int in_period(time_t t, const char *p) {
+int in_period(time_t t, const char *p)
+{
 	int time_vars[SCALE_MAX];
 	int scale_results[SCALE_MAX];
 	int scale, j, len, res;
@@ -107,34 +122,34 @@ int in_period(time_t t, const char *p) {
 	char from[MAX_VALUE_LEN], to[MAX_VALUE_LEN], *str;
 
 	/* If no period is given or string is empty, the time always matches */
-	if (!p)
+	if(!p)
 		return 1;
 	WS_SKIP();
-	if (!*p)
+	if(!*p)
 		return 1;
 
 	/* If "none" or "never" is given, time never matches */
-	if (!strcasecmp(p, "none") || !strcasecmp(p, "never"))
+	if(!strcasecmp(p, "none") || !strcasecmp(p, "never"))
 		return 0;
 
 	get_time_vars(time_vars, t);
 
 	/* Loop through all sub-periods, separated by commas.
 	   string :=  PERIOD [, PERIOD ... ] */
-	while (1) {
+	while(1) {
 		memset(scale_results, -1, sizeof(scale_results));
 
 		/* Each sub-period consists of one or more scales, separated by spaces.
 		   PERIOD := SCALE { VALUES } [ SCALE { VALUES } ... ] */
-		while (1) {
+		while(1) {
 			/* XXX could do some hashing here */
-			for (scale = 0; scale < SCALE_MAX; scale++) {
-				for (j = 0; j < MAX_CODES; j++) {
+			for(scale = 0; scale < SCALE_MAX; scale++) {
+				for(j = 0; j < MAX_CODES; j++) {
 					c = defs[scale].codes[j];
 					len = strlen(c);
-					if (strncasecmp(p, c, len))
+					if(strncasecmp(p, c, len))
 						continue;
-					if (p[len] == ' ' || p[len] == '{')
+					if(p[len] == ' ' || p[len] == '{')
 						goto found_scale;
 				}
 			}
@@ -142,24 +157,24 @@ int in_period(time_t t, const char *p) {
 			/* No valid scale definition found, syntax error */
 			return -1;
 
-found_scale:
+		found_scale:
 			/* Skip over scale name, whitespace and brace */
 			p += len;
 			WS_SKIP();
-			if (*p != '{')
+			if(*p != '{')
 				return -1; /* Syntax error */
 			p++;
 			WS_SKIP();
 
 			/* Keep track of what we've found */
-			if (scale_results[scale] == -1)
+			if(scale_results[scale] == -1)
 				scale_results[scale] = 0;
-			else if (scale_results[scale] == 1) {
+			else if(scale_results[scale] == 1) {
 				/* We already have a valid match for this scale. Skip
 				   over all this nonsense then. */
-				while (*p && *p != '}')
+				while(*p && *p != '}')
 					p++;
-				if (!*p)
+				if(!*p)
 					return -1; /* Syntax error */
 				goto close_brace;
 			}
@@ -169,27 +184,27 @@ found_scale:
 			   VALUES := ( VALUE | RANGE ) [ ( VALUE | RANGE ) ... ]
 			   RANGE := VALUE - VALUE */
 
-			while (1) {
+			while(1) {
 				str = from;
 				len = sizeof(from) - 1;
 				*from = *to = '\0';
-				while (1) {
-					switch (*p) {
+				while(1) {
+					switch(*p) {
 						case '\0':
 							return -1; /* Syntax error */
 
 						case ' ':
 							WS_SKIP();
 							/* Here, it's either a hyphen or end of value/range */
-							if (*p == '-')
+							if(*p == '-')
 								goto hyphen;
 							break;
 
 						case '-':
-hyphen:
-							if (!*from)
+						hyphen:
+							if(!*from)
 								return -1; /* Range given as "-foo", syntax error */
-							if (*to)
+							if(*to)
 								return -1; /* Range given as "foo-bar-baz", syntax error */
 							/* Terminate "from" string and init for "to" */
 							*str = '\0';
@@ -204,9 +219,10 @@ hyphen:
 
 						default:
 							/* everything else gets copied and lowercased */
-							if (len <= 0)
+							if(len <= 0)
 								return -1; /* String too long, syntax error */
-							*str++ = *p++ | 0x20;	/* works for letters and digits */
+							*str++ = *p++
+									 | 0x20; /* works for letters and digits */
 							len--;
 							continue;
 					}
@@ -217,44 +233,44 @@ hyphen:
 
 				/* Finished parsing out value or range. An empty result
 				   is valid, e.g. at the end of the list for the scale */
-				if (!*from) {
-					if (*p == '}')
+				if(!*from) {
+					if(*p == '}')
 						break;
 					continue;
 				}
 				a1 = from;
 				a2 = *to ? to : NULL;
-				if ((defs[scale].flags & FLAG_INTEGER_ARGS)) {
-					a1 = (void *) atol(a1);
-					a2 = (void *) (a2 ? atol(a2) : -1);
+				if((defs[scale].flags & FLAG_INTEGER_ARGS)) {
+					a1 = (void *)atol(a1);
+					a2 = (void *)(a2 ? atol(a2) : -1);
 				}
 				res = defs[scale].func(time_vars[scale], a1, a2);
 				printf("result: %i\n", res);
 
-				if (res == -1)
+				if(res == -1)
 					return -1; /* Syntax error */
-				else if (res == 1)
+				else if(res == 1)
 					scale_results[scale] = 1;
 			}
 
-close_brace:
+		close_brace:
 			p++;
 
 			/* Finished with one scale, braces closed. See if there's any more */
 			WS_SKIP();
-			if (!*p || *p == ',') {
+			if(!*p || *p == ',') {
 				/* Nope! Evaluate our result */
-				for (scale = 0; scale < SCALE_MAX; scale++) {
-					if (scale_results[scale] == 0)
+				for(scale = 0; scale < SCALE_MAX; scale++) {
+					if(scale_results[scale] == 0)
 						goto no_match;
 				}
 
 				/* All scales that were given matched! We're done! */
 				return 1;
 
-no_match:
+			no_match:
 				/* No luck, try next one if there are any more */
-				if (*p == ',') {
+				if(*p == ',') {
 					p++;
 					WS_SKIP();
 					break;
@@ -268,123 +284,135 @@ no_match:
 	}
 }
 
-static int generic_fn(const int time_var, const long f, long t, const long min, const long max) {
-	if (t == -1)
+static int generic_fn(const int time_var, const long f, long t, const long min,
+		const long max)
+{
+	if(t == -1)
 		t = f;
 
-	if (f < min || f > max)
+	if(f < min || f > max)
 		return -1;
-	if (t < min || t > max)
+	if(t < min || t > max)
 		return -1;
 
-	if (f > t) {
-		if (f <= time_var || t >= time_var)
+	if(f > t) {
+		if(f <= time_var || t >= time_var)
 			return 1;
-	}
-	else if (f <= time_var && time_var <= t)
+	} else if(f <= time_var && time_var <= t)
 		return 1;
 	return 0;
 }
 
-static int generic_named_fn(const int time_var, const char *from, const char *to,
-		const char **array, int arr_len, int str_len) {
+static int generic_named_fn(const int time_var, const char *from,
+		const char *to, const char **array, int arr_len, int str_len)
+{
 
 	int i, f = 0, t = 0;
 
 	f = atoi(from);
-	if (!f)
-		for (i = 0; i < arr_len; i++)
-			if (!strncmp(array[i], from, str_len)) {
+	if(!f)
+		for(i = 0; i < arr_len; i++)
+			if(!strncmp(array[i], from, str_len)) {
 				f = i + 1;
 				break;
 			}
-	if (!f)
+	if(!f)
 		return -1;
 
-	if (!to)
+	if(!to)
 		t = f;
 	else {
 		t = atoi(to);
-		if (!t)
-			for (i = 0; i < arr_len; i++)
-				if (!strncmp(array[i], to, str_len)) {
+		if(!t)
+			for(i = 0; i < arr_len; i++)
+				if(!strncmp(array[i], to, str_len)) {
 					t = i + 1;
 					break;
 				}
-		if (!t)
+		if(!t)
 			return -1;
 	}
 
 	return generic_fn(time_var, f, t, 1, arr_len);
 }
 
-static int year_fn(const int time_var, const char *from, const char *to) {
+static int year_fn(const int time_var, const char *from, const char *to)
+{
 	long f, t, c;
-	printf("%s %i %li %li\n", __FUNCTION__, time_var, (long) from, (long) to);
+	printf("%s %i %li %li\n", __FUNCTION__, time_var, (long)from, (long)to);
 
-	f = (long) from;
-	t = (long) to;
+	f = (long)from;
+	t = (long)to;
 
-	if (t == -1)
+	if(t == -1)
 		t = f;
 
-	c = time_var / 100;	
+	c = time_var / 100;
 
-	if (t < 0)
+	if(t < 0)
 		return -1;
-	else if (t <= 99)
+	else if(t <= 99)
 		t += c;
-	else if (t < 1970)
+	else if(t < 1970)
 		return -1;
 
-	if (f < 0)
+	if(f < 0)
 		return -1;
-	else if (f <= 99)
+	else if(f <= 99)
 		f += c;
-	else if (f < 1970)
+	else if(f < 1970)
 		return -1;
 
-	if (time_var >= f && time_var <= t)
+	if(time_var >= f && time_var <= t)
 		return 1;
 	return 0;
 }
 
-static int month_fn(const int time_var, const char *from, const char *to) {
+static int month_fn(const int time_var, const char *from, const char *to)
+{
 	printf("%s %i '%s' '%s'\n", __FUNCTION__, time_var, from, to);
 	return generic_named_fn(time_var, from, to, months, 12, 3);
 }
 
-static int week_fn(const int time_var, const char *from, const char *to) {
-	printf("%s %i %li %li\n", __FUNCTION__, time_var, (long) from, (long) to);
-	return generic_fn(time_var, (long) from, (long) to, 1, 6);
+static int week_fn(const int time_var, const char *from, const char *to)
+{
+	printf("%s %i %li %li\n", __FUNCTION__, time_var, (long)from, (long)to);
+	return generic_fn(time_var, (long)from, (long)to, 1, 6);
 }
 
-static int mday_fn(const int time_var, const char *from, const char *to) {
-	printf("%s %i %li %li\n", __FUNCTION__, time_var, (long) from, (long) to);
-	return generic_fn(time_var, (long) from, (long) to, 1, 31);
+static int mday_fn(const int time_var, const char *from, const char *to)
+{
+	printf("%s %i %li %li\n", __FUNCTION__, time_var, (long)from, (long)to);
+	return generic_fn(time_var, (long)from, (long)to, 1, 31);
 }
 
-static int wday_fn(const int time_var, const char *from, const char *to) {
+static int wday_fn(const int time_var, const char *from, const char *to)
+{
 	printf("%s %i '%s' '%s'\n", __FUNCTION__, time_var, from, to);
 	return generic_named_fn(time_var, from, to, weekdays, 7, 2);
 }
 
-static int yday_fn(const int time_var, const char *from, const char *to) {
-	printf("%s %i %li %li\n", __FUNCTION__, time_var, (long) from, (long) to);
-	return generic_fn(time_var, (long) from, (long) to, 1, 366);
+static int yday_fn(const int time_var, const char *from, const char *to)
+{
+	printf("%s %i %li %li\n", __FUNCTION__, time_var, (long)from, (long)to);
+	return generic_fn(time_var, (long)from, (long)to, 1, 366);
 }
 
-static int hour_fn(const int time_var, const char *from, const char *to) {
-	printf("%s %i %li %li\n", __FUNCTION__, time_var, (long) from, (long) to);
-	return generic_fn(time_var, (long) from, (long) to, 0, 23);
+static int hour_fn(const int time_var, const char *from, const char *to)
+{
+	printf("%s %i %li %li\n", __FUNCTION__, time_var, (long)from, (long)to);
+	return generic_fn(time_var, (long)from, (long)to, 0, 23);
 }
 
-static int minute_fn(const int time_var, const char *from, const char *to) {
-	printf("%s %i %li %li\n", __FUNCTION__, time_var, (long) from, (long) to);
-	return generic_fn(time_var, (long) from, (long) to, 0, 59);
+static int minute_fn(const int time_var, const char *from, const char *to)
+{
+	printf("%s %i %li %li\n", __FUNCTION__, time_var, (long)from, (long)to);
+	return generic_fn(time_var, (long)from, (long)to, 0, 59);
 }
 
-static int second_fn(const int time_var, const char *from, const char *to) {
-	printf("%s %i %li %li\n", __FUNCTION__, time_var, (long) from, (long) to);
-	return generic_fn(time_var, (long) from, (long) to, 0, 60); /* allow for leap seconds */
+static int second_fn(const int time_var, const char *from, const char *to)
+{
+	printf("%s %i %li %li\n", __FUNCTION__, time_var, (long)from, (long)to);
+	return generic_fn(
+			time_var, (long)from, (long)to, 0, 60); /* allow for leap seconds */
 }

src/modules/tmrec/tmrec_mod.c

@@ -45,64 +45,57 @@
 
 MODULE_VERSION
 
-static int  mod_init(void);
-static int  child_init(int);
+static int mod_init(void);
+static int child_init(int);
 static void mod_destroy(void);
 
-static int w_tmrec_match(struct sip_msg* msg, char* rec, char* t);
-static int fixup_tmrec_match(void** param, int param_no);
-static int w_is_leap_year(struct sip_msg* msg, char* t, char* p2);
-static int fixup_is_leap_year(void** param, int param_no);
-static int fixup_time_period_match(void** param, int param_no);
-static int w_time_period_match(struct sip_msg* msg, char* period, char* t);
+static int w_tmrec_match(struct sip_msg *msg, char *rec, char *t);
+static int fixup_tmrec_match(void **param, int param_no);
+static int w_is_leap_year(struct sip_msg *msg, char *t, char *p2);
+static int fixup_is_leap_year(void **param, int param_no);
+static int fixup_time_period_match(void **param, int param_no);
+static int w_time_period_match(struct sip_msg *msg, char *period, char *t);
 
 int tmrec_wday = 0;
 char tmrec_separator = '|';
 char *tmrec_separator_param = NULL;
 
-static cmd_export_t cmds[]={
-	{"tmrec_match", (cmd_function)w_tmrec_match, 1, fixup_tmrec_match,
-		0, ANY_ROUTE},
-	{"tmrec_match", (cmd_function)w_tmrec_match, 2, fixup_tmrec_match,
-		0, ANY_ROUTE},
-	{"is_leap_year", (cmd_function)w_is_leap_year, 0, fixup_is_leap_year,
-		0, ANY_ROUTE},
-	{"is_leap_year", (cmd_function)w_is_leap_year, 1, fixup_is_leap_year,
-		0, ANY_ROUTE},
-	{"time_period_match", (cmd_function)w_time_period_match, 1, fixup_time_period_match,
-		0, ANY_ROUTE},
-	{"time_period_match", (cmd_function)w_time_period_match, 2, fixup_time_period_match,
-		0, ANY_ROUTE},
-	{0, 0, 0, 0, 0, 0}
-};
-
-static param_export_t params[]={
-	{"wday",		INT_PARAM,   &tmrec_wday},
-	{"separator",   PARAM_STRING,   &tmrec_separator_param},
-	{0, 0, 0}
-};
+static cmd_export_t cmds[] = {{"tmrec_match", (cmd_function)w_tmrec_match, 1,
+									  fixup_tmrec_match, 0, ANY_ROUTE},
+		{"tmrec_match", (cmd_function)w_tmrec_match, 2, fixup_tmrec_match, 0,
+				ANY_ROUTE},
+		{"is_leap_year", (cmd_function)w_is_leap_year, 0, fixup_is_leap_year, 0,
+				ANY_ROUTE},
+		{"is_leap_year", (cmd_function)w_is_leap_year, 1, fixup_is_leap_year, 0,
+				ANY_ROUTE},
+		{"time_period_match", (cmd_function)w_time_period_match, 1,
+				fixup_time_period_match, 0, ANY_ROUTE},
+		{"time_period_match", (cmd_function)w_time_period_match, 2,
+				fixup_time_period_match, 0, ANY_ROUTE},
+		{0, 0, 0, 0, 0, 0}};
+
+static param_export_t params[] = {{"wday", INT_PARAM, &tmrec_wday},
+		{"separator", PARAM_STRING, &tmrec_separator_param}, {0, 0, 0}};
 
 struct module_exports exports = {
-	"tmrec",
-	DEFAULT_DLFLAGS, /* dlopen flags */
-	cmds,            /* exported functions */
-	params,          /* exported parameters */
-	0,               /* exported rpc functions */
-	0,               /* exported pseudo-variables */
-	0,               /* response function */
-	mod_init,        /* module init function */
-	child_init,      /* per child init function */
-	mod_destroy      /* destroy function */
+		"tmrec", DEFAULT_DLFLAGS, /* dlopen flags */
+		cmds,					  /* exported functions */
+		params,					  /* exported parameters */
+		0,						  /* exported rpc functions */
+		0,						  /* exported pseudo-variables */
+		0,						  /* response function */
+		mod_init,				  /* module init function */
+		child_init,				  /* per child init function */
+		mod_destroy				  /* destroy function */
 };
 
 
-
 /**
  * init module function
  */
 static int mod_init(void)
 {
-	if(tmrec_separator_param!=NULL)
+	if(tmrec_separator_param != NULL)
 		tmrec_separator = tmrec_separator_param[0];
 	return 0;
 }
@@ -112,7 +105,7 @@ static int mod_init(void)
  */
 static int child_init(int rank)
 {
-	if (rank!=PROC_MAIN)
+	if(rank != PROC_MAIN)
 		return 0;
 
 	return 0;
@@ -125,19 +118,17 @@ static void mod_destroy(void)
 	return;
 }
 
-static int w_is_leap_year(struct sip_msg* msg, char* t, char* str2)
+static int w_is_leap_year(struct sip_msg *msg, char *t, char *str2)
 {
 	time_t tv;
 	struct tm tb;
 	int y;
 
-	if(msg==NULL)
+	if(msg == NULL)
 		return -1;
 
-	if(t!=NULL)
-	{
-		if(fixup_get_ivalue(msg, (gparam_t*)t, &y)!=0)
-		{
+	if(t != NULL) {
+		if(fixup_get_ivalue(msg, (gparam_t *)t, &y) != 0) {
 			LM_ERR("invalid time parameter value\n");
 			return -1;
 		}
@@ -152,7 +143,7 @@ static int w_is_leap_year(struct sip_msg* msg, char* t, char* str2)
 	return -1;
 }
 
-static int ki_is_leap_year_now(sip_msg_t* msg)
+static int ki_is_leap_year_now(sip_msg_t *msg)
 {
 	time_t tv;
 	struct tm tb;
@@ -167,31 +158,31 @@ static int ki_is_leap_year_now(sip_msg_t* msg)
 	return -1;
 }
 
-static int ki_is_leap_year(sip_msg_t* msg, int y)
+static int ki_is_leap_year(sip_msg_t *msg, int y)
 {
 	if(tr_is_leap_year(y))
 		return 1;
 	return -1;
 }
 
-static int fixup_is_leap_year(void** param, int param_no)
+static int fixup_is_leap_year(void **param, int param_no)
 {
-	if(param_no==1)
+	if(param_no == 1)
 		return fixup_igp_null(param, param_no);
 
 	return 0;
 }
 
-static int ki_tmrec_match_timestamp(sip_msg_t* msg, str *rv, int ti)
+static int ki_tmrec_match_timestamp(sip_msg_t *msg, str *rv, int ti)
 {
 	time_t tv;
 	ac_tm_t act;
 	tmrec_t tmr;
 
-	if(msg==NULL)
+	if(msg == NULL)
 		return -1;
 
-	if(ti!=0) {
+	if(ti != 0) {
 		tv = (time_t)ti;
 	} else {
 		tv = time(NULL);
@@ -200,19 +191,19 @@ static int ki_tmrec_match_timestamp(sip_msg_t* msg, str *rv, int ti)
 	memset(&tmr, 0, sizeof(tmr));
 
 	/* parse time recurrence definition */
-	if(tr_parse_recurrence_string(&tmr, rv->s, tmrec_separator)<0)
+	if(tr_parse_recurrence_string(&tmr, rv->s, tmrec_separator) < 0)
 		return -1;
 
 	/* if there is no dstart, timerec is valid */
-	if (tmr.dtstart==0)
+	if(tmr.dtstart == 0)
 		goto done;
 
 	/* set current time */
-	if (ac_tm_set_time(&act, tv)<0)
+	if(ac_tm_set_time(&act, tv) < 0)
 		goto error;
 
 	/* match the specified recurence */
-	if (tr_check_recurrence(&tmr, &act, 0)!=0)
+	if(tr_check_recurrence(&tmr, &act, 0) != 0)
 		goto error;
 
 done:
@@ -226,26 +217,23 @@ error:
 	return -1;
 }
 
-static int ki_tmrec_match(sip_msg_t* msg, str *rv)
+static int ki_tmrec_match(sip_msg_t *msg, str *rv)
 {
 	return ki_tmrec_match_timestamp(msg, rv, 0);
 }
 
-static int w_tmrec_match(struct sip_msg* msg, char* rec, char* t)
+static int w_tmrec_match(struct sip_msg *msg, char *rec, char *t)
 {
 	str rv;
 	int ti = 0;
 
-	if(fixup_get_svalue(msg, (gparam_t*)rec, &rv)!=0)
-	{
+	if(fixup_get_svalue(msg, (gparam_t *)rec, &rv) != 0) {
 		LM_ERR("invalid time recurrence parameter value\n");
 		return -1;
 	}
 
-	if(t!=NULL)
-	{
-		if(fixup_get_ivalue(msg, (gparam_t*)t, &ti)!=0)
-		{
+	if(t != NULL) {
+		if(fixup_get_ivalue(msg, (gparam_t *)t, &ti) != 0) {
 			LM_ERR("invalid time stamp parameter value\n");
 			return -1;
 		}
@@ -254,53 +242,48 @@ static int w_tmrec_match(struct sip_msg* msg, char* rec, char* t)
 	return ki_tmrec_match_timestamp(msg, &rv, ti);
 }
 
-static int fixup_tmrec_match(void** param, int param_no)
+static int fixup_tmrec_match(void **param, int param_no)
 {
-	if(param_no==1)
-	{
-		if(fixup_spve_null(param, 1)<0)
+	if(param_no == 1) {
+		if(fixup_spve_null(param, 1) < 0)
 			return -1;
 		return 0;
-	} else if(param_no==2) {
-		if(fixup_igp_null(param, 1)<0)
+	} else if(param_no == 2) {
+		if(fixup_igp_null(param, 1) < 0)
 			return -1;
 	}
 	return 0;
 }
 
-static int fixup_time_period_match(void** param, int param_no)
+static int fixup_time_period_match(void **param, int param_no)
 {
-	if(param_no==1)
-	{
-		if(fixup_spve_null(param, 1)<0)
+	if(param_no == 1) {
+		if(fixup_spve_null(param, 1) < 0)
 			return -1;
 		return 0;
-	} else if(param_no==2) {
-		if(fixup_igp_null(param, 1)<0)
+	} else if(param_no == 2) {
+		if(fixup_igp_null(param, 1) < 0)
 			return -1;
 	}
 	return 0;
 }
 
-static int w_time_period_match(struct sip_msg* msg, char* period, char* t)
+static int w_time_period_match(struct sip_msg *msg, char *period, char *t)
 {
 	str rv;
 	time_t tv;
 	int ti;
 
-	if(msg==NULL)
+	if(msg == NULL)
 		return -2;
 
-	if(fixup_get_svalue(msg, (gparam_t*)period, &rv)!=0)
-	{
+	if(fixup_get_svalue(msg, (gparam_t *)period, &rv) != 0) {
 		LM_ERR("invalid period parameter value\n");
 		return -3;
 	}
 
-	if(t!=NULL)
-	{
-		if(fixup_get_ivalue(msg, (gparam_t*)t, &ti)!=0)
-		{
+	if(t != NULL) {
+		if(fixup_get_ivalue(msg, (gparam_t *)t, &ti) != 0) {
 			LM_ERR("invalid time stamp parameter value\n");
 			return -4;
 		}
@@ -309,26 +292,26 @@ static int w_time_period_match(struct sip_msg* msg, char* period, char* t)
 		tv = time(NULL);
 	}
 
-	if (in_period(tv, rv.s))
+	if(in_period(tv, rv.s))
 		return 1;
 	return -1;
 }
 
-static int ki_time_period_match_timestamp(sip_msg_t* msg, str* period, int ti)
+static int ki_time_period_match_timestamp(sip_msg_t *msg, str *period, int ti)
 {
 	time_t tv;
 
-	if(ti!=0) {
+	if(ti != 0) {
 		tv = (time_t)ti;
 	} else {
 		tv = time(NULL);
 	}
-	if (in_period(tv, period->s))
+	if(in_period(tv, period->s))
 		return 1;
 	return -1;
 }
 
-static int ki_time_period_match(sip_msg_t* msg, str* period)
+static int ki_time_period_match(sip_msg_t *msg, str *period)
 {
 	return ki_time_period_match_timestamp(msg, period, 0);
 }