aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfram Schneider <wosch@FreeBSD.org>2022-02-14 19:30:09 +0000
committerWolfram Schneider <wosch@FreeBSD.org>2022-02-14 19:30:09 +0000
commit047eec4966e36dc2175d82e18683a928faafeb26 (patch)
treed2d0fbf35e4055c45b9480ed9244523c87f0d9d0
parent004b0aa86967213d0773ec95b5efd28d8a3c9538 (diff)
improve c style
- BSD KNF: return is a native statement and we use a space before the parenthesis - remove superfluous empty lines Reported by: jrtc27
-rw-r--r--usr.bin/locate/locate/locate.c1
-rw-r--r--usr.bin/locate/locate/util.c24
2 files changed, 11 insertions, 14 deletions
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index 014fa7bcc301..31c74d721c74 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -270,7 +270,6 @@ search_fopen(char *db, char **s)
}
#ifdef MMAP
-
/*
* Arguments:
* db database
diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c
index 953f51a74d13..13f733314a78 100644
--- a/usr.bin/locate/locate/util.c
+++ b/usr.bin/locate/locate/util.c
@@ -64,7 +64,7 @@ check_bigram_char(ch)
/* legal bigram: 0, ASCII_MIN ... ASCII_MAX */
if (ch == 0 ||
(ch >= ASCII_MIN && ch <= ASCII_MAX))
- return(ch);
+ return (ch);
errx(1,
"locate database header corrupt, bigram char outside 0, %d-%d: %d",
@@ -96,7 +96,7 @@ colon(char **dbv, char *path, char *dot)
/* empty string */
if (*path == '\0') {
warnx("empty database name, ignored");
- return(dbv);
+ return (dbv);
}
/* length of string vector */
@@ -187,7 +187,7 @@ patprep(name)
*subp++ = *p++;
}
*subp = '\0';
- return(--subp);
+ return (--subp);
}
/* tolower word */
@@ -200,7 +200,7 @@ tolower_word(word)
for(p = word; *p != '\0'; p++)
*p = TOLOWER(*p);
- return(word);
+ return (word);
}
@@ -238,9 +238,9 @@ getwm(p)
if (hi >= i_max || hi <= i_min)
errx(1, "integer out of range: %d < %d < %d",
i_min, abs(i) < abs(hi) ? i : hi, i_max);
- return(hi);
+ return (hi);
}
- return(i);
+ return (i);
}
/*
@@ -266,12 +266,11 @@ getwf(fp)
if (hword >= i_max || hword <= i_min)
errx(1, "integer out of range: %d < %d < %d",
i_min, abs(word) < abs(hword) ? word : hword, i_max);
- return(hword);
+ return (hword);
}
- return(word);
+ return (word);
}
-
void
rebuild_message(char *db)
{
@@ -291,16 +290,15 @@ check_size(char *db)
if (stat(db, &sb) == -1) {
warnx("the locate database '%s' does not exist.", db);
rebuild_message(db);
- return(0);
+ return (0);
}
len = sb.st_size;
if (len < (2 * NBG)) {
warnx("the locate database '%s' is smaller than %d bytes large.", db, (2 * NBG));
rebuild_message(db);
- return(0);
+ return (0);
}
- return(1);
+ return (1);
}
-