root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

trace: rename the trace channel types 

Since the term 'channel' is already used as synonym for a BIO object attached
to a trace category, having a 't_channel' channel type and a 't_callback' channel
type somehow overburdens this term. For that reason the type enum constants are
renamed to 'SIMPE_CHANNEL' and 'CALLBACK_CHANNEL'.
(The conversion to capital letters was done to comply to the coding style.)

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8463)
This commit is contained in:
Dr. Matthias St. Pierre 2019-03-10 11:07:27 +01:00
parent e474a286f5
commit 5afb177c3c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crypto/trace.c
View File

@ -158,7 +158,7 @@ int OSSL_trace_get_category_num(const char *name)
/* We use one trace channel for each trace category */ /* We use one trace channel for each trace category */
static struct { static struct {
enum { t_channel, t_callback } type; enum { SIMPLE_CHANNEL, CALLBACK_CHANNEL } type;
BIO *bio; BIO *bio;
char *prefix; char *prefix;
char *suffix; char *suffix;
@ -330,7 +330,7 @@ int OSSL_trace_set_channel(int category, BIO *channel)
trace_attach_cb, trace_detach_cb)) trace_attach_cb, trace_detach_cb))
return 0; return 0;
trace_channels[category].type = t_channel; trace_channels[category].type = SIMPLE_CHANNEL;
#endif #endif
return 1; return 1;
} }
@ -385,7 +385,7 @@ int OSSL_trace_set_callback(int category, OSSL_trace_cb callback, void *data)
trace_attach_w_callback_cb, trace_detach_cb)) trace_attach_w_callback_cb, trace_detach_cb))
goto err; goto err;
trace_channels[category].type = t_callback; trace_channels[category].type = CALLBACK_CHANNEL;
goto done; goto done;
err: err:
@ -458,13 +458,13 @@ BIO *OSSL_trace_begin(int category)
CRYPTO_THREAD_write_lock(trace_lock); CRYPTO_THREAD_write_lock(trace_lock);
current_channel = channel; current_channel = channel;
switch (trace_channels[category].type) { switch (trace_channels[category].type) {
case t_channel: case SIMPLE_CHANNEL:
if (prefix != NULL) { if (prefix != NULL) {
(void)BIO_puts(channel, prefix); (void)BIO_puts(channel, prefix);
(void)BIO_puts(channel, "\n"); (void)BIO_puts(channel, "\n");
} }
break; break;
case t_callback: case CALLBACK_CHANNEL:
(void)BIO_ctrl(channel, OSSL_TRACE_CTRL_BEGIN, (void)BIO_ctrl(channel, OSSL_TRACE_CTRL_BEGIN,
prefix == NULL ? 0 : strlen(prefix), prefix); prefix == NULL ? 0 : strlen(prefix), prefix);
break; break;
@ -485,13 +485,13 @@ void OSSL_trace_end(int category, BIO * channel)
&& ossl_assert(channel == current_channel)) { && ossl_assert(channel == current_channel)) {
(void)BIO_flush(channel); (void)BIO_flush(channel);
switch (trace_channels[category].type) { switch (trace_channels[category].type) {
case t_channel: case SIMPLE_CHANNEL:
if (suffix != NULL) { if (suffix != NULL) {
(void)BIO_puts(channel, suffix); (void)BIO_puts(channel, suffix);
(void)BIO_puts(channel, "\n"); (void)BIO_puts(channel, "\n");
} }
break; break;
case t_callback: case CALLBACK_CHANNEL:
(void)BIO_ctrl(channel, OSSL_TRACE_CTRL_END, (void)BIO_ctrl(channel, OSSL_TRACE_CTRL_END,
suffix == NULL ? 0 : strlen(suffix), suffix); suffix == NULL ? 0 : strlen(suffix), suffix);
break; break;