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@15461 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-06-16 22:52:33 +00:00
parent f4ed8d6a38
commit abd08f59fd
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/kafs/common.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2003 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2005 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -200,12 +200,12 @@ dns_find_cell(const char *cell, char *dbserver, size_t len)
* Try to find the cells we should try to klog to in "file". * Try to find the cells we should try to klog to in "file".
*/ */
static void static void
find_cells(const char *file, char ***cells, int *index) find_cells(const char *file, char ***cells, int *idx)
{ {
FILE *f; FILE *f;
char cell[64]; char cell[64];
int i; int i;
int ind = *index; int ind = *idx;
f = fopen(file, "r"); f = fopen(file, "r");
if (f == NULL) if (f == NULL)
@@ -235,7 +235,7 @@ find_cells(const char *file, char ***cells, int *index)
} }
} }
fclose(f); fclose(f);
*index = ind; *idx = ind;
} }
/* /*
@@ -261,31 +261,31 @@ _kafs_afslog_all_local_cells(struct kafs_data *data,
{ {
int ret; int ret;
char **cells = NULL; char **cells = NULL;
int index = 0; int idx = 0;
if (homedir == NULL) if (homedir == NULL)
homedir = getenv("HOME"); homedir = getenv("HOME");
if (homedir != NULL) { if (homedir != NULL) {
char home[MaxPathLen]; char home[MaxPathLen];
snprintf(home, sizeof(home), "%s/.TheseCells", homedir); snprintf(home, sizeof(home), "%s/.TheseCells", homedir);
find_cells(home, &cells, &index); find_cells(home, &cells, &idx);
} }
find_cells(_PATH_THESECELLS, &cells, &index); find_cells(_PATH_THESECELLS, &cells, &idx);
find_cells(_PATH_THISCELL, &cells, &index); find_cells(_PATH_THISCELL, &cells, &idx);
find_cells(_PATH_ARLA_THESECELLS, &cells, &index); find_cells(_PATH_ARLA_THESECELLS, &cells, &idx);
find_cells(_PATH_ARLA_THISCELL, &cells, &index); find_cells(_PATH_ARLA_THISCELL, &cells, &idx);
find_cells(_PATH_OPENAFS_DEBIAN_THESECELLS, &cells, &index); find_cells(_PATH_OPENAFS_DEBIAN_THESECELLS, &cells, &idx);
find_cells(_PATH_OPENAFS_DEBIAN_THISCELL, &cells, &index); find_cells(_PATH_OPENAFS_DEBIAN_THISCELL, &cells, &idx);
find_cells(_PATH_OPENAFS_MACOSX_THESECELLS, &cells, &index); find_cells(_PATH_OPENAFS_MACOSX_THESECELLS, &cells, &idx);
find_cells(_PATH_OPENAFS_MACOSX_THISCELL, &cells, &index); find_cells(_PATH_OPENAFS_MACOSX_THISCELL, &cells, &idx);
find_cells(_PATH_ARLA_DEBIAN_THESECELLS, &cells, &index); find_cells(_PATH_ARLA_DEBIAN_THESECELLS, &cells, &idx);
find_cells(_PATH_ARLA_DEBIAN_THISCELL, &cells, &index); find_cells(_PATH_ARLA_DEBIAN_THISCELL, &cells, &idx);
find_cells(_PATH_ARLA_OPENBSD_THESECELLS, &cells, &index); find_cells(_PATH_ARLA_OPENBSD_THESECELLS, &cells, &idx);
find_cells(_PATH_ARLA_OPENBSD_THISCELL, &cells, &index); find_cells(_PATH_ARLA_OPENBSD_THISCELL, &cells, &idx);
ret = afslog_cells(data, cells, index, uid, homedir); ret = afslog_cells(data, cells, idx, uid, homedir);
while(index > 0) while(idx > 0)
free(cells[--index]); free(cells[--idx]);
free(cells); free(cells);
return ret; return ret;
} }