knfmt

Ignore-Rev: yes

Author: mptre

pick.c

@@ -299,7 +299,7 @@ selected_choice(void)
 		}
 
 		tty_putp(cursor_invisible, 0);
-		tty_putp(carriage_return, 1);	/* move cursor to first column */
+		tty_putp(carriage_return, 1); /* move cursor to first column */
 		if (cursor_position >= tty_columns)
 			xscroll = cursor_position - tty_columns + 1;
 		else
@@ -310,7 +310,7 @@ selected_choice(void)
 				yscroll = selection - choices_lines + 1;
 			choices_count = print_choices(yscroll, selection);
 		}
-		tty_putp(carriage_return, 1);	/* move cursor to first column */
+		tty_putp(carriage_return, 1); /* move cursor to first column */
 		for (i = j = 0; i < cursor_position; j++)
 			while (isu8cont(query[++i]))
 				continue;
@@ -463,10 +463,11 @@ selected_choice(void)
 					err(1, NULL);
 			}
 
-			if (cursor_position < query_length)
+			if (cursor_position < query_length) {
 				memmove(query + cursor_position + length,
 				    query + cursor_position,
 				    query_length - cursor_position);
+			}
 
 			memcpy(query + cursor_position, buf, length);
 			cursor_position += length;
@@ -834,10 +835,11 @@ print_choices(size_t offset, size_t selection)
 		if (choice->score == 0 && query_length > 0)
 			break;
 
-		if (i - offset < choices_lines)
+		if (i - offset < choices_lines) {
 			print_line(choice->string, choice->length,
 			    i == selection, choice->match_start,
 			    choice->match_end);
+		}
 	}
 
 	if (i - offset < choices.length && i - offset < choices_lines) {

pty.c

@@ -15,11 +15,11 @@
 #include <termios.h>
 #include <unistd.h>
 
-__dead static void	 child(int, int, int, char **);
+static __dead void	 child(int, int, int, char **);
 static void		 parent(int, int, const char *);
 static char		*parsekeys(const char *);
 static void		 sighandler(int);
-__dead static void	 usage(void);
+static __dead void	 usage(void);
 
 /*
  * Mandatory environment variables required by pick to operate correctly.
@@ -85,7 +85,7 @@ main(int argc, char *argv[])
 	return 0;
 }
 
-__dead static void
+static __dead void
 usage(void)
 {
 	fprintf(stderr, "usage: pick-test [-k path] -- utility "
@@ -142,7 +142,7 @@ sighandler(int sig)
 	gotsig = sig == SIGCHLD;
 }
 
-__dead static void
+static __dead void
 child(int master, int slave, int argc, char **argv)
 {
 	const char **env;