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.

1 files changed, 39 insertions, 40 deletions

diff --git a/src/lib/krb5/os/trace.c b/src/lib/krb5/os/trace.c
index 8f9ba04d9..21fe1052c 100644
--- a/src/lib/krb5/os/trace.c
+++ b/src/lib/krb5/os/trace.c
@@ -64,15 +64,15 @@ buf_add_printable_len(struct k5buf *buf, const char *p, size_t len)
     size_t i;
 
     if (buf_is_printable(p, len)) {
-        krb5int_buf_add_len(buf, p, len);
+        k5_buf_add_len(buf, p, len);
     } else {
         for (i = 0; i < len; i++) {
             if (buf_is_printable(p + i, 1)) {
-                krb5int_buf_add_len(buf, p + i, 1);
+                k5_buf_add_len(buf, p + i, 1);
             } else {
                 snprintf(text, sizeof(text), "\\x%02x",
                          (unsigned)(p[i] & 0xff));
-                krb5int_buf_add_len(buf, text, 4);
+                k5_buf_add_len(buf, text, 4);
             }
         }
     }
@@ -145,11 +145,11 @@ trace_format(krb5_context context, const char *fmt, va_list ap)
     krb5_creds *creds;
     krb5_enctype *etypes, etype;
 
-    krb5int_buf_init_dynamic(&buf);
+    k5_buf_init_dynamic(&buf);
     while (TRUE) {
         /* Advance to the next word in braces. */
         len = strcspn(fmt, "{");
-        krb5int_buf_add_len(&buf, fmt, len);
+        k5_buf_add_len(&buf, fmt, len);
         if (fmt[len] == '\0')
             break;
         fmt += len + 1;
@@ -162,9 +162,9 @@ trace_format(krb5_context context, const char *fmt, va_list ap)
 
         /* Process the format word. */
         if (strcmp(tmpbuf, "int") == 0) {
-            krb5int_buf_add_fmt(&buf, "%d", va_arg(ap, int));
+            k5_buf_add_fmt(&buf, "%d", va_arg(ap, int));
         } else if (strcmp(tmpbuf, "long") == 0) {
-            krb5int_buf_add_fmt(&buf, "%ld", va_arg(ap, long));
+            k5_buf_add_fmt(&buf, "%ld", va_arg(ap, long));
         } else if (strcmp(tmpbuf, "str") == 0) {
             p = va_arg(ap, const char *);
             buf_add_printable(&buf, (p == NULL) ? "(null)" : p);
@@ -172,57 +172,57 @@ trace_format(krb5_context context, const char *fmt, va_list ap)
             len = va_arg(ap, size_t);
             p = va_arg(ap, const char *);
             if (p == NULL && len != 0)
-                krb5int_buf_add(&buf, "(null)");
+                k5_buf_add(&buf, "(null)");
             else
                 buf_add_printable_len(&buf, p, len);
         } else if (strcmp(tmpbuf, "hexlenstr") == 0) {
             len = va_arg(ap, size_t);
             p = va_arg(ap, const char *);
             if (p == NULL && len != 0)
-                krb5int_buf_add(&buf, "(null)");
+                k5_buf_add(&buf, "(null)");
             else {
                 for (i = 0; i < len; i++)
-                    krb5int_buf_add_fmt(&buf, "%02X", (unsigned char) p[i]);
+                    k5_buf_add_fmt(&buf, "%02X", (unsigned char)p[i]);
             }
         } else if (strcmp(tmpbuf, "hashlenstr") == 0) {
             len = va_arg(ap, size_t);
             p = va_arg(ap, const char *);
             if (p == NULL && len != 0)
-                krb5int_buf_add(&buf, "(null)");
+                k5_buf_add(&buf, "(null)");
             else {
                 str = hash_bytes(context, p, len);
                 if (str != NULL)
-                    krb5int_buf_add(&buf, str);
+                    k5_buf_add(&buf, str);
                 free(str);
             }
         } else if (strcmp(tmpbuf, "connstate") == 0) {
             cs = va_arg(ap, struct conn_state *);
             if (cs->socktype == SOCK_DGRAM)
-                krb5int_buf_add(&buf, "dgram");
+                k5_buf_add(&buf, "dgram");
             else if (cs->socktype == SOCK_STREAM)
-                krb5int_buf_add(&buf, "stream");
+                k5_buf_add(&buf, "stream");
             else
-                krb5int_buf_add_fmt(&buf, "socktype%d", cs->socktype);
+                k5_buf_add_fmt(&buf, "socktype%d", cs->socktype);
 
             if (getnameinfo((struct sockaddr *)&cs->addr, cs->addrlen,
                             addrbuf, sizeof(addrbuf), portbuf, sizeof(portbuf),
                             NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
                 if (cs->family == AF_UNSPEC)
-                    krb5int_buf_add(&buf, " AF_UNSPEC");
+                    k5_buf_add(&buf, " AF_UNSPEC");
                 else
-                    krb5int_buf_add_fmt(&buf, " af%d", cs->family);
+                    k5_buf_add_fmt(&buf, " af%d", cs->family);
             } else
-                krb5int_buf_add_fmt(&buf, " %s:%s", addrbuf, portbuf);
+                k5_buf_add_fmt(&buf, " %s:%s", addrbuf, portbuf);
         } else if (strcmp(tmpbuf, "data") == 0) {
             d = va_arg(ap, krb5_data *);
             if (d == NULL || (d->length != 0 && d->data == NULL))
-                krb5int_buf_add(&buf, "(null)");
+                k5_buf_add(&buf, "(null)");
             else
                 buf_add_printable_len(&buf, d->data, d->length);
         } else if (strcmp(tmpbuf, "hexdata") == 0) {
             d = va_arg(ap, krb5_data *);
             if (d == NULL)
-                krb5int_buf_add(&buf, "(null)");
+                k5_buf_add(&buf, "(null)");
             else
                 subfmt(context, &buf, "{hexlenstr}", d->length, d->data);
         } else if (strcmp(tmpbuf, "errno") == 0) {
@@ -234,17 +234,16 @@ trace_format(krb5_context context, const char *fmt, va_list ap)
 #endif
             if (p == NULL)
                 p = strerror(err);
-            krb5int_buf_add_fmt(&buf, "%d/%s", err, p);
+            k5_buf_add_fmt(&buf, "%d/%s", err, p);
         } else if (strcmp(tmpbuf, "kerr") == 0) {
             kerr = va_arg(ap, krb5_error_code);
             p = krb5_get_error_message(context, kerr);
-            krb5int_buf_add_fmt(&buf, "%ld/%s", (long) kerr,
-                                kerr ? p : "Success");
+            k5_buf_add_fmt(&buf, "%ld/%s", (long)kerr, kerr ? p : "Success");
             krb5_free_error_message(context, p);
         } else if (strcmp(tmpbuf, "keyblock") == 0) {
             keyblock = va_arg(ap, const krb5_keyblock *);
             if (keyblock == NULL)
-                krb5int_buf_add(&buf, "(null)");
+                k5_buf_add(&buf, "(null)");
             else {
                 subfmt(context, &buf, "{etype}/{hashlenstr}",
                        keyblock->enctype, keyblock->length,
@@ -253,7 +252,7 @@ trace_format(krb5_context context, const char *fmt, va_list ap)
         } else if (strcmp(tmpbuf, "key") == 0) {
             key = va_arg(ap, krb5_key);
             if (key == NULL)
-                krb5int_buf_add(&buf, "(null)");
+                k5_buf_add(&buf, "(null)");
             else
                 subfmt(context, &buf, "{keyblock}", &key->keyblock);
         } else if (strcmp(tmpbuf, "cksum") == 0) {
@@ -264,52 +263,52 @@ trace_format(krb5_context context, const char *fmt, va_list ap)
         } else if (strcmp(tmpbuf, "princ") == 0) {
             princ = va_arg(ap, krb5_principal);
             if (krb5_unparse_name(context, princ, &str) == 0) {
-                krb5int_buf_add(&buf, str);
+                k5_buf_add(&buf, str);
                 krb5_free_unparsed_name(context, str);
             }
         } else if (strcmp(tmpbuf, "ptype") == 0) {
             p = principal_type_string(va_arg(ap, krb5_int32));
-            krb5int_buf_add(&buf, p);
+            k5_buf_add(&buf, p);
         } else if (strcmp(tmpbuf, "patypes") == 0) {
             padata = va_arg(ap, krb5_pa_data **);
             if (padata == NULL || *padata == NULL)
-                krb5int_buf_add(&buf, "(empty)");
+                k5_buf_add(&buf, "(empty)");
             for (; padata != NULL && *padata != NULL; padata++) {
-                krb5int_buf_add_fmt(&buf, "%d", (int) (*padata)->pa_type);
+                k5_buf_add_fmt(&buf, "%d", (int)(*padata)->pa_type);
                 if (*(padata + 1) != NULL)
-                    krb5int_buf_add(&buf, ", ");
+                    k5_buf_add(&buf, ", ");
             }
         } else if (strcmp(tmpbuf, "etype") == 0) {
             etype = va_arg(ap, krb5_enctype);
             if (krb5_enctype_to_name(etype, TRUE, tmpbuf, sizeof(tmpbuf)) == 0)
-                krb5int_buf_add(&buf, tmpbuf);
+                k5_buf_add(&buf, tmpbuf);
             else
-                krb5int_buf_add_fmt(&buf, "%d", (int) etype);
+                k5_buf_add_fmt(&buf, "%d", (int)etype);
         } else if (strcmp(tmpbuf, "etypes") == 0) {
             etypes = va_arg(ap, krb5_enctype *);
             if (etypes == NULL || *etypes == 0)
-                krb5int_buf_add(&buf, "(empty)");
+                k5_buf_add(&buf, "(empty)");
             for (; etypes != NULL && *etypes != 0; etypes++) {
                 subfmt(context, &buf, "{etype}", *etypes);
                 if (*(etypes + 1) != 0)
-                    krb5int_buf_add(&buf, ", ");
+                    k5_buf_add(&buf, ", ");
             }
         } else if (strcmp(tmpbuf, "ccache") == 0) {
             ccache = va_arg(ap, krb5_ccache);
-            krb5int_buf_add(&buf, krb5_cc_get_type(context, ccache));
-            krb5int_buf_add(&buf, ":");
-            krb5int_buf_add(&buf, krb5_cc_get_name(context, ccache));
+            k5_buf_add(&buf, krb5_cc_get_type(context, ccache));
+            k5_buf_add(&buf, ":");
+            k5_buf_add(&buf, krb5_cc_get_name(context, ccache));
         } else if (strcmp(tmpbuf, "keytab") == 0) {
             keytab = va_arg(ap, krb5_keytab);
             if (krb5_kt_get_name(context, keytab, tmpbuf, sizeof(tmpbuf)) == 0)
-                krb5int_buf_add(&buf, tmpbuf);
+                k5_buf_add(&buf, tmpbuf);
         } else if (strcmp(tmpbuf, "creds") == 0) {
             creds = va_arg(ap, krb5_creds *);
             subfmt(context, &buf, "{princ} -> {princ}",
                    creds->client, creds->server);
         }
     }
-    return krb5int_buf_data(&buf);
+    return k5_buf_data(&buf);
 }
 
 /* Allows trace_format formatters to be represented in terms of other
@@ -323,7 +322,7 @@ subfmt(krb5_context context, struct k5buf *buf, const char *fmt, ...)
     va_start(ap, fmt);
     str = trace_format(context, fmt, ap);
     if (str != NULL)
-        krb5int_buf_add(buf, str);
+        k5_buf_add(buf, str);
     free(str);
     va_end(ap);
 }