From a0b1f17e09a8b98b433e994887f2b8d3cae1000a Mon Sep 17 00:00:00 2001
From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Mon, 9 Jun 2014 14:45:52 +0200
Subject: [PATCH] Code cleanup based on cppcheck
---
src/knot/conf/conf.c | 21 ---------------------
src/knot/conf/conf.h | 12 ------------
src/libknot/rrset-dump.c | 6 +++---
src/utils/common/exec.c | 12 ++++--------
src/utils/common/netio.c | 6 ++++--
src/utils/dig/dig_exec.c | 3 +--
6 files changed, 12 insertions(+), 48 deletions(-)
diff --git a/src/knot/conf/conf.c b/src/knot/conf/conf.c
index 8f5d887be8..cac13df876 100644
--- a/src/knot/conf/conf.c
+++ b/src/knot/conf/conf.c
@@ -47,14 +47,12 @@
/* Prototypes for cf-parse.y */
extern int cf_parse(void *scanner);
extern int cf_get_lineno(void *scanner);
-extern void cf_set_error(void *scanner);
extern char *cf_get_text(void *scanner);
extern conf_extra_t *cf_get_extra(void *scanner);
extern int cf_lex_init_extra(void *, void *scanner);
extern void cf_set_in(FILE *f, void *scanner);
extern void cf_lex_destroy(void *scanner);
extern void switch_input(const char *str, void *scanner);
-extern char *cf_current_filename(void *scanner);
conf_t *new_config = NULL; /*!< \brief Currently parsed config. */
static volatile int _parser_res = 0; /*!< \brief Parser result. */
@@ -605,25 +603,6 @@ int conf_add_hook(conf_t * conf, int sections,
return KNOT_EOK;
}
-int conf_parse(conf_t *conf)
-{
- /* Parse file. */
- int ret = conf_fparser(conf);
-
- /* Postprocess config. */
- if (ret == 0) {
- ret = conf_process(conf);
- /* Update hooks. */
- conf_update_hooks(conf);
- }
-
- if (ret < 0) {
- return KNOT_EPARSEFAIL;
- }
-
- return KNOT_EOK;
-}
-
int conf_parse_str(conf_t *conf, const char* src)
{
/* Parse config from string. */
diff --git a/src/knot/conf/conf.h b/src/knot/conf/conf.h
index e3358d0813..789da82eee 100644
--- a/src/knot/conf/conf.h
+++ b/src/knot/conf/conf.h
@@ -318,18 +318,6 @@ conf_t *conf_new(char *path);
int conf_add_hook(conf_t * conf, int sections,
int (*on_update)(const conf_t*, void*), void *data);
-/*!
- * \brief Parse configuration from associated file.
- *
- * \note Registered callbacks may be executed if applicable.
- *
- * \param conf Configuration context.
- *
- * \retval KNOT_EOK on success.
- * \retval KNOT_EPARSEFAIL on parser error.
- */
-int conf_parse(conf_t *conf);
-
/*!
* \brief Parse configuration from string.
*
diff --git a/src/libknot/rrset-dump.c b/src/libknot/rrset-dump.c
index 64825fbb12..9920d20650 100644
--- a/src/libknot/rrset-dump.c
+++ b/src/libknot/rrset-dump.c
@@ -380,7 +380,7 @@ static void wire_data_encode_to_str(rrset_dump_params_t *p,
p->out_max -= out_len;
p->total += out_len;
} else {
- int src_begin, src_len;
+ int src_begin;
uint8_t *buf;
// Encode data to the temporary buffer.
@@ -401,8 +401,8 @@ static void wire_data_encode_to_str(rrset_dump_params_t *p,
}
// Compute block length (the last one can be shorter).
- src_len = (ret - src_begin) < BLOCK_WIDTH ?
- (ret - src_begin) : BLOCK_WIDTH;
+ int src_len = (ret - src_begin) < BLOCK_WIDTH ?
+ (ret - src_begin) : BLOCK_WIDTH;
if ((size_t)src_len > p->out_max) {
free(buf);
diff --git a/src/utils/common/exec.c b/src/utils/common/exec.c
index 58b86aa91d..739b75f9d6 100644
--- a/src/utils/common/exec.c
+++ b/src/utils/common/exec.c
@@ -750,8 +750,6 @@ int verify_packet(const knot_pkt_t *pkt,
const sign_context_t *sign_ctx,
const knot_key_params_t *key_params)
{
- int result;
-
if (pkt == NULL || sign_ctx == NULL || key_params == NULL) {
DBG_NULL;
return KNOT_EINVAL;
@@ -767,12 +765,10 @@ int verify_packet(const knot_pkt_t *pkt,
return KNOT_ENOTSIG;
}
- result = knot_tsig_client_check(pkt->tsig_rr, wire, *wire_size,
- sign_ctx->digest,
- sign_ctx->digest_size,
- &sign_ctx->tsig_key, 0);
-
- return result;
+ return knot_tsig_client_check(pkt->tsig_rr, wire, *wire_size,
+ sign_ctx->digest,
+ sign_ctx->digest_size,
+ &sign_ctx->tsig_key, 0);
}
case KNOT_KEY_DNSSEC:
{
diff --git a/src/utils/common/netio.c b/src/utils/common/netio.c
index 64c2d7cc7f..461a3a4a5c 100644
--- a/src/utils/common/netio.c
+++ b/src/utils/common/netio.c
@@ -202,8 +202,7 @@ int net_init(const srv_info_t *local,
int net_connect(net_t *net)
{
struct pollfd pfd;
- int sockfd, cs, err = 0;
- socklen_t err_len = sizeof(err);
+ int sockfd;
if (net == NULL || net->srv == NULL) {
DBG_NULL;
@@ -242,6 +241,9 @@ int net_connect(net_t *net)
}
if (net->socktype == SOCK_STREAM) {
+ int cs, err = 0;
+ socklen_t err_len = sizeof(err);
+
// Connect using socket.
if (connect(sockfd, net->srv->ai_addr, net->srv->ai_addrlen)
== -1 && errno != EINPROGRESS) {
diff --git a/src/utils/dig/dig_exec.c b/src/utils/dig/dig_exec.c
index 3b10283761..a2de06b808 100644
--- a/src/utils/dig/dig_exec.c
+++ b/src/utils/dig/dig_exec.c
@@ -85,7 +85,6 @@ static float get_query_time(const Dnstap__Dnstap *frame)
static void process_dnstap(const query_t *query)
{
dt_reader_t *reader = query->dt_reader;
- int ret;
if (query->dt_reader == NULL) {
return;
@@ -98,7 +97,7 @@ static void process_dnstap(const query_t *query)
bool is_response;
// Read next message.
- ret = dt_reader_read(reader, &frame);
+ int ret = dt_reader_read(reader, &frame);
if (ret == KNOT_EOF) {
break;
} else if (ret != KNOT_EOK) {
--
GitLab