Modernize k5buf

Rename the krb5int_buf_ family of functions to use the k5_ prefix for
brevity.  Reformat some k5buf implementation code to match current
practices.

2 files changed, 9 insertions, 9 deletions

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c
index 7ce50b30b..47ba5f022 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c
@@ -412,14 +412,14 @@ krb5_ldap_parse_principal_name(char *i_princ_name, char **o_princ_name)
         if (!o_princ_name)
             return ENOMEM;
     } else {
-        krb5int_buf_init_dynamic(&buf);
+        k5_buf_init_dynamic(&buf);
         for (p = i_princ_name; p < at_rlm_name; p++) {
             if (*p == '@')
-                krb5int_buf_add(&buf, "\\");
-            krb5int_buf_add_len(&buf, p, 1);
+                k5_buf_add(&buf, "\\");
+            k5_buf_add_len(&buf, p, 1);
         }
-        krb5int_buf_add(&buf, at_rlm_name);
-        *o_princ_name = krb5int_buf_data(&buf);
+        k5_buf_add(&buf, at_rlm_name);
+        *o_princ_name = k5_buf_data(&buf);
         if (!*o_princ_name)
             return ENOMEM;
     }
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.c
index 1e3d5354b..ad6b7fe6e 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.c
@@ -78,16 +78,16 @@ ldap_filter_correct (char *in)
     const char special[] = "*()\\ #\"+,;<>";
     struct k5buf buf;
 
-    krb5int_buf_init_dynamic(&buf);
+    k5_buf_init_dynamic(&buf);
     while (TRUE) {
         count = strcspn(in, special);
-        krb5int_buf_add_len(&buf, in, count);
+        k5_buf_add_len(&buf, in, count);
         in += count;
         if (*in == '\0')
             break;
-        krb5int_buf_add_fmt(&buf, "\\%2x", (unsigned char)*in++);
+        k5_buf_add_fmt(&buf, "\\%2x", (unsigned char)*in++);
     }
-    return krb5int_buf_data(&buf);
+    return k5_buf_data(&buf);
 }
 
 static int