Module Name: src
Committed By: rillig
Date: Sun Mar 7 20:47:13 UTC 2021
Modified Files:
src/usr.bin/indent: args.c io.c lexi.c
Log Message:
indent: remove redundant parentheses around return value
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/indent/args.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/indent/io.c src/usr.bin/indent/lexi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/indent/args.c
diff -u src/usr.bin/indent/args.c:1.15 src/usr.bin/indent/args.c:1.16
--- src/usr.bin/indent/args.c:1.15 Sun Mar 7 10:42:48 2021
+++ src/usr.bin/indent/args.c Sun Mar 7 20:47:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.15 2021/03/07 10:42:48 rillig Exp $ */
+/* $NetBSD: args.c,v 1.16 2021/03/07 20:47:13 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)args.c 8.1 (
#include <sys/cdefs.h>
#ifndef lint
#if defined(__NetBSD__)
-__RCSID("$NetBSD: args.c,v 1.15 2021/03/07 10:42:48 rillig Exp $");
+__RCSID("$NetBSD: args.c,v 1.16 2021/03/07 20:47:13 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/args.c 336318 2018-07-15 21:04:21Z pstef $");
#endif
@@ -246,9 +246,9 @@ eqin(const char *s1, const char *s2)
{
while (*s1) {
if (*s1++ != *s2++)
- return (NULL);
+ return NULL;
}
- return (s2);
+ return s2;
}
/*
Index: src/usr.bin/indent/io.c
diff -u src/usr.bin/indent/io.c:1.22 src/usr.bin/indent/io.c:1.23
--- src/usr.bin/indent/io.c:1.22 Sun Mar 7 10:42:48 2021
+++ src/usr.bin/indent/io.c Sun Mar 7 20:47:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.22 2021/03/07 10:42:48 rillig Exp $ */
+/* $NetBSD: io.c,v 1.23 2021/03/07 20:47:13 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)io.c 8.1 (Be
#include <sys/cdefs.h>
#ifndef lint
#if defined(__NetBSD__)
-__RCSID("$NetBSD: io.c,v 1.22 2021/03/07 10:42:48 rillig Exp $");
+__RCSID("$NetBSD: io.c,v 1.23 2021/03/07 20:47:13 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/io.c 334927 2018-06-10 16:44:18Z pstef $");
#endif
@@ -409,7 +409,7 @@ pad_output(int current, int target)
int curr; /* internal column pointer */
if (current >= target)
- return (current); /* line is already long enough */
+ return current; /* line is already long enough */
curr = current;
if (opt.use_tabs) {
int tcur;
@@ -422,7 +422,7 @@ pad_output(int current, int target)
while (curr++ < target)
putc(' ', output); /* pad with final blanks */
- return (target);
+ return target;
}
/*
@@ -475,13 +475,13 @@ count_spaces_until(int cur, char *buffer
break;
} /* end of switch */
} /* end of for loop */
- return (cur);
+ return cur;
}
int
count_spaces(int cur, char *buffer)
{
- return (count_spaces_until(cur, buffer, NULL));
+ return count_spaces_until(cur, buffer, NULL);
}
void
Index: src/usr.bin/indent/lexi.c
diff -u src/usr.bin/indent/lexi.c:1.22 src/usr.bin/indent/lexi.c:1.23
--- src/usr.bin/indent/lexi.c:1.22 Sun Mar 7 20:40:18 2021
+++ src/usr.bin/indent/lexi.c Sun Mar 7 20:47:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lexi.c,v 1.22 2021/03/07 20:40:18 rillig Exp $ */
+/* $NetBSD: lexi.c,v 1.23 2021/03/07 20:47:13 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)lexi.c 8.1 (
#include <sys/cdefs.h>
#ifndef lint
#if defined(__NetBSD__)
-__RCSID("$NetBSD: lexi.c,v 1.22 2021/03/07 20:40:18 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.23 2021/03/07 20:47:13 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/lexi.c 337862 2018-08-15 18:19:45Z pstef $");
#endif
@@ -174,7 +174,7 @@ static char const *table[] = {
static int
strcmp_type(const void *e1, const void *e2)
{
- return (strcmp(e1, *(const char * const *)e2));
+ return strcmp(e1, *(const char *const *)e2);
}
#ifdef debug
