From a26d20cfbb7b8dd9856e62c6ce07e03d77df1d67 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Sat, 3 Jul 2010 23:00:18 -0400 Subject: [PATCH] s/list_add/src_list_add/ Avoid global namespace clashes. Signed-off-by: Jeff Garzik --- rngd.h | 2 +- rngd_entsource.c | 4 ++-- rngd_linux.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rngd.h b/rngd.h index e2e3a62..6e7e83f 100644 --- a/rngd.h +++ b/rngd.h @@ -72,6 +72,6 @@ extern int am_daemon; /* Nonzero if we went daemon */ } \ } while (0) -extern void list_add(struct rng *ent_src); +extern void src_list_add(struct rng *ent_src); #endif /* RNGD__H */ diff --git a/rngd_entsource.c b/rngd_entsource.c index 102178b..9d07691 100644 --- a/rngd_entsource.c +++ b/rngd_entsource.c @@ -170,7 +170,7 @@ int init_entropy_source(struct rng *ent_src) if (ent_src->rng_fd == -1) { return 1; } - list_add(ent_src); + src_list_add(ent_src); /* Bootstrap FIPS tests */ ent_src->fipsctx = malloc(sizeof(fips_ctx_t)); fips_init(ent_src->fipsctx, discard_initial_data(ent_src)); @@ -186,7 +186,7 @@ int init_tpm_entropy_source(struct rng *ent_src) if (ent_src->rng_fd == -1) { return 1; } - list_add(ent_src); + src_list_add(ent_src); /* Bootstrap FIPS tests */ ent_src->fipsctx = malloc(sizeof(fips_ctx_t)); fips_init(ent_src->fipsctx, 0); diff --git a/rngd_linux.c b/rngd_linux.c index 031a22b..173a315 100644 --- a/rngd_linux.c +++ b/rngd_linux.c @@ -104,7 +104,7 @@ void random_sleep(double poll_timeout) poll(&pfd, 1, 1000.0 * poll_timeout); } -void list_add(struct rng *ent_src) +void src_list_add(struct rng *ent_src) { if (rng_list) { struct rng *iter; -- 2.47.3