From 5fde513370bfb35bd3a262780c4203399a2a047a Mon Sep 17 00:00:00 2001 From: tb Date: Fri, 16 Feb 2024 15:19:02 +0000 Subject: [PATCH] Rename fn into fileName to avoid name clash ok job --- usr.sbin/rpki-client/rsc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/rpki-client/rsc.c b/usr.sbin/rpki-client/rsc.c index 4fc5ce10c9d..6bac1f76784 100644 --- a/usr.sbin/rpki-client/rsc.c +++ b/usr.sbin/rpki-client/rsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsc.c,v 1.32 2024/02/16 15:15:02 tb Exp $ */ +/* $OpenBSD: rsc.c,v 1.33 2024/02/16 15:19:02 tb Exp $ */ /* * Copyright (c) 2022 Theo Buehler * Copyright (c) 2022 Job Snijders @@ -277,7 +277,7 @@ static int rsc_parse_checklist(struct parse *p, const STACK_OF(FileNameAndHash) *checkList) { FileNameAndHash *fh; - ASN1_IA5STRING *fn; + ASN1_IA5STRING *fileName; struct rscfile *file; size_t sz, i; @@ -308,15 +308,15 @@ rsc_parse_checklist(struct parse *p, const STACK_OF(FileNameAndHash) *checkList) } memcpy(file->hash, fh->hash->data, SHA256_DIGEST_LENGTH); - if ((fn = fh->fileName) == NULL) + if ((fileName = fh->fileName) == NULL) continue; - if (!valid_filename(fn->data, fn->length)) { + if (!valid_filename(fileName->data, fileName->length)) { warnx("%s: RSC FileNameAndHash: bad filename", p->fn); return 0; } - file->filename = strndup(fn->data, fn->length); + file->filename = strndup(fileName->data, fileName->length); if (file->filename == NULL) err(1, NULL); } -- 2.20.1