diff options
| author | joshua <> | 2024-03-26 00:50:22 +0000 |
|---|---|---|
| committer | joshua <> | 2024-03-26 00:50:22 +0000 |
| commit | ebb5d184382e45fee186dab409ffc48de54983b6 (patch) | |
| tree | 775b1d4a45a397361d1f6435122ed64d287f41a1 /src | |
| parent | 3604a06d3b1412f3b3b3959a358b2c8e2a07836a (diff) | |
| download | openbsd-ebb5d184382e45fee186dab409ffc48de54983b6.tar.gz openbsd-ebb5d184382e45fee186dab409ffc48de54983b6.tar.bz2 openbsd-ebb5d184382e45fee186dab409ffc48de54983b6.zip | |
Use errno_value instead of num for readability
ok beck@ jsing@
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libtls/tls.c | 20 | ||||
| -rw-r--r-- | src/lib/libtls/tls_internal.h | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c index fdb994d733..09b82bd191 100644 --- a/src/lib/libtls/tls.c +++ b/src/lib/libtls/tls.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls.c,v 1.98 2023/07/02 06:37:27 beck Exp $ */ | 1 | /* $OpenBSD: tls.c,v 1.99 2024/03/26 00:50:22 joshua Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -77,19 +77,19 @@ tls_error_clear(struct tls_error *error) | |||
| 77 | { | 77 | { |
| 78 | free(error->msg); | 78 | free(error->msg); |
| 79 | error->msg = NULL; | 79 | error->msg = NULL; |
| 80 | error->num = 0; | 80 | error->errno_value = 0; |
| 81 | error->tls = 0; | 81 | error->tls = 0; |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | static int | 84 | static int |
| 85 | tls_error_vset(struct tls_error *error, int errnum, const char *fmt, va_list ap) | 85 | tls_error_vset(struct tls_error *error, int errno_value, const char *fmt, va_list ap) |
| 86 | { | 86 | { |
| 87 | char *errmsg = NULL; | 87 | char *errmsg = NULL; |
| 88 | int rv = -1; | 88 | int rv = -1; |
| 89 | 89 | ||
| 90 | tls_error_clear(error); | 90 | tls_error_clear(error); |
| 91 | 91 | ||
| 92 | error->num = errnum; | 92 | error->errno_value = errno_value; |
| 93 | error->tls = 1; | 93 | error->tls = 1; |
| 94 | 94 | ||
| 95 | if (vasprintf(&errmsg, fmt, ap) == -1) { | 95 | if (vasprintf(&errmsg, fmt, ap) == -1) { |
| @@ -97,12 +97,12 @@ tls_error_vset(struct tls_error *error, int errnum, const char *fmt, va_list ap) | |||
| 97 | goto err; | 97 | goto err; |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | if (errnum == -1) { | 100 | if (errno_value == -1) { |
| 101 | error->msg = errmsg; | 101 | error->msg = errmsg; |
| 102 | return (0); | 102 | return (0); |
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | if (asprintf(&error->msg, "%s: %s", errmsg, strerror(errnum)) == -1) { | 105 | if (asprintf(&error->msg, "%s: %s", errmsg, strerror(errno_value)) == -1) { |
| 106 | error->msg = NULL; | 106 | error->msg = NULL; |
| 107 | goto err; | 107 | goto err; |
| 108 | } | 108 | } |
| @@ -118,12 +118,12 @@ int | |||
| 118 | tls_error_set(struct tls_error *error, const char *fmt, ...) | 118 | tls_error_set(struct tls_error *error, const char *fmt, ...) |
| 119 | { | 119 | { |
| 120 | va_list ap; | 120 | va_list ap; |
| 121 | int errnum, rv; | 121 | int errno_value, rv; |
| 122 | 122 | ||
| 123 | errnum = errno; | 123 | errno_value = errno; |
| 124 | 124 | ||
| 125 | va_start(ap, fmt); | 125 | va_start(ap, fmt); |
| 126 | rv = tls_error_vset(error, errnum, fmt, ap); | 126 | rv = tls_error_vset(error, errno_value, fmt, ap); |
| 127 | va_end(ap); | 127 | va_end(ap); |
| 128 | 128 | ||
| 129 | return (rv); | 129 | return (rv); |
| @@ -709,7 +709,7 @@ tls_reset(struct tls *ctx) | |||
| 709 | 709 | ||
| 710 | free(ctx->error.msg); | 710 | free(ctx->error.msg); |
| 711 | ctx->error.msg = NULL; | 711 | ctx->error.msg = NULL; |
| 712 | ctx->error.num = -1; | 712 | ctx->error.errno_value = -1; |
| 713 | 713 | ||
| 714 | tls_conninfo_free(ctx->conninfo); | 714 | tls_conninfo_free(ctx->conninfo); |
| 715 | ctx->conninfo = NULL; | 715 | ctx->conninfo = NULL; |
diff --git a/src/lib/libtls/tls_internal.h b/src/lib/libtls/tls_internal.h index 5cac881997..c06e8218f6 100644 --- a/src/lib/libtls/tls_internal.h +++ b/src/lib/libtls/tls_internal.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls_internal.h,v 1.83 2023/06/27 18:19:59 tb Exp $ */ | 1 | /* $OpenBSD: tls_internal.h,v 1.84 2024/03/26 00:50:22 joshua Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> | 3 | * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> |
| 4 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 4 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
| @@ -46,7 +46,7 @@ union tls_addr { | |||
| 46 | 46 | ||
| 47 | struct tls_error { | 47 | struct tls_error { |
| 48 | char *msg; | 48 | char *msg; |
| 49 | int num; | 49 | int errno_value; |
| 50 | int tls; | 50 | int tls; |
| 51 | }; | 51 | }; |
| 52 | 52 | ||
