@@ -406,11 +406,11 @@
 
 		ctx->subformat[ctx->subformatLen - 1] = 's';
 
 		{
 			const of_unichar_t *arg =
-			    va_arg(ctx->arguments, const of_unichar_t*);
+			    va_arg(ctx->arguments, const of_unichar_t *);
 			size_t j, len = of_string_utf32_length(arg);
 			char *buffer;
 
 			if (SIZE_MAX / 4 < len || (SIZE_MAX / 4) - len < 1)
 				return false;
@@ -601,16 +601,16 @@
 		break;
 	case 's':
 		switch (ctx->lengthModifier) {
 		case LENGTH_MODIFIER_NONE:
 			tmpLen = asprintf(&tmp, ctx->subformat,
-			    va_arg(ctx->arguments, const char*));
+			    va_arg(ctx->arguments, const char *));
 			break;
 #ifdef HAVE_WCHAR_T
 		case LENGTH_MODIFIER_L:
 			tmpLen = asprintf(&tmp, ctx->subformat,
-			    va_arg(ctx->arguments, const wchar_t*));
+			    va_arg(ctx->arguments, const wchar_t *));
 			break;
 #endif
 		default:
 			return false;
 		}
@@ -619,45 +619,44 @@
 	case 'p':
 		if (ctx->lengthModifier != LENGTH_MODIFIER_NONE)
 			return false;
 
 		tmpLen = asprintf(&tmp, ctx->subformat,
-		    va_arg(ctx->arguments, void*));
+		    va_arg(ctx->arguments, void *));
 
 		break;
 	case 'n':
 		switch (ctx->lengthModifier) {
 		case LENGTH_MODIFIER_NONE:
-			*va_arg(ctx->arguments, int*) =
-			    (int)ctx->bufferLen;
+			*va_arg(ctx->arguments, int *) = (int)ctx->bufferLen;
 			break;
 		case LENGTH_MODIFIER_HH:
-			*va_arg(ctx->arguments, signed char*) =
+			*va_arg(ctx->arguments, signed char *) =
 			    (signed char)ctx->bufferLen;
 			break;
 		case LENGTH_MODIFIER_H:
-			*va_arg(ctx->arguments, short*) =
+			*va_arg(ctx->arguments, short *) =
 			    (short)ctx->bufferLen;
 			break;
 		case LENGTH_MODIFIER_L:
-			*va_arg(ctx->arguments, long*) =
+			*va_arg(ctx->arguments, long *) =
 			    (long)ctx->bufferLen;
 			break;
 		case LENGTH_MODIFIER_LL:
-			*va_arg(ctx->arguments, long long*) =
+			*va_arg(ctx->arguments, long long *) =
 			    (long long)ctx->bufferLen;
 			break;
 		case LENGTH_MODIFIER_J:
-			*va_arg(ctx->arguments, intmax_t*) =
+			*va_arg(ctx->arguments, intmax_t *) =
 			    (intmax_t)ctx->bufferLen;
 			break;
 		case LENGTH_MODIFIER_Z:
-			*va_arg(ctx->arguments, size_t*) =
+			*va_arg(ctx->arguments, size_t *) =
 			    (size_t)ctx->bufferLen;
 			break;
 		case LENGTH_MODIFIER_T:
-			*va_arg(ctx->arguments, ptrdiff_t*) =
+			*va_arg(ctx->arguments, ptrdiff_t *) =
 			    (ptrdiff_t)ctx->bufferLen;
 			break;
 		default:
 			return false;
 		}
@@ -696,11 +695,11 @@
 	ctx->state = STATE_STRING;
 
 	return true;
 }
 
-static bool (*states[])(struct context*) = {
+static bool (*states[])(struct context *) = {
 	stringState,
 	formatFlagsState,
 	formatFieldWidthState,
 	formatLengthModifierState,
 	formatConversionSpecifierState