Rename some of the internal error setting functions to more closely follow

existing naming standards. Also provide functions for setting a struct
tls_error * directly (rather than having to have a struct tls * or a
struct tls_config *).

1 files changed, 36 insertions, 8 deletions

diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c
index d067309cd3..76d00e53f3 100644
--- a/src/lib/libtls/tls.c
+++ b/src/lib/libtls/tls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls.c,v 1.37 2016/04/28 17:05:59 jsing Exp $ */
+/* $OpenBSD: tls.c,v 1.38 2016/05/27 14:38:40 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -62,7 +62,7 @@ tls_error(struct tls *ctx)
 }
 
 static int
-tls_set_verror(struct tls_error *error, int errnum, const char *fmt, va_list ap)
+tls_error_vset(struct tls_error *error, int errnum, const char *fmt, va_list ap)
 {
         char *errmsg = NULL;
         int rv = -1;
@@ -94,7 +94,7 @@ tls_set_verror(struct tls_error *error, int errnum, const char *fmt, va_list ap)
 }
 
 int
-tls_set_config_error(struct tls_config *config, const char *fmt, ...)
+tls_error_set(struct tls_error *error, const char *fmt, ...)
 {
         va_list ap;
         int errnum, rv;
@@ -102,20 +102,48 @@ tls_set_config_error(struct tls_config *config, const char *fmt, ...)
         errnum = errno;
 
         va_start(ap, fmt);
-        rv = tls_set_verror(&config->error, errnum, fmt, ap);
+        rv = tls_error_vset(error, errnum, fmt, ap);
         va_end(ap);
 
         return (rv);
 }
 
 int
-tls_set_config_errorx(struct tls_config *config, const char *fmt, ...)
+tls_error_setx(struct tls_error *error, const char *fmt, ...)
 {
         va_list ap;
         int rv;
 
         va_start(ap, fmt);
-        rv = tls_set_verror(&config->error, -1, fmt, ap);
+        rv = tls_error_vset(error, -1, fmt, ap);
+        va_end(ap);
+
+        return (rv);
+}
+
+int
+tls_config_set_error(struct tls_config *config, const char *fmt, ...)
+{
+        va_list ap;
+        int errnum, rv;
+
+        errnum = errno;
+
+        va_start(ap, fmt);
+        rv = tls_error_vset(&config->error, errnum, fmt, ap);
+        va_end(ap);
+
+        return (rv);
+}
+
+int
+tls_config_set_errorx(struct tls_config *config, const char *fmt, ...)
+{
+        va_list ap;
+        int rv;
+
+        va_start(ap, fmt);
+        rv = tls_error_vset(&config->error, -1, fmt, ap);
         va_end(ap);
 
         return (rv);
@@ -130,7 +158,7 @@ tls_set_error(struct tls *ctx, const char *fmt, ...)
         errnum = errno;
 
         va_start(ap, fmt);
-        rv = tls_set_verror(&ctx->error, errnum, fmt, ap);
+        rv = tls_error_vset(&ctx->error, errnum, fmt, ap);
         va_end(ap);
 
         return (rv);
@@ -143,7 +171,7 @@ tls_set_errorx(struct tls *ctx, const char *fmt, ...)
         int rv;
 
         va_start(ap, fmt);
-        rv = tls_set_verror(&ctx->error, -1, fmt, ap);
+        rv = tls_error_vset(&ctx->error, -1, fmt, ap);
         va_end(ap);
 
         return (rv);