Module Name: src
Committed By: simonb
Date: Fri Oct 6 06:25:23 UTC 2023
Modified Files:
src/external/bsd/less/dist: lglob.h linenum.c
Log Message:
Reduce upstream diffs.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/less/dist/lglob.h \
src/external/bsd/less/dist/linenum.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/less/dist/lglob.h
diff -u src/external/bsd/less/dist/lglob.h:1.5 src/external/bsd/less/dist/lglob.h:1.6
--- src/external/bsd/less/dist/lglob.h:1.5 Fri Oct 6 05:49:49 2023
+++ src/external/bsd/less/dist/lglob.h Fri Oct 6 06:25:22 2023
@@ -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
Index: src/external/bsd/less/dist/linenum.c
diff -u src/external/bsd/less/dist/linenum.c:1.5 src/external/bsd/less/dist/linenum.c:1.6
--- src/external/bsd/less/dist/linenum.c:1.5 Fri Oct 6 05:49:49 2023
+++ src/external/bsd/less/dist/linenum.c Fri Oct 6 06:25:22 2023
@@ -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.
*/