From f159cef78a45db42016f9a0e6ba2113b92bffbb6 Mon Sep 17 00:00:00 2001 From: "Asanka C. Herath" Date: Thu, 23 Sep 2010 15:01:49 -0400 Subject: [PATCH] Rename get_entry() -> _krb5_config_get_entry() --- lib/krb5/config_file.c | 12 ++++++------ lib/krb5/config_reg.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/krb5/config_file.c b/lib/krb5/config_file.c index 828371cc2..ee9ab6c48 100644 --- a/lib/krb5/config_file.c +++ b/lib/krb5/config_file.c @@ -85,7 +85,7 @@ static krb5_error_code parse_list(struct fileptr *f, unsigned *lineno, const char **err_message); krb5_config_section * -get_entry(krb5_config_section **parent, const char *name, int type) +_krb5_config_get_entry(krb5_config_section **parent, const char *name, int type) { krb5_config_section **q; @@ -135,7 +135,7 @@ parse_section(char *p, krb5_config_section **s, krb5_config_section **parent, return KRB5_CONFIG_BADFORMAT; } *p1 = '\0'; - tmp = get_entry(parent, p + 1, krb5_config_list); + tmp = _krb5_config_get_entry(parent, p + 1, krb5_config_list); if(tmp == NULL) { *err_message = "out of memory"; return KRB5_CONFIG_BADFORMAT; @@ -216,14 +216,14 @@ parse_binding(struct fileptr *f, unsigned *lineno, char *p, ++p; *p2 = '\0'; if (*p == '{') { - tmp = get_entry(parent, p1, krb5_config_list); + tmp = _krb5_config_get_entry(parent, p1, krb5_config_list); if (tmp == NULL) { *err_message = "out of memory"; return KRB5_CONFIG_BADFORMAT; } ret = parse_list (f, lineno, &tmp->u.list, err_message); } else { - tmp = get_entry(parent, p1, krb5_config_string); + tmp = _krb5_config_get_entry(parent, p1, krb5_config_string); if (tmp == NULL) { *err_message = "out of memory"; return KRB5_CONFIG_BADFORMAT; @@ -282,10 +282,10 @@ convert_content(const void *key, const void *value, void *context) return; if (CFGetTypeID(value) == CFStringGetTypeID()) { - tmp = get_entry(parent, k, krb5_config_string); + tmp = _krb5_config_get_entry(parent, k, krb5_config_string); tmp->u.string = cfstring2cstring(value); } else if (CFGetTypeID(value) == CFDictionaryGetTypeID()) { - tmp = get_entry(parent, k, krb5_config_list); + tmp = _krb5_config_get_entry(parent, k, krb5_config_list); CFDictionaryApplyFunction(value, convert_content, &tmp->u.list); } else { /* log */ diff --git a/lib/krb5/config_reg.c b/lib/krb5/config_reg.c index 9b1b253c0..299c867f1 100644 --- a/lib/krb5/config_reg.c +++ b/lib/krb5/config_reg.c @@ -124,7 +124,7 @@ parse_reg_value(krb5_context context, goto done; } - value = get_entry(parent, valuename, krb5_config_string); + value = _krb5_config_get_entry(parent, valuename, krb5_config_string); if (value == NULL) { code = ENOMEM; goto done; @@ -257,7 +257,7 @@ parse_reg_subkeys(krb5_context context, if (rcode != ERROR_SUCCESS) continue; - section = get_entry(parent, name, krb5_config_list); + section = _krb5_config_get_entry(parent, name, krb5_config_list); if (section == NULL) { RegCloseKey(subkey); return ENOMEM; @@ -289,7 +289,7 @@ parse_reg_root(krb5_context context, krb5_config_section *libdefaults = NULL; krb5_error_code code = 0; - libdefaults = get_entry(parent, "libdefaults", krb5_config_list); + libdefaults = _krb5_config_get_entry(parent, "libdefaults", krb5_config_list); if (libdefaults == NULL) { krb5_set_error_message(context, ENOMEM, "Out of memory while parsing configuration"); return ENOMEM;