#46: Remove duplicate declarations

Wei Ming Khoo · Wei Ming Khoo · commit af248912f95f · 2021-11-18T17:18:42.000+08:00
diff --git a/tnt_include.h b/tnt_include.h
@@ -255,15 +255,15 @@ extern void TNT_(check_var_access)(ThreadId tid, const HChar* varname, Int var_r
 #define VARNAMESIZE 1024 
 // These arrays are initialised to 0 in TNT_(clo_post_init)
 // Tmp variable indices; the MSB indicates whether it's tainted (1) or not (0)
-UInt  *ti;
+extern UInt  *ti;
 // Tmp variable values
-ULong *tv;
+extern ULong *tv;
 // Reg variable indices; values are obtained in real-time
-UInt  *ri;
+extern UInt  *ri;
 // Tmp variable Types/Widths
-UInt  *tt;
+extern UInt  *tt;
 // Stores the variable name derived from describe_data()
-HChar *varname;
+extern HChar *varname;
 
 #define _ti(ltmp) ti[ltmp] & 0x7fffffff
 #define is_tainted(ltmp) (ti[ltmp] >> 31)
diff --git a/tnt_main.c b/tnt_main.c
@@ -3906,6 +3906,12 @@ static int tnt_isatty(void)
    return 0;
 }
 
+UInt  *ti;
+ULong *tv;
+UInt  *ri;
+UInt  *tt;
+HChar *varname;
+
 static void tnt_post_clo_init(void)
 {
    if(*TNT_(clo_file_filter) == '\0'){
diff --git a/tnt_smt2.c b/tnt_smt2.c
@@ -32,7 +32,7 @@ const Int SMT2_ty[] = {
 };
 
 // Array for tracking tmp variable types
-UInt *tt; //[TI_MAX];
+extern UInt *tt; //[TI_MAX];
 
 void TNT_(smt2_preamble)()
 {
diff --git a/tnt_syswrap.c b/tnt_syswrap.c
@@ -237,6 +237,8 @@ void read_common ( UInt taint_offset, Int taint_len,
       TNT_(make_mem_tainted)( addr, len );
 }
 
+extern HChar *varname;
+
 void TNT_(syscall_read)(ThreadId tid, UWord* args, UInt nArgs,
                                   SysRes res) {
 // ssize_t  read(int fildes, void *buf, size_t nbyte);

Original file line number	Diff line number	Diff line change
`@@ -3906,6 +3906,12 @@ static int tnt_isatty(void)`
`3906`	`3906`	`return 0;`
`3907`	`3907`	`}`
`3908`	`3908`
	`3909`	`+UInt *ti;`
	`3910`	`+ULong *tv;`
	`3911`	`+UInt *ri;`
	`3912`	`+UInt *tt;`
	`3913`	`+HChar *varname;`
	`3914`	`+`
`3909`	`3915`	`static void tnt_post_clo_init(void)`
`3910`	`3916`	`{`
`3911`	`3917`	`if(*TNT_(clo_file_filter) == '\0'){`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ const Int SMT2_ty[] = {`
`32`	`32`	`};`
`33`	`33`
`34`	`34`	`// Array for tracking tmp variable types`
`35`		`-UInt *tt; //[TI_MAX];`
	`35`	`+extern UInt *tt; //[TI_MAX];`
`36`	`36`
`37`	`37`	`void TNT_(smt2_preamble)()`
`38`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,8 @@ void read_common ( UInt taint_offset, Int taint_len,`
`237`	`237`	`TNT_(make_mem_tainted)( addr, len );`
`238`	`238`	`}`
`239`	`239`
	`240`	`+extern HChar *varname;`
	`241`	`+`
`240`	`242`	`void TNT_(syscall_read)(ThreadId tid, UWord* args, UInt nArgs,`
`241`	`243`	`SysRes res) {`
`242`	`244`	`// ssize_t read(int fildes, void *buf, size_t nbyte);`