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

rename index to idx

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15458 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-06-16 21:16:59 +00:00
parent b1efe15c20
commit ac94b1f03b
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/krb5/principal.c
View File

@@ -235,19 +235,19 @@ static const char replace_chars[] = " ntb\\/@";
#define add_char(BASE, INDEX, LEN, C) do { if((INDEX) < (LEN)) (BASE)[(INDEX)++] = (C); }while(0); #define add_char(BASE, INDEX, LEN, C) do { if((INDEX) < (LEN)) (BASE)[(INDEX)++] = (C); }while(0);
static size_t static size_t
quote_string(const char *s, char *out, size_t index, size_t len) quote_string(const char *s, char *out, size_t idx, size_t len)
{ {
const char *p, *q; const char *p, *q;
for(p = s; *p && index < len; p++){ for(p = s; *p && idx < len; p++){
if((q = strchr(quotable_chars, *p))){ if((q = strchr(quotable_chars, *p))){
add_char(out, index, len, '\\'); add_char(out, idx, len, '\\');
add_char(out, index, len, replace_chars[q - quotable_chars]); add_char(out, idx, len, replace_chars[q - quotable_chars]);
}else }else
add_char(out, index, len, *p); add_char(out, idx, len, *p);
} }
if(index < len) if(idx < len)
out[index] = '\0'; out[idx] = '\0';
return index; return idx;
} }
@@ -258,13 +258,13 @@ unparse_name_fixed(krb5_context context,
size_t len, size_t len,
krb5_boolean short_form) krb5_boolean short_form)
{ {
size_t index = 0; size_t idx = 0;
int i; int i;
for(i = 0; i < princ_num_comp(principal); i++){ for(i = 0; i < princ_num_comp(principal); i++){
if(i) if(i)
add_char(name, index, len, '/'); add_char(name, idx, len, '/');
index = quote_string(princ_ncomp(principal, i), name, index, len); idx = quote_string(princ_ncomp(principal, i), name, idx, len);
if(index == len) if(idx == len)
return ERANGE; return ERANGE;
} }
/* add realm if different from default realm */ /* add realm if different from default realm */
@@ -279,9 +279,9 @@ unparse_name_fixed(krb5_context context,
free(r); free(r);
} }
if(!short_form) { if(!short_form) {
add_char(name, index, len, '@'); add_char(name, idx, len, '@');
index = quote_string(princ_realm(principal), name, index, len); idx = quote_string(princ_realm(principal), name, idx, len);
if(index == len) if(idx == len)
return ERANGE; return ERANGE;
} }
return 0; return 0;