libotputil: renaming member otp_method to util_method in 'struct _otputil_secret'

2 files changed, 8 insertions, 8 deletions

diff --git a/lib/libotputil/lcore.c b/lib/libotputil/lcore.c
index 940f944..8b79e26 100644
--- a/lib/libotputil/lcore.c
+++ b/lib/libotputil/lcore.c
@@ -78,7 +78,7 @@ const otputil_t otputil_const_defaults =
 {
    // general options
    .util_desc              = NULL,
-   .otp_method             = OTPUTIL_DFLT_METH,
+   .util_method            = OTPUTIL_DFLT_METH,
    // HOTP options
    .hotp_k                 = &otputil_const_defaults_k,
    .hotp_c                 = OTPUTIL_DFLT_HOTP_C,
@@ -99,7 +99,7 @@ otputil_t otputil_defaults =
 {
    // general options
    .util_desc              = NULL,
-   .otp_method             = OTPUTIL_DFLT_METH,
+   .util_method            = OTPUTIL_DFLT_METH,
    // HOTP options
    .hotp_k                 = NULL,
    .hotp_c                 = OTPUTIL_DFLT_HOTP_C,
@@ -185,7 +185,7 @@ otputil_get_param(
       return(OTPUTIL_SUCCESS);
 
       case OTPUTIL_OPT_METHOD:
-      *((int *)outvalue) = (int)tud->otp_method;
+      *((int *)outvalue) = (int)tud->util_method;
       return(OTPUTIL_SUCCESS);
 
       ////////////////////////////
@@ -390,7 +390,7 @@ otputil_set_param(
       return(OTPUTIL_SUCCESS);
 
       case OTPUTIL_OPT_METHOD:
-      tud->otp_method = (int32_t)_SET_INPUT_NUM(int, defaults->otp_method);
+      tud->util_method = (int32_t)_SET_INPUT_NUM(int, defaults->util_method);
       return(OTPUTIL_SUCCESS);
 
       ////////////////////////////
@@ -513,7 +513,7 @@ otputil_code(
 
    tud      = ((tud)) ? tud : &otputil_defaults;
 
-   switch(tud->otp_method)
+   switch(tud->util_method)
    {
       case OTPUTIL_METH_HOTP:
       dflt_bv = ((tud->hotp_k)) ? tud->hotp_k  : otputil_defaults.hotp_k;
@@ -549,7 +549,7 @@ otputil_str(
    if ((code = otputil_code(tud)) == -1)
       return(NULL);
 
-   switch(tud->otp_method)
+   switch(tud->util_method)
    {
       case OTPUTIL_METH_HOTP: return(otputil_code2str(code, (int)tud->hotp_digits, dst, dstlen));
       case OTPUTIL_METH_TOTP: return(otputil_code2str(code, (int)tud->totp_digits, dst, dstlen));
@@ -564,7 +564,7 @@ otputil_timer(
          otputil_t *                   tud )
 {
    tud = ((tud)) ? tud : &otputil_defaults;
-   switch(tud->otp_method)
+   switch(tud->util_method)
    {
       case OTPUTIL_METH_TOTP: return(otputil_totp_timer(tud->totp_t0, tud->totp_tx, tud->totp_time));
       default: break;
diff --git a/lib/libotputil/libotputil.h b/lib/libotputil/libotputil.h
index d92d804..78a7d32 100644
--- a/lib/libotputil/libotputil.h
+++ b/lib/libotputil/libotputil.h
@@ -73,7 +73,7 @@
 //   k:c:0:hmac:desc
 struct _otputil_secret
 {
-   int32_t                 otp_method;
+   int32_t                 util_method;
    int8_t                  hotp_digits;
    int8_t                  hotp_hmac;
    int8_t                  totp_digits;