Skip to content

Commit

Permalink
sysutils/44bsd-more: Fix build with LLVM16
Browse files Browse the repository at this point in the history
main.c:440:22: error: incompatible function pointer types passing 'int (void *, char *, size_t)' (aka 'int (void *, char *, unsigned long)') to parameter of type 'int (* _Nullable)(void *, char *, int)' [-Wincompatible-function-pointer-types]
                fd = fropen(DEFRC, str_read);
                                   ^~~~~~~~

MFH:	2023Q3
  • Loading branch information
cschuber committed Jun 25, 2023
1 parent 8906117 commit 6bef86a
Showing 1 changed file with 18 additions and 9 deletions.
27 changes: 18 additions & 9 deletions sysutils/44bsd-more/files/patch-main.c
@@ -1,5 +1,5 @@
--- main.c.orig 2011-09-08 01:02:56.000000000 +0800
+++ main.c 2011-09-08 01:17:47.000000000 +0800
--- main.c.orig 2023-06-25 13:45:14.613216000 -0700
+++ main.c 2023-06-25 13:49:15.978996000 -0700
@@ -33,9 +33,9 @@
*/

Expand All @@ -12,26 +12,26 @@
Regents of the University of California. All rights reserved.\n";
#endif /* not lint */

@@ -68,6 +68,10 @@ static const char rcsid[] =
@@ -68,6 +68,10 @@
#include "less.h"
#include "pathnames.h"

+static int str_read(void *, char *, size_t);
+static int str_read(void *, char *, int);
+void rcfiles();
+void readrc(FILE *);
+
int ispipe;
char *current_file, *previous_file, *current_name, *next_name;
int any_display;
@@ -214,6 +218,7 @@ edit(filename, force_open)
@@ -214,6 +218,7 @@
/*
* Edit the next file in the command line list.
*/
+void
next_file(n)
int n;
{
@@ -281,7 +286,7 @@ main(argc, argv)
@@ -281,7 +286,7 @@
* Process command line arguments and MORE environment arguments.
* Command line arguments override environment arguments.
*/
Expand All @@ -40,7 +40,7 @@
envargc = 2;
envargv[0] = "more";
envargv[2] = NULL;
@@ -403,14 +408,14 @@ quit()
@@ -403,14 +408,14 @@
* Read in from each of the three rc files - default, system, user.
* Calls handle_error() directly to report errors.
*/
Expand All @@ -57,15 +57,15 @@

/* The default builtin rc file */
if ((c = getenv("HOME")) &&
@@ -480,6 +485,7 @@ use_builtin_defrc:
@@ -480,6 +485,7 @@
* This really belongs in ncommand.c, but that file is already 33292 bytes
* long.
*/
+void
readrc(fd)
FILE *fd;
{
@@ -489,7 +495,7 @@ readrc(fd)
@@ -489,7 +495,7 @@

buf = NULL;
strlenbuf = 0;
Expand All @@ -74,3 +74,12 @@
if (!len)
continue; /* ??? */
if (*bufptr == '#')
@@ -527,7 +533,7 @@
str_read(cookie, buf, len)
void *cookie;
char *buf;
- size_t len;
+ int len;
{
static char *curpos;
static int cooklen;

0 comments on commit 6bef86a

Please sign in to comment.