Author: pstef
Date: Sun Jun 3 16:27:40 2018
New Revision: 334565
URL: https://svnweb.freebsd.org/changeset/base/334565
Log:
indent(1): remove is_procname.
It was a shorthand for checking if ps.procname is a non-empty string; the
same can be done with ps.procname[0] which avoids the need for updating
is_procname after every call to lexi().
Modified:
head/usr.bin/indent/indent.c
Modified: head/usr.bin/indent/indent.c
==============================================================================
--- head/usr.bin/indent/indent.c Sun Jun 3 16:21:15 2018
(r334564)
+++ head/usr.bin/indent/indent.c Sun Jun 3 16:27:40 2018
(r334565)
@@ -322,13 +322,11 @@ main(int argc, char **argv)
while (1) { /* this is the main loop. it will go
until we
* reach eof */
- int is_procname;
int comment_buffered = false;
type_code = lexi(&ps); /* lexi reads one token. The actual
* characters read are stored in "token". lexi
* returns a code indicating the type of token
*/
- is_procname = ps.procname[0];
/*
* The following code moves newlines and comments following an if (),
@@ -596,7 +594,7 @@ check_type:
ps.p_l_follow--;
}
if (ps.in_decl && !ps.block_init && !ps.dumped_decl_indent &&
- !is_procname && ps.paren_level == 0) {
+ ps.procname[0] == '\0' && ps.paren_level == 0) {
/* function pointer declarations */
if (troff) {
sprintf(e_code, "\n.Du %dp+\200p \"%s\"\n", dec_ind * 7,
token);
@@ -672,8 +670,8 @@ check_type:
break;
case unary_op: /* this could be any unary operation */
- if (!ps.dumped_decl_indent && ps.in_decl && !is_procname &&
- !ps.block_init && ps.paren_level == 0) {
+ if (!ps.dumped_decl_indent && ps.in_decl && !ps.block_init &&
+ ps.procname[0] == '\0' && ps.paren_level == 0) {
/* pointer declarations */
if (troff) {
if (ps.want_blank)
@@ -1105,7 +1103,7 @@ check_type:
ps.want_blank = (s_code != e_code); /* only put blank after comma
* if comma does not start the
* line */
- if (ps.in_decl && is_procname == 0 && !ps.block_init &&
+ if (ps.in_decl && ps.procname[0] == '\0' && !ps.block_init &&
!ps.dumped_decl_indent && ps.paren_level == 0) {
/* indent leading commas and not the actual identifiers */
indent_declaration(dec_ind - 1, tabs_to_var);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
