diff options
| author | Greg Hudson <ghudson@mit.edu> | 2013-02-14 11:41:10 -0500 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2013-02-14 11:42:28 -0500 |
| commit | 6dda284554a869f7fa1e6d2a035df06c97f103ef (patch) | |
| tree | 6854b38ce7274b914b82b20bfb65eb8130df1ab8 /src/lib/krb5/os/expand_path.c | |
| parent | 80f53c8b2c745e75dc9d22acba63812d8533c133 (diff) | |
| download | krb5-6dda284554a869f7fa1e6d2a035df06c97f103ef.tar.gz krb5-6dda284554a869f7fa1e6d2a035df06c97f103ef.tar.xz krb5-6dda284554a869f7fa1e6d2a035df06c97f103ef.zip | |
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.
Diffstat (limited to 'src/lib/krb5/os/expand_path.c')
| -rw-r--r-- | src/lib/krb5/os/expand_path.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/krb5/os/expand_path.c b/src/lib/krb5/os/expand_path.c index 2da145fd62..3d23849ba4 100644 --- a/src/lib/krb5/os/expand_path.c +++ b/src/lib/krb5/os/expand_path.c @@ -465,7 +465,7 @@ k5_expand_path_tokens_extra(krb5_context context, const char *path_in, *path_out = NULL; - krb5int_buf_init_dynamic(&buf); + k5_buf_init_dynamic(&buf); /* Count extra tokens. */ va_start(ap, path_out); @@ -497,10 +497,10 @@ k5_expand_path_tokens_extra(krb5_context context, const char *path_in, * If there are no more tokens, we can finish up. */ tok_begin = strstr(path_left, "%{"); if (tok_begin == NULL) { - krb5int_buf_add(&buf, path_left); + k5_buf_add(&buf, path_left); break; } - krb5int_buf_add_len(&buf, path_left, tok_begin - path_left); + k5_buf_add_len(&buf, path_left, tok_begin - path_left); /* Find the end of this token. */ tok_end = strchr(tok_begin, '}'); @@ -515,12 +515,12 @@ k5_expand_path_tokens_extra(krb5_context context, const char *path_in, &tok_val); if (ret) goto cleanup; - krb5int_buf_add(&buf, tok_val); + k5_buf_add(&buf, tok_val); free(tok_val); path_left = tok_end + 1; } - path = krb5int_buf_data(&buf); + path = k5_buf_data(&buf); if (path == NULL) { ret = ENOMEM; goto cleanup; @@ -539,7 +539,7 @@ k5_expand_path_tokens_extra(krb5_context context, const char *path_in, cleanup: if (*path_out == NULL) - krb5int_free_buf(&buf); + k5_free_buf(&buf); free_extra_tokens(extra_tokens); return 0; } |