summaryrefslogtreecommitdiff
path: root/staging
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2020-08-13 12:09:28 +0200
committerTobias Klauser <tobias.klauser@gmail.com>2020-08-19 13:16:51 +0200
commitbfa3c89317869ffe1e90b7e01e7cacad7a7ea10e (patch)
tree69a429ad9d42236b7b8db6258c76d64bf7575762 /staging
parentca09a6f34d70e3a8ea495a6b2b71cd6d598d5ffb (diff)
mausezahn: make needlessly global variables static
Move variables only used withing a single compilation unit from mz.h and make them static. This avoids "multiple definition of symbol" linker errors with gcc-10. Updates #216 Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'staging')
-rw-r--r--staging/dns.c2
-rw-r--r--staging/mz.h28
-rw-r--r--staging/rcv_rtp.c19
-rw-r--r--staging/rtp.c1
4 files changed, 22 insertions, 28 deletions
diff --git a/staging/dns.c b/staging/dns.c
index bfa61d8..83227e2 100644
--- a/staging/dns.c
+++ b/staging/dns.c
@@ -89,6 +89,8 @@
"| arcount (or arc) ........... Number of RRs in additional records section 0 / 0\n" \
"\n"
+static u_int8_t gbuf[MAX_PAYLOAD_SIZE]; // This is only a generic global buffer to handover data more easily
+static u_int32_t gbuf_s;
int dns_get_query (char* argval);
int dns_get_answer (char* argval);
diff --git a/staging/mz.h b/staging/mz.h
index c7a131d..42e64cf 100644
--- a/staging/mz.h
+++ b/staging/mz.h
@@ -285,11 +285,6 @@ FILE *fp, *fp2; // global multipurpose file pointer
long double total_d;
clock_t mz_start, mz_stop;
-enum rtp_display_mode {
- BAR, NCURSES, TEXT
-} rtp_dm;
-
-
int mz_rand;
int bwidth;
@@ -298,14 +293,7 @@ struct mz_timestamp {
u_int32_t nsec;
};
-struct mz_timestamp
- tv,
- timeTX[TIME_COUNT_MAX],
- timeRX[TIME_COUNT_MAX];
-
int32_t
- time0,
- jitter_rfc,
jitter[TIME_COUNT_MAX];
int
@@ -322,14 +310,8 @@ u_int16_t
sqnr_next;
u_int32_t
- drop, // packet drop count
- dis, // packet disorder count
gind, // a global index to run through deltaRX, deltaTX, and jitter
- gind_max, // the amount of entries used in the (ugly oversized) arrays; per default set to TIME_COUNT
- gtotal; // counts number of file write cycles (see "got_rtp_packet()")
-
-
-char rtp_filter_str[64];
+ gind_max; // the amount of entries used in the (ugly oversized) arrays; per default set to TIME_COUNT
struct tx_struct
{
@@ -496,14 +478,6 @@ struct tx_struct
} tx; // NOTE: tx elements are considered as default values for MOPS
-
-
-
-
-u_int8_t gbuf[MAX_PAYLOAD_SIZE]; // This is only a generic global buffer to handover data more easily
-u_int32_t gbuf_s; //
-
-
// ************************************
//
// Prototypes: General Tools
diff --git a/staging/rcv_rtp.c b/staging/rcv_rtp.c
index 0a91155..f43b92c 100644
--- a/staging/rcv_rtp.c
+++ b/staging/rcv_rtp.c
@@ -39,6 +39,25 @@
#include "mz.h"
#include "mops.h"
+static enum rtp_display_mode {
+ BAR, NCURSES, TEXT
+} rtp_dm;
+
+static int32_t
+ time0,
+ jitter_rfc;
+
+static struct mz_timestamp
+ timeTX[TIME_COUNT_MAX],
+ timeRX[TIME_COUNT_MAX];
+
+static u_int32_t
+ drop, // packet drop count
+ dis, // packet disorder count
+ gtotal; // counts number of file write cycles (see "got_rtp_packet()")
+
+static char rtp_filter_str[64];
+
// Initialize the rcv_rtp process: Read user parameters and initialize globals
int rcv_rtp_init(void)
{
diff --git a/staging/rtp.c b/staging/rtp.c
index 54a195e..da40884 100644
--- a/staging/rtp.c
+++ b/staging/rtp.c
@@ -56,7 +56,6 @@
"|\n"
-
int create_rtp_packet(void)
{
u_int8_t byte1, byte2;