Replace all FREE_AND_NULL* uses to take a type and a free function.

This commit was made mechanically by this perl script:

\#!/usr/bin/perl -w -i -p

next if /^#define FREE_AND_NULL/;
s/\bFREE_AND_NULL\((\w+),/FREE_AND_NULL\(${1}_t, ${1}_free_,/;
s/\bFREE_AND_NULL_UNMATCHED\(/FREE_AND_NULL\(/;

1 files changed, 3 insertions, 3 deletions

diff --git a/src/or/rendservice.h b/src/or/rendservice.h
index 7e9a5d6c51..8d11c76826 100644
--- a/src/or/rendservice.h
+++ b/src/or/rendservice.h
@@ -118,7 +118,7 @@ typedef struct rend_service_t {
 } rend_service_t;
 
 STATIC void rend_service_free_(rend_service_t *service);
-#define rend_service_free(s) FREE_AND_NULL(rend_service, (s))
+#define rend_service_free(s) FREE_AND_NULL(rend_service_t, rend_service_free_, (s))
 STATIC char *rend_service_sos_poison_path(const rend_service_t *service);
 STATIC int rend_service_verify_single_onion_poison(
                                                   const rend_service_t *s,
@@ -190,11 +190,11 @@ rend_service_port_config_t *rend_service_parse_port_config(const char *string,
                                                            char **err_msg_out);
 void rend_service_port_config_free_(rend_service_port_config_t *p);
 #define rend_service_port_config_free(p) \
-  FREE_AND_NULL(rend_service_port_config, (p))
+  FREE_AND_NULL(rend_service_port_config_t, rend_service_port_config_free_, (p))
 
 void rend_authorized_client_free_(rend_authorized_client_t *client);
 #define rend_authorized_client_free(client) \
-  FREE_AND_NULL(rend_authorized_client, (client))
+  FREE_AND_NULL(rend_authorized_client_t, rend_authorized_client_free_, (client))
 
 /** Return value from rend_service_add_ephemeral. */
 typedef enum {