From 61a1fa91ba73e4fe3a34949f77c5f017056f2b7a Mon Sep 17 00:00:00 2001 From: Peter Green Date: Tue, 16 Aug 2011 08:48:52 +0200 Subject: [PATCH] Many build fixes that turned up with GCC 4.6. Signed-off-by: Florian Forster --- src/disk.c | 2 -- src/java.c | 6 ++---- src/libvirt.c | 4 ---- src/match_empty_counter.c | 2 -- src/mysql.c | 3 +-- src/network.c | 6 ++---- src/notify_email.c | 16 ++++++++++------ src/owniptc/libiptc.c | 6 ++---- src/processes.c | 2 -- src/teamspeak2.c | 7 +++++++ src/utils_dns.c | 2 -- 11 files changed, 24 insertions(+), 32 deletions(-) diff --git a/src/disk.c b/src/disk.c index 0a908992..6187459f 100644 --- a/src/disk.c +++ b/src/disk.c @@ -426,7 +426,6 @@ static int disk_read (void) int numfields; int fieldshift = 0; - int major = 0; int minor = 0; counter_t read_sectors = 0; @@ -464,7 +463,6 @@ static int disk_read (void) if ((numfields != (14 + fieldshift)) && (numfields != 7)) continue; - major = atoll (fields[0]); minor = atoll (fields[1]); disk_name = fields[2 + fieldshift]; diff --git a/src/java.c b/src/java.c index b2ff4981..a8ffd8e3 100644 --- a/src/java.c +++ b/src/java.c @@ -2255,7 +2255,6 @@ static int cjni_config_plugin_block (oconfig_item_t *ci) /* {{{ */ cjni_callback_info_t *cbi; jobject o_ocitem; const char *name; - int status; size_t i; jclass class; @@ -2310,7 +2309,7 @@ static int cjni_config_plugin_block (oconfig_item_t *ci) /* {{{ */ method = (*jvm_env)->GetMethodID (jvm_env, class, "config", "(Lorg/collectd/api/OConfigItem;)I"); - status = (*jvm_env)->CallIntMethod (jvm_env, + (*jvm_env)->CallIntMethod (jvm_env, cbi->object, method, o_ocitem); (*jvm_env)->DeleteLocalRef (jvm_env, o_ocitem); @@ -3067,9 +3066,8 @@ static int cjni_init (void) /* {{{ */ if (config_block != NULL) { - int status; - status = cjni_config_perform (config_block); + cjni_config_perform (config_block); oconfig_free (config_block); config_block = NULL; } diff --git a/src/libvirt.c b/src/libvirt.c index 91fda7a5..1f628792 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -665,8 +665,6 @@ init_value_list (value_list_t *vl, time_t t, virDomainPtr dom) int i, n; const char *name; char uuid[VIR_UUID_STRING_BUFLEN]; - char *host_ptr; - size_t host_len; vl->time = t; vl->interval = interval_g; @@ -674,8 +672,6 @@ init_value_list (value_list_t *vl, time_t t, virDomainPtr dom) sstrncpy (vl->plugin, "libvirt", sizeof (vl->plugin)); vl->host[0] = '\0'; - host_ptr = vl->host; - host_len = sizeof (vl->host); /* Construct the hostname field according to HostnameFormat. */ for (i = 0; i < HF_MAX_FIELDS; ++i) { diff --git a/src/match_empty_counter.c b/src/match_empty_counter.c index b9afd817..1ab445a7 100644 --- a/src/match_empty_counter.c +++ b/src/match_empty_counter.c @@ -73,7 +73,6 @@ static int mec_match (const data_set_t __attribute__((unused)) *ds, /* {{{ */ const value_list_t *vl, notification_meta_t __attribute__((unused)) **meta, void **user_data) { - mec_match_t *m; int num_counters; int num_empty; int i; @@ -81,7 +80,6 @@ static int mec_match (const data_set_t __attribute__((unused)) *ds, /* {{{ */ if ((user_data == NULL) || (*user_data == NULL)) return (-1); - m = *user_data; num_counters = 0; num_empty = 0; diff --git a/src/mysql.c b/src/mysql.c index c7b796b1..bfdbb766 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -707,7 +707,6 @@ static int mysql_read (user_data_t *ud) MYSQL_RES *res; MYSQL_ROW row; char *query; - int field_num; unsigned long long qcache_hits = 0ULL; unsigned long long qcache_inserts = 0ULL; @@ -743,7 +742,7 @@ static int mysql_read (user_data_t *ud) if (res == NULL) return (-1); - field_num = mysql_num_fields (res); + mysql_num_fields (res); while ((row = mysql_fetch_row (res))) { char *key; diff --git a/src/network.c b/src/network.c index 412b457b..95f54641 100644 --- a/src/network.c +++ b/src/network.c @@ -788,7 +788,6 @@ static int parse_part_number (void **ret_buffer, size_t *ret_buffer_len, size_t exp_size = 2 * sizeof (uint16_t) + sizeof (uint64_t); uint16_t pkg_length; - uint16_t pkg_type; if ((buffer_len < 0) || ((size_t) buffer_len < exp_size)) { @@ -802,7 +801,7 @@ static int parse_part_number (void **ret_buffer, size_t *ret_buffer_len, memcpy ((void *) &tmp16, buffer, sizeof (tmp16)); buffer += sizeof (tmp16); - pkg_type = ntohs (tmp16); + /* pkg_type = ntohs (tmp16); */ memcpy ((void *) &tmp16, buffer, sizeof (tmp16)); buffer += sizeof (tmp16); @@ -828,7 +827,6 @@ static int parse_part_string (void **ret_buffer, size_t *ret_buffer_len, size_t header_size = 2 * sizeof (uint16_t); uint16_t pkg_length; - uint16_t pkg_type; if ((buffer_len < 0) || (buffer_len < header_size)) { @@ -842,7 +840,7 @@ static int parse_part_string (void **ret_buffer, size_t *ret_buffer_len, memcpy ((void *) &tmp16, buffer, sizeof (tmp16)); buffer += sizeof (tmp16); - pkg_type = ntohs (tmp16); + /* pkg_type = ntohs (tmp16); */ memcpy ((void *) &tmp16, buffer, sizeof (tmp16)); buffer += sizeof (tmp16); diff --git a/src/notify_email.c b/src/notify_email.c index 0aed27f1..08f865fc 100644 --- a/src/notify_email.c +++ b/src/notify_email.c @@ -228,7 +228,6 @@ static int notify_email_config (const char *key, const char *value) static int notify_email_notification (const notification_t *n, user_data_t __attribute__((unused)) *user_data) { - smtp_recipient_t recipient; struct tm timestamp_tm; char timestamp_str[64]; @@ -288,7 +287,7 @@ static int notify_email_notification (const notification_t *n, smtp_set_message_str (message, buf); for (i = 0; i < recipients_len; i++) - recipient = smtp_add_recipient (message, recipients[i]); + smtp_add_recipient (message, recipients[i]); /* Initiate a connection to the SMTP server and transfer the message. */ if (!smtp_start_session (session)) { @@ -298,11 +297,16 @@ static int notify_email_notification (const notification_t *n, pthread_mutex_unlock (&session_lock); return (-1); } else { - const smtp_status_t *status; - /* Report on the success or otherwise of the mail transfer. */ - status = smtp_message_transfer_status (message); - DEBUG ("notify_email plugin: SMTP server report: %d %s", + #if COLLECT_DEBUG + const smtp_status_t *status; + /* Report on the success or otherwise of the mail transfer. */ + status = smtp_message_transfer_status (message); + DEBUG ("notify_email plugin: SMTP server report: %d %s", status->code, (status->text != NULL) ? status->text : "\n"); + #else + //I don't know if the function below has side affects so i'm calling it to be on the safe side. + smtp_message_transfer_status (message); + #endif smtp_enumerate_recipients (message, print_recipient_status, NULL); } diff --git a/src/owniptc/libiptc.c b/src/owniptc/libiptc.c index 8f0b0f09..7e48e182 100644 --- a/src/owniptc/libiptc.c +++ b/src/owniptc/libiptc.c @@ -549,7 +549,7 @@ static int iptcc_chain_index_rebuild(TC_HANDLE_T h) */ static int iptcc_chain_index_delete_chain(struct chain_head *c, TC_HANDLE_T h) { - struct list_head *index_ptr, *index_ptr2, *next; + struct list_head *index_ptr, *next; struct chain_head *c2; unsigned int idx, idx2; @@ -569,7 +569,7 @@ static int iptcc_chain_index_delete_chain(struct chain_head *c, TC_HANDLE_T h) * is located in the same index bucket. */ c2 = list_entry(next, struct chain_head, list); - index_ptr2 = iptcc_bsearch_chain_index(c2->name, &idx2, h); + iptcc_bsearch_chain_index(c2->name, &idx2, h); if (idx != idx2) { /* Rebuild needed */ return iptcc_chain_index_rebuild(h); @@ -1192,10 +1192,8 @@ static int iptcc_compile_table(TC_HANDLE_T h, STRUCT_REPLACE *repl) static TC_HANDLE_T alloc_handle(const char *tablename, unsigned int size, unsigned int num_rules) { - size_t len; TC_HANDLE_T h; - len = sizeof(STRUCT_TC_HANDLE) + size; h = malloc(sizeof(STRUCT_TC_HANDLE)); if (!h) { diff --git a/src/processes.c b/src/processes.c index 7a5a9c07..bab7080f 100644 --- a/src/processes.c +++ b/src/processes.c @@ -871,7 +871,6 @@ int ps_read_process (int pid, procstat_t *ps, char *state) int i; - int ppid; int name_len; long long unsigned cpu_user_counter; @@ -909,7 +908,6 @@ int ps_read_process (int pid, procstat_t *ps, char *state) fields[1][name_len] = '\0'; strncpy (ps->name, fields[1], PROCSTAT_NAME_LEN); - ppid = atoi (fields[3]); *state = fields[2][0]; diff --git a/src/teamspeak2.c b/src/teamspeak2.c index d4bf2aa4..502145d3 100644 --- a/src/teamspeak2.c +++ b/src/teamspeak2.c @@ -299,6 +299,13 @@ static int tss2_get_socket (FILE **ret_read_fh, FILE **ret_write_fh) char *buffer_ptr; buffer_ptr = fgets (buffer, sizeof (buffer), global_read_fh); + if (buffer_ptr == NULL) + { + WARNING ("teamspeak2 plugin: Unexpected EOF received " + "from remote host %s:%s.", + config_host ? config_host : DEFAULT_HOST, + config_port ? config_port : DEFAULT_PORT); + } buffer[sizeof (buffer) - 1] = 0; if (memcmp ("[TS]\r\n", buffer, 6) != 0) diff --git a/src/utils_dns.c b/src/utils_dns.c index 2348be24..9a2e479c 100644 --- a/src/utils_dns.c +++ b/src/utils_dns.c @@ -432,7 +432,6 @@ handle_ipv6 (struct ip6_hdr *ipv6, int len) int nexthdr; struct in6_addr s_addr; - struct in6_addr d_addr; uint16_t payload_len; if (0 > len) @@ -441,7 +440,6 @@ handle_ipv6 (struct ip6_hdr *ipv6, int len) offset = sizeof (struct ip6_hdr); nexthdr = ipv6->ip6_nxt; s_addr = ipv6->ip6_src; - d_addr = ipv6->ip6_dst; payload_len = ntohs (ipv6->ip6_plen); if (ignore_list_match (&s_addr)) -- 2.11.0