teamspeak2: malloc + memset -> calloc

[collectd.git] / src / teamspeak2.c

diff --git a/src/teamspeak2.c b/src/teamspeak2.c
index 56e8d14e968642d4f632542ac8f9047a3562bf0d..263863b93c8a695e002191fa70cc306d70b30fbb 100644 (file)
--- a/src/teamspeak2.c
+++ b/src/teamspeak2.c
@@ -83,13 +83,12 @@ static int tss2_add_vserver (int vserver_port)
        }
 
        /* Allocate memory */
-       entry = (vserver_list_t *) malloc (sizeof (vserver_list_t));
+       entry = calloc (1, sizeof (*entry));
        if (entry == NULL)
        {
-               ERROR ("teamspeak2 plugin: malloc failed.");
+               ERROR ("teamspeak2 plugin: calloc failed.");
                return (-1);
        }
-       memset (entry, 0, sizeof (vserver_list_t));
 
        /* Save data */
        entry->port = vserver_port;
@@ -257,6 +256,7 @@ static int tss2_get_socket (FILE **ret_read_fh, FILE **ret_write_fh)
                        WARNING ("teamspeak2 plugin: connect failed: %s",
                                        sstrerror (errno, errbuf, sizeof (errbuf)));
                        close (sd);
+                       sd = -1;
                        continue;
                }