d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Ensure that linker file id's are unique, rather than blindly

Browse Source 
incrementing the value.

Reviewed by: dfr, peter
This commit is contained in:
Andrew R. Reiter 2001-11-18 18:19:35 +00:00
parent 6971b3c7d1
commit b489b4075c
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/kern/kern_linker.c
View File

@ -70,6 +70,20 @@ static linker_class_list_t classes;
static linker_file_list_t linker_files;
static int next_file_id = 1;
#define LINKER_GET_NEXT_FILE_ID(a) do { \
linker_file_t lftmp; \
\
retry: \
TAILQ_FOREACH(lftmp, &linker_files, link) { \
if (next_file_id == lftmp->id) { \
next_file_id++; \
goto retry; \
} \
} \
(a) = next_file_id; \
} while(0)
/* XXX wrong name; we're looking at version provision tags here, not modules */
typedef TAILQ_HEAD(, modlist) modlisthead_t;
struct modlist {
@ -401,7 +415,7 @@ linker_make_file(const char* pathname, linker_class_t lc)
lf->userrefs = 0;
lf->flags = 0;
lf->filename = linker_strdup(filename);
lf->id = next_file_id++;
LINKER_GET_NEXT_FILE_ID(lf->id);
lf->ndeps = 0;
lf->deps = NULL;
STAILQ_INIT(&lf->common);