From 3b226410d2188cbe0a8baa6a3cb368a7777bec59 Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Tue, 31 May 2016 18:09:26 +0200
Subject: [PATCH] cleanup
remove forward stuff from defs.h
remove defs.h from local.c and forward.c
---
common/utils/T/tracer/defs.h | 4 ----
common/utils/T/tracer/forward.c | 8 +++++---
common/utils/T/tracer/forward.h | 8 ++++++++
common/utils/T/tracer/local.c | 2 +-
4 files changed, 14 insertions(+), 8 deletions(-)
create mode 100644 common/utils/T/tracer/forward.h
diff --git a/common/utils/T/tracer/defs.h b/common/utils/T/tracer/defs.h
index 498f9e5b79..443fabdde8 100644
--- a/common/utils/T/tracer/defs.h
+++ b/common/utils/T/tracer/defs.h
@@ -16,10 +16,6 @@ void iq_plot_set_sized(void *_plot, short *data, int len, int pp);
void iq_plot_add_iq_point_loop(void *_plot, short i, short q, int pp);
void iq_plot_add_energy_point_loop(void *_plot, int e, int pp);
-void *forwarder(int port);
-void forward(void *forwarder, char *buf, int size);
-void forward_start_client(void *forwarder, int socket);
-
/* T gui functions */
void t_gui_start(void);
void t_gui_set_input_signal(int eNB, int frame, int subframe, int antenna,
diff --git a/common/utils/T/tracer/forward.c b/common/utils/T/tracer/forward.c
index e9eb93e1bb..2bddb80330 100644
--- a/common/utils/T/tracer/forward.c
+++ b/common/utils/T/tracer/forward.c
@@ -1,4 +1,4 @@
-#include "defs.h"
+#include "forward.h"
#include <stdlib.h>
#include <stdio.h>
#include <netinet/ip.h>
@@ -9,6 +9,10 @@
#include <stdint.h>
#include <inttypes.h>
+/* from local.c */
+int get_connection(char *addr, int port);
+void new_thread(void *(*f)(void *), void *data);
+
typedef struct databuf {
char *d;
int l;
@@ -102,8 +106,6 @@ void forward_start_client(void *_f, int s)
new_thread(forward_s_to_sc, f);
}
-int get_connection(char *addr, int port);
-
void *forwarder(int port)
{
forward_data *f;
diff --git a/common/utils/T/tracer/forward.h b/common/utils/T/tracer/forward.h
new file mode 100644
index 0000000000..80607d74fc
--- /dev/null
+++ b/common/utils/T/tracer/forward.h
@@ -0,0 +1,8 @@
+#ifndef _FORWARD_H_
+#define _FORWARD_H_
+
+void *forwarder(int port);
+void forward(void *forwarder, char *buf, int size);
+void forward_start_client(void *forwarder, int socket);
+
+#endif /* _FORWARD_H_ */
diff --git a/common/utils/T/tracer/local.c b/common/utils/T/tracer/local.c
index 1648ae7d60..fbe4d6d420 100644
--- a/common/utils/T/tracer/local.c
+++ b/common/utils/T/tracer/local.c
@@ -11,7 +11,7 @@
#define DEFAULT_PORT 2021
-#include "defs.h"
+#include "forward.h"
#include "../T_defs.h"
--
GitLab