Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style.

The actual code should be the same afterward, this is just cosmetic refactoring.

1 files changed, 25 insertions, 27 deletions

diff --git a/toys/other/hello.c b/toys/other/hello.c
index 2b469591..aa256155 100644
--- a/toys/other/hello.c
+++ b/toys/other/hello.c
@@ -1,6 +1,4 @@
-/* vi: set sw=4 ts=4:
- *
- * hello.c - A hello world program. (Template for new commands.)
+/* hello.c - A hello world program. (Template for new commands.)
  *
  * Copyright 2012 Rob Landley <rob@landley.net>
  *
@@ -10,15 +8,15 @@
 USE_HELLO(NEWTOY(hello, "e@d*c#b:a", TOYFLAG_USR|TOYFLAG_BIN))
 
 config HELLO
-	bool "hello"
-	default n
-	help
-	  usage: hello [-a] [-b string] [-c number] [-d list] [-e count] [...]
+  bool "hello"
+  default n
+  help
+    usage: hello [-a] [-b string] [-c number] [-d list] [-e count] [...]
 
-	  A hello world program.  You don't need this.
+    A hello world program.  You don't need this.
 
-	  Mostly used as an example/skeleton file for adding new commands,
-	  occasionally nice to test kernel booting via "init=/bin/hello".
+    Mostly used as an example/skeleton file for adding new commands,
+    occasionally nice to test kernel booting via "init=/bin/hello".
 */
 
 #define FOR_hello
@@ -27,26 +25,26 @@ config HELLO
 // Hello doesn't use these globals, they're here for example/skeleton purposes.
 
 GLOBALS(
-	char *b_string;
-	long c_number;
-	struct arg_list *d_list;
-	long e_count;
+  char *b_string;
+  long c_number;
+  struct arg_list *d_list;
+  long e_count;
 
-	int more_globals;
+  int more_globals;
 )
 
 void hello_main(void)
 {
-	printf("Hello world\n");
-
-	if (toys.optflags & FLAG_a) printf("Saw a\n");
-	if (toys.optflags & FLAG_b) printf("b=%s\n", TT.b_string);
-	if (toys.optflags & FLAG_c) printf("c=%ld\n", TT.c_number);
-	while (TT.d_list) {
-		printf("d=%s\n", TT.d_list->arg);
-		TT.d_list = TT.d_list->next;
-	}
-	if (TT.e_count) printf("e was seen %ld times", TT.e_count);
-
-	while (*toys.optargs) printf("optarg=%s\n", *(toys.optargs++));
+  printf("Hello world\n");
+
+  if (toys.optflags & FLAG_a) printf("Saw a\n");
+  if (toys.optflags & FLAG_b) printf("b=%s\n", TT.b_string);
+  if (toys.optflags & FLAG_c) printf("c=%ld\n", TT.c_number);
+  while (TT.d_list) {
+    printf("d=%s\n", TT.d_list->arg);
+    TT.d_list = TT.d_list->next;
+  }
+  if (TT.e_count) printf("e was seen %ld times", TT.e_count);
+
+  while (*toys.optargs) printf("optarg=%s\n", *(toys.optargs++));
 }