Change file scoping of test helpers.function

Dependent on configured options, not all of the helper functions were being
used, which was leading to warning of unused functions with Clang.

To avoid any complex compile time options, or adding more logic to
generate_test_code.py to screen out unused functions, those functions which were
provoking the warning were changed to remove static, remove them from file
scope, and expose them to the linker.
This commit is contained in:
Simon Butcher 2018-10-03 16:17:41 +01:00
parent 3187e7ca98
commit 638dceb7e1

View file

@ -128,6 +128,14 @@ test_info;
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
/* Helper Functions */ /* Helper Functions */
void test_fail( const char *test, int line_no, const char* filename )
{
test_info.failed = 1;
test_info.test = test;
test_info.line_no = line_no;
test_info.filename = filename;
}
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
static int redirect_output( FILE** out_stream, const char* path ) static int redirect_output( FILE** out_stream, const char* path )
{ {
@ -170,7 +178,7 @@ static void close_output( FILE* out_stream )
} }
#endif /* __unix__ || __APPLE__ __MACH__ */ #endif /* __unix__ || __APPLE__ __MACH__ */
static int unhexify( unsigned char *obuf, const char *ibuf ) int unhexify( unsigned char *obuf, const char *ibuf )
{ {
unsigned char c, c2; unsigned char c, c2;
int len = strlen( ibuf ) / 2; int len = strlen( ibuf ) / 2;
@ -204,7 +212,7 @@ static int unhexify( unsigned char *obuf, const char *ibuf )
return len; return len;
} }
static void hexify( unsigned char *obuf, const unsigned char *ibuf, int len ) void hexify( unsigned char *obuf, const unsigned char *ibuf, int len )
{ {
unsigned char l, h; unsigned char l, h;
@ -258,7 +266,7 @@ static unsigned char *zero_alloc( size_t len )
* *
* For convenience, dies if allocation fails. * For convenience, dies if allocation fails.
*/ */
static unsigned char *unhexify_alloc( const char *ibuf, size_t *olen ) unsigned char *unhexify_alloc( const char *ibuf, size_t *olen )
{ {
unsigned char *obuf; unsigned char *obuf;
@ -309,7 +317,7 @@ static int rnd_std_rand( void *rng_state, unsigned char *output, size_t len )
* *
* rng_state shall be NULL. * rng_state shall be NULL.
*/ */
static int rnd_zero_rand( void *rng_state, unsigned char *output, size_t len ) int rnd_zero_rand( void *rng_state, unsigned char *output, size_t len )
{ {
if( rng_state != NULL ) if( rng_state != NULL )
rng_state = NULL; rng_state = NULL;
@ -336,7 +344,7 @@ typedef struct
* *
* After the buffer is empty it will return rand(); * After the buffer is empty it will return rand();
*/ */
static int rnd_buffer_rand( void *rng_state, unsigned char *output, size_t len ) int rnd_buffer_rand( void *rng_state, unsigned char *output, size_t len )
{ {
rnd_buf_info *info = (rnd_buf_info *) rng_state; rnd_buf_info *info = (rnd_buf_info *) rng_state;
size_t use_len; size_t use_len;
@ -382,7 +390,7 @@ typedef struct
* *
* rng_state shall be a pointer to a rnd_pseudo_info structure. * rng_state shall be a pointer to a rnd_pseudo_info structure.
*/ */
static int rnd_pseudo_rand( void *rng_state, unsigned char *output, size_t len ) int rnd_pseudo_rand( void *rng_state, unsigned char *output, size_t len )
{ {
rnd_pseudo_info *info = (rnd_pseudo_info *) rng_state; rnd_pseudo_info *info = (rnd_pseudo_info *) rng_state;
uint32_t i, *k, sum, delta=0x9E3779B9; uint32_t i, *k, sum, delta=0x9E3779B9;