remove __match_proto

src/padding.h

@@ -44,7 +44,7 @@ pad(struct ws *ws, void *src, size_t len, size_t blocklen, size_t *newlen,
 	return dst;
 }
 
-static void *  __match_proto__(pad_f)
+static void *
 pad_pkcs7(struct ws *ws, void *src, size_t len, size_t blocklen, size_t *newlen)
 {
 	size_t padlen;
@@ -58,7 +58,7 @@ pad_pkcs7(struct ws *ws, void *src, size_t len, size_t blocklen, size_t *newlen)
 	return dst;
 }
 
-static void *  __match_proto__(pad_f)
+static void *
 pad_iso7816(struct ws *ws, void *src, size_t len, size_t blocklen,
 	    size_t *newlen)
 {
@@ -74,7 +74,7 @@ pad_iso7816(struct ws *ws, void *src, size_t len, size_t blocklen,
 	return dst;
 }
 
-static void *  __match_proto__(pad_f)
+static void *
 pad_x923(struct ws *ws, void *src, size_t len, size_t blocklen, size_t *newlen)
 {
 	size_t padlen;
@@ -97,7 +97,7 @@ static pad_f * const padf[] = {
 
 typedef ssize_t unpadlen_f(void *plaintext, int cipherlen, size_t blocklen);
 
-static ssize_t  __match_proto__(unpadlen_f)
+static ssize_t
 unpadlen_pkcs7(void *plaintext, int cipherlen, size_t blocklen)
 {
 	uint8_t padlen = ((uint8_t *)plaintext)[cipherlen-1];
@@ -110,7 +110,7 @@ unpadlen_pkcs7(void *plaintext, int cipherlen, size_t blocklen)
 	return cipherlen - padlen;
 }
 
-static ssize_t  __match_proto__(unpadlen_f)
+static ssize_t
 unpadlen_iso7816(void *plaintext, int cipherlen, size_t blocklen)
 {
 	(void) blocklen;
@@ -121,7 +121,7 @@ unpadlen_iso7816(void *plaintext, int cipherlen, size_t blocklen)
 	return i;
 }
 
-static ssize_t  __match_proto__(unpadlen_f)
+static ssize_t
 unpadlen_x923(void *plaintext, int cipherlen, size_t blocklen)
 {
 	uint8_t padlen = ((uint8_t *)plaintext)[cipherlen-1];

src/vmod_gcrypt.c

@@ -130,7 +130,7 @@ errmsg(VRT_CTX, const char *fmt, ...)
 
 /* Event function */
 
-static void __match_proto__(gcry_handler_log_t)
+static void
 gcrypt_logger(void *priv, int level, const char *fmt, va_list args)
 {
 	enum VSL_tag_e tag = SLT_Debug;
@@ -169,7 +169,7 @@ gcrypt_logger(void *priv, int level, const char *fmt, va_list args)
 	VSLv(tag, 0, fmt, args);
 }
 
-static void  __match_proto__(gcry_handler_error_t)
+static void
 gcrypt_fatal(void *priv, int err, const char *text)
 {
 	(void) priv;
@@ -180,7 +180,7 @@ gcrypt_fatal(void *priv, int err, const char *text)
 	AZ(text);
 }
 
-int __match_proto__(vmod_event_f)
+int
 event(VRT_CTX, struct vmod_priv *priv, enum vcl_event_e e)
 {
 	(void) ctx;