From 3ffde583575d77f6c315096bca0eb95a16d90d46 Mon Sep 17 00:00:00 2001 From: simonb Date: Fri, 6 Oct 2023 06:25:22 +0000 Subject: [PATCH] Reduce upstream diffs. --- external/bsd/less/dist/lglob.h | 14 +++++++------- external/bsd/less/dist/linenum.c | 6 +----- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/external/bsd/less/dist/lglob.h b/external/bsd/less/dist/lglob.h index 7b31ebf8d0b5..c4d74e571d1c 100644 --- a/external/bsd/less/dist/lglob.h +++ b/external/bsd/less/dist/lglob.h @@ -1,4 +1,4 @@ -/* $NetBSD: lglob.h,v 1.5 2023/10/06 05:49:49 simonb Exp $ */ +/* $NetBSD: lglob.h,v 1.6 2023/10/06 06:25:22 simonb Exp $ */ /* * Copyright (C) 1984-2023 Mark Nudelman @@ -35,12 +35,12 @@ #else #if MSDOS_COMPILER==DJGPPC -#define DECL_GLOB_LIST(list) glob_t list; size_t i; -#define GLOB_LIST(filename,list) glob(filename,GLOB_NOCHECK,0,&list) -#define GLOB_LIST_FAILED(list) 0 -#define SCAN_GLOB_LIST(list,p) i = 0; i < list.gl_pathc; i++ -#define INIT_GLOB_LIST(list,p) p = list.gl_pathv[i] -#define GLOB_LIST_DONE(list) globfree(&list) +#define DECL_GLOB_LIST(list) glob_t list; size_t i; +#define GLOB_LIST(filename,list) glob(filename,GLOB_NOCHECK,0,&list) +#define GLOB_LIST_FAILED(list) 0 +#define SCAN_GLOB_LIST(list,p) i = 0; i < list.gl_pathc; i++ +#define INIT_GLOB_LIST(list,p) p = list.gl_pathv[i] +#define GLOB_LIST_DONE(list) globfree(&list) #else #if MSDOS_COMPILER==MSOFTC || MSDOS_COMPILER==BORLANDC diff --git a/external/bsd/less/dist/linenum.c b/external/bsd/less/dist/linenum.c index 751fd59dd970..001e47fa4605 100644 --- a/external/bsd/less/dist/linenum.c +++ b/external/bsd/less/dist/linenum.c @@ -1,4 +1,4 @@ -/* $NetBSD: linenum.c,v 1.5 2023/10/06 05:49:49 simonb Exp $ */ +/* $NetBSD: linenum.c,v 1.6 2023/10/06 06:25:22 simonb Exp $ */ /* * Copyright (C) 1984-2023 Mark Nudelman @@ -74,10 +74,6 @@ extern int screen_trashed; extern int header_lines; extern int nonum_headers; -static void calcgap __P((struct linenum_info *)); -static void longloopmessage __P((void)); -static void longish __P((void)); - /* * Initialize the line number structures. */