avoid structs with identical name in backends

Reported-by: little.owl

diff --git a/backends/dns.c b/backends/dns.c
index e73119d5c64b3b1fead32d462304f7398428b4df..3fcf670fdcd82532411e8e3de1c1adbcdab89276 100644 (file)
--- a/backends/dns.c
+++ b/backends/dns.c
@@ -22,7 +22,7 @@
 /* A timeout starting when the first successful answer has been received. */
 static int partial_timeout = 5;
 
-struct priv {
+struct priv_dns {
        ares_channel channel;
        fd_set rfds;
        fd_set wfds;
@@ -33,7 +33,7 @@ struct priv {
 void
 register_fds(netresolve_backend_t resolver)
 {
-       struct priv *priv = netresolve_backend_get_priv(resolver);
+       struct priv_dns *priv = netresolve_backend_get_priv(resolver);
        fd_set rfds;
        fd_set wfds;
        int nfds, fd;
@@ -69,7 +69,7 @@ void
 host_callback(void *arg, int status, int timeouts, struct hostent *he)
 {
        netresolve_backend_t resolver = arg;
-       struct priv *priv = netresolve_backend_get_priv(resolver);
+       struct priv_dns *priv = netresolve_backend_get_priv(resolver);
 
        switch (status) {
        case ARES_EDESTRUCTION:
@@ -88,7 +88,7 @@ host_callback(void *arg, int status, int timeouts, struct hostent *he)
 void
 start(netresolve_backend_t resolver, char **settings)
 {
-       struct priv *priv = netresolve_backend_new_priv(resolver, sizeof *priv);
+       struct priv_dns *priv = netresolve_backend_new_priv(resolver, sizeof *priv);
        const char *node = netresolve_backend_get_node(resolver);
        int family = netresolve_backend_get_family(resolver);
        int status;
@@ -125,7 +125,7 @@ fail:
 void
 dispatch(netresolve_backend_t resolver, int fd, int events)
 {
-       struct priv *priv = netresolve_backend_get_priv(resolver);
+       struct priv_dns *priv = netresolve_backend_get_priv(resolver);
 
        int rfd = events & POLLIN ? fd : ARES_SOCKET_BAD;
        int wfd = events & POLLOUT ? fd : ARES_SOCKET_BAD;
@@ -143,7 +143,7 @@ dispatch(netresolve_backend_t resolver, int fd, int events)
 void
 cleanup(netresolve_backend_t resolver)
 {
-       struct priv *priv = netresolve_backend_get_priv(resolver);
+       struct priv_dns *priv = netresolve_backend_get_priv(resolver);
        int fd;
 
        for (fd = 0; fd < priv->nfds; fd++) {

diff --git a/backends/exec.c b/backends/exec.c
index e68b3979f536f15e80ed8e1300a5148b5004fbc9..b9844232a5bb2b4ed828553e88c8c45474666874 100644 (file)
--- a/backends/exec.c
+++ b/backends/exec.c
@@ -29,7 +29,7 @@ struct buffer {
        char *end;
 };
 
-struct priv {
+struct priv_exec {
        int pid;
        struct buffer inbuf;
        int infd;
@@ -80,7 +80,7 @@ err_pipe1:
 }
 
 static void
-send_stdin(netresolve_backend_t resolver, struct priv *priv)
+send_stdin(netresolve_backend_t resolver, struct priv_exec *priv)
 {
        ssize_t size;
 
@@ -100,7 +100,7 @@ send_stdin(netresolve_backend_t resolver, struct priv *priv)
 }
 
 static bool
-received_line(netresolve_backend_t resolver, struct priv *priv, const char *line)
+received_line(netresolve_backend_t resolver, struct priv_exec *priv, const char *line)
 {
        char addrprefix[] = "address ";
        int addrprefixlen = strlen(addrprefix);
@@ -123,7 +123,7 @@ received_line(netresolve_backend_t resolver, struct priv *priv, const char *line
 }
 
 static void
-pickup_stdout(netresolve_backend_t resolver, struct priv *priv)
+pickup_stdout(netresolve_backend_t resolver, struct priv_exec *priv)
 {
        char *nl;
        int size;
@@ -163,7 +163,7 @@ pickup_stdout(netresolve_backend_t resolver, struct priv *priv)
 void
 start(netresolve_backend_t resolver, char **settings)
 {
-       struct priv *priv = netresolve_backend_new_priv(resolver, sizeof *priv);
+       struct priv_exec *priv = netresolve_backend_new_priv(resolver, sizeof *priv);
 
        if (!priv || !start_subprocess(settings, &priv->pid, &priv->infd, &priv->outfd)) {
                netresolve_backend_failed(resolver);
@@ -181,7 +181,7 @@ start(netresolve_backend_t resolver, char **settings)
 void
 dispatch(netresolve_backend_t resolver, int fd, int events)
 {
-       struct priv *priv = netresolve_backend_get_priv(resolver);
+       struct priv_exec *priv = netresolve_backend_get_priv(resolver);
 
        debug("events %d on fd %d\n", events, fd);
 
@@ -201,7 +201,7 @@ dispatch(netresolve_backend_t resolver, int fd, int events)
 void
 cleanup(netresolve_backend_t resolver)
 {
-       struct priv *priv = netresolve_backend_get_priv(resolver);
+       struct priv_exec *priv = netresolve_backend_get_priv(resolver);
 
        netresolve_backend_watch_fd(resolver, priv->infd, 0);
        netresolve_backend_watch_fd(resolver, priv->outfd, 0);

diff --git a/backends/nss.c b/backends/nss.c
index 1f4b900710ea69e28f2ee417d004ee4274fb02d5..476ddcbfea6cd63f5f315010dcd00e3bda03482a 100644 (file)
--- a/backends/nss.c
+++ b/backends/nss.c
@@ -24,7 +24,7 @@
 
 #define SIZE (128*1024)
 
-struct priv {
+struct priv_nss {
        char *name;
        char filename[1024];
        char *api;
@@ -87,7 +87,7 @@ combine_statuses(int s4, int s6)
 }
 
 static void
-try_symbol_pattern(netresolve_backend_t resolver, struct priv *priv, void **f, const char *pattern, const char *api)
+try_symbol_pattern(netresolve_backend_t resolver, struct priv_nss *priv, void **f, const char *pattern, const char *api)
 {
        char symbol[1024];
 
@@ -108,7 +108,7 @@ try_symbol_pattern(netresolve_backend_t resolver, struct priv *priv, void **f, c
 void
 start(netresolve_backend_t resolver, char **settings)
 {
-       struct priv *priv = netresolve_backend_new_priv(resolver, sizeof *priv);
+       struct priv_nss *priv = netresolve_backend_new_priv(resolver, sizeof *priv);
        const char *node = netresolve_backend_get_node(resolver);
        int family = netresolve_backend_get_family(resolver);
        int status = NSS_STATUS_UNAVAIL;