git: c330a185b7a7 - main - locate: Use C89 function definitions.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 18 Apr 2023 18:31:32 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=c330a185b7a781e3fc805992a618fcf4764825ec
commit c330a185b7a781e3fc805992a618fcf4764825ec
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-04-18 18:27:08 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-04-18 18:27:08 +0000
locate: Use C89 function definitions.
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D39526
---
usr.bin/locate/locate/fastfind.c | 15 +++------------
usr.bin/locate/locate/util.c | 15 +++++----------
2 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/usr.bin/locate/locate/fastfind.c b/usr.bin/locate/locate/fastfind.c
index 2300d17cff00..f9c708b59509 100644
--- a/usr.bin/locate/locate/fastfind.c
+++ b/usr.bin/locate/locate/fastfind.c
@@ -40,9 +40,7 @@
#define _LOCATE_STATISTIC_
void
-statistic (fp, path_fcodes)
- FILE *fp; /* open database */
- char *path_fcodes; /* for error message */
+statistic (FILE *fp, char *path_fcodes)
{
long lines, chars, size, size_nbg, big, zwerg, umlaut;
u_char *p, *s;
@@ -128,11 +126,7 @@ fastfind_mmap_icase
#else
fastfind_mmap
#endif /* FF_ICASE */
-(pathpart, paddr, len, database)
- char *pathpart; /* search string */
- caddr_t paddr; /* mmap pointer */
- off_t len; /* length of database */
- char *database; /* for error message */
+(char *pathpart, caddr_t paddr, off_t len, char *database)
#else /* MMAP */
@@ -144,10 +138,7 @@ fastfind_icase
fastfind
#endif /* FF_ICASE */
-(fp, pathpart, database)
- FILE *fp; /* open database */
- char *pathpart; /* search string */
- char *database; /* for error message */
+(FILE *fp, char *pathpart, char *database)
#endif /* MMAP */
diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c
index 13f733314a78..545f2097b900 100644
--- a/usr.bin/locate/locate/util.c
+++ b/usr.bin/locate/locate/util.c
@@ -58,8 +58,7 @@ int check_bigram_char(int);
* or the database is obviously not a locate database.
*/
int
-check_bigram_char(ch)
- int ch;
+check_bigram_char(int ch)
{
/* legal bigram: 0, ASCII_MIN ... ASCII_MAX */
if (ch == 0 ||
@@ -138,8 +137,7 @@ colon(char **dbv, char *path, char *dot)
static char globfree[100];
char *
-patprep(name)
- char *name;
+patprep(char *name)
{
char *endmark, *p, *subp;
@@ -192,8 +190,7 @@ patprep(name)
/* tolower word */
u_char *
-tolower_word(word)
- u_char *word;
+tolower_word(u_char *word)
{
u_char *p;
@@ -215,8 +212,7 @@ tolower_word(word)
*/
int
-getwm(p)
- caddr_t p;
+getwm(caddr_t p)
{
union {
char buf[INTSIZE];
@@ -252,8 +248,7 @@ getwm(p)
*/
int
-getwf(fp)
- FILE *fp;
+getwf(FILE *fp)
{
int word, hword;
int i_max = LOCATE_PATH_MAX + OFFSET;