oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Rename get_entry() -> _krb5_config_get_entry()

Browse Source
This commit is contained in:
Asanka C. Herath
2010-09-23 15:01:49 -04:00
parent 88252f6967
commit f159cef78a
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/krb5/config_file.c
View File

@@ -85,7 +85,7 @@ static krb5_error_code parse_list(struct fileptr *f, unsigned *lineno,
const char **err_message); const char **err_message);
krb5_config_section * 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; krb5_config_section **q;
@@ -135,7 +135,7 @@ parse_section(char *p, krb5_config_section **s, krb5_config_section **parent,
return KRB5_CONFIG_BADFORMAT; return KRB5_CONFIG_BADFORMAT;
} }
*p1 = '\0'; *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) { if(tmp == NULL) {
*err_message = "out of memory"; *err_message = "out of memory";
return KRB5_CONFIG_BADFORMAT; return KRB5_CONFIG_BADFORMAT;
@@ -216,14 +216,14 @@ parse_binding(struct fileptr *f, unsigned *lineno, char *p,
++p; ++p;
*p2 = '\0'; *p2 = '\0';
if (*p == '{') { if (*p == '{') {
tmp = get_entry(parent, p1, krb5_config_list); tmp = _krb5_config_get_entry(parent, p1, krb5_config_list);
if (tmp == NULL) { if (tmp == NULL) {
*err_message = "out of memory"; *err_message = "out of memory";
return KRB5_CONFIG_BADFORMAT; return KRB5_CONFIG_BADFORMAT;
} }
ret = parse_list (f, lineno, &tmp->u.list, err_message); ret = parse_list (f, lineno, &tmp->u.list, err_message);
} else { } else {
tmp = get_entry(parent, p1, krb5_config_string); tmp = _krb5_config_get_entry(parent, p1, krb5_config_string);
if (tmp == NULL) { if (tmp == NULL) {
*err_message = "out of memory"; *err_message = "out of memory";
return KRB5_CONFIG_BADFORMAT; return KRB5_CONFIG_BADFORMAT;
@@ -282,10 +282,10 @@ convert_content(const void *key, const void *value, void *context)
return; return;
if (CFGetTypeID(value) == CFStringGetTypeID()) { 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); tmp->u.string = cfstring2cstring(value);
} else if (CFGetTypeID(value) == CFDictionaryGetTypeID()) { } 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); CFDictionaryApplyFunction(value, convert_content, &tmp->u.list);
} else { } else {
/* log */ /* log */

6
lib/krb5/config_reg.c
View File

@@ -124,7 +124,7 @@ parse_reg_value(krb5_context context,
goto done; goto done;
} }
value = get_entry(parent, valuename, krb5_config_string); value = _krb5_config_get_entry(parent, valuename, krb5_config_string);
if (value == NULL) { if (value == NULL) {
code = ENOMEM; code = ENOMEM;
goto done; goto done;
@@ -257,7 +257,7 @@ parse_reg_subkeys(krb5_context context,
if (rcode != ERROR_SUCCESS) if (rcode != ERROR_SUCCESS)
continue; continue;
section = get_entry(parent, name, krb5_config_list); section = _krb5_config_get_entry(parent, name, krb5_config_list);
if (section == NULL) { if (section == NULL) {
RegCloseKey(subkey); RegCloseKey(subkey);
return ENOMEM; return ENOMEM;
@@ -289,7 +289,7 @@ parse_reg_root(krb5_context context,
krb5_config_section *libdefaults = NULL; krb5_config_section *libdefaults = NULL;
krb5_error_code code = 0; 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) { if (libdefaults == NULL) {
krb5_set_error_message(context, ENOMEM, "Out of memory while parsing configuration"); krb5_set_error_message(context, ENOMEM, "Out of memory while parsing configuration");
return ENOMEM; return ENOMEM;