根据cppcheck的结果修改代码风格

7 files changed, 8 insertions, 19 deletions

diff --git a/core/src/mrbuf.c b/core/src/mrbuf.c
index 85f29cb..a71283f 100644
--- a/core/src/mrbuf.c
+++ b/core/src/mrbuf.c
@@ -8,20 +8,16 @@
 
 */
 
-#ifdef _MSC_VER
-#define __thread
-#endif
-
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <assert.h>
-#include <mr_buf.h>
-#include <mr_mrbuf.h>
 #include <mr_ctx.h>
 #include <mr_hwinfo.h>
 #include <MESA_prof_load.h>
 #include <rte_errno.h>
+#include <mr_mrbuf.h>
+#include <mr_buffer.h>
 
 #define SELF_TEST				0
 #define MEM_RECORD			(SELF_TEST & 0)
diff --git a/pag/libpag.c b/pag/libpag.c
index f4a3010..6f8aedf 100644
--- a/pag/libpag.c
+++ b/pag/libpag.c
@@ -156,7 +156,6 @@ void * pag_get_frame(int sid __rte_unused)
 int pag_get_frame_length(int sid __rte_unused)

 {

 	struct pag_thread_instance * tinstance = &thread_instance_;

-	struct pag_instance * instance = &pag_config_;

 

 	if (unlikely(tinstance->rxmbuf == NULL)) return -1;

 	return rte_pktmbuf_pkt_len(tinstance->rxmbuf);

diff --git a/service/src/config.c b/service/src/config.c
index 0d1bfbe..4d4725a 100644
--- a/service/src/config.c
+++ b/service/src/config.c
@@ -89,7 +89,7 @@ static int __parser_str_core(char * str_core, int sz_buffer,
 	cpu_mask_t mask_result = 0;
 	for (int i = 0; i < nr_tokens; i++)
 	{
-		unsigned int core_id = __parser_uint(tokens[i]);
+		int core_id = __parser_uint(tokens[i]);
 		if (core_id < 0) return -2;
 		if (core_id > sizeof(cpu_mask_t) * 8) return -3;
 		mask_result |= 1ULL << core_id;
diff --git a/service/src/core.c b/service/src/core.c
index 42310d7..ccb5489 100644
--- a/service/src/core.c
+++ b/service/src/core.c
@@ -108,7 +108,6 @@ static void sc_version()
 static void sc_stage_parse_cmd(struct sc_instance * instance,
 	int argc, char * argv[])
 {
-	const char * optstring = "hvc:w:";
 	int opt;
 	while((opt = getopt(argc, argv, "hvc:w:")) != -1)
 	{
diff --git a/service/src/register.c b/service/src/register.c
index 81d281e..8dbe576 100644
--- a/service/src/register.c
+++ b/service/src/register.c
@@ -154,7 +154,6 @@ static int __register_app_for_rxvnode(struct sc_instance * instance,
 {
 	char vnodesym[MR_SYMBOL_MAX];
 	char conssym[MR_SYMBOL_MAX];
-	int ret = 0;
 
 	// 生成VNode的名字
 	snprintf(vnodesym, sizeof(vnodesym), __PATTERN_DEV_RX, sc_dev->symbol);
@@ -164,7 +163,7 @@ static int __register_app_for_rxvnode(struct sc_instance * instance,
 	TAILQ_FOREACH(app_iter, &instance->app_list, next)
 	{
 		snprintf(conssym, sizeof(conssym), __PATTERN_CONS_APP, app_iter->symbol);
-		ret = mr_vnodeman_register_consumer(vnodesym, conssym, app_iter->rxstream);
+		int ret = mr_vnodeman_register_consumer(vnodesym, conssym, app_iter->rxstream);
 		if(ret < 0)
 		{
 			MR_LOG(WARNING, SERVICE, "Service, VNodeAppRegister, "
@@ -186,7 +185,6 @@ static int __register_app_for_txvnode(struct sc_instance * instance,
 {
 	char vnodesym[MR_SYMBOL_MAX];
 	char prodsym[MR_SYMBOL_MAX];
-	int ret = 0;
 
 	// 生成VNode的名字
 	snprintf(vnodesym, sizeof(vnodesym), __PATTERN_DEV_TX, sc_dev->symbol);
@@ -196,7 +194,7 @@ static int __register_app_for_txvnode(struct sc_instance * instance,
 	TAILQ_FOREACH(app_iter, &instance->app_list, next)
 	{
 		snprintf(prodsym, sizeof(prodsym), __PATTERN_PROD_APP, app_iter->symbol);
-		ret = mr_vnodeman_register_producer(vnodesym, prodsym, app_iter->txstream);
+		int ret = mr_vnodeman_register_producer(vnodesym, prodsym, app_iter->txstream);
 		if (ret < 0)
 		{
 			MR_LOG(WARNING, SERVICE, "Service, VNodeAppRegister, "
@@ -257,14 +255,13 @@ static int sc_vnode_register(struct sc_instance * instance)
 
 int sc_proc_register(struct sc_instance * instance)
 {
-	int ret = 0;
 	struct sc_app * app_iter;
 	char prodsym[MR_SYMBOL_MAX];
 		
 	TAILQ_FOREACH(app_iter, &instance->app_list, next)
 	{
 		snprintf(prodsym, sizeof(prodsym), __PATTERN_PROD_APP, app_iter->symbol);
-		ret = procman_process_create(prodsym, app_iter->cpu_mask);
+		int ret = procman_process_create(prodsym, app_iter->cpu_mask);
 		
 		if (ret < 0)
 		{
diff --git a/service/src/rxtx.c b/service/src/rxtx.c
index 009ebc8..303c330 100644
--- a/service/src/rxtx.c
+++ b/service/src/rxtx.c
@@ -22,14 +22,13 @@ void sc_thread_rx_loop(struct sc_instance * instance,
 	struct rte_mbuf * rx_bufs[MR_BURST_MAX];
 	hash_t hash_result[MR_BURST_MAX];
 	int nr_rx_burst = instance->sz_rx_burst;
-	int nr_rx_bufs = 0;
-		
+
 	for(int i =0; i < tinstance->nr_devices; i++)
 	{
 		mr_devq_t * devq;
 		devq = tinstance->rt_dev[i].devq;
 		
-		nr_rx_bufs = rte_eth_rx_burst(devq->port_id,
+		int nr_rx_bufs = rte_eth_rx_burst(devq->port_id,
 			devq->rx_queue_id, rx_bufs, nr_rx_burst);
 
 		// û�����ݰ�ֱ������
diff --git a/slave/src/rtdev.c b/slave/src/rtdev.c
index e77134c..f5c0375 100644
--- a/slave/src/rtdev.c
+++ b/slave/src/rtdev.c
@@ -65,7 +65,6 @@ int rtdev_slave_init(struct mrlib_instance * instance)
 
 	for (int i = 0; i < nr_devlist; i++)
 	{
-		struct vnodeman_attach_desc * rxvnode_desc, * txvnode_desc;
 		instance->rt_device[i].dev = devlist[i];
 	}