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, 26 insertions, 31 deletions

diff --git a/toys/other/rmmod.c b/toys/other/rmmod.c
index 18ace3fa..093eb8a1 100644
--- a/toys/other/rmmod.c
+++ b/toys/other/rmmod.c
@@ -1,20 +1,18 @@
-/* vi: set sw=4 ts=4:
- *
- * rmmod.c - Remove a module from the Linux kernel.
+/* rmmod.c - Remove a module from the Linux kernel.
  *
  * Copyright 2012 Elie De Brauwer <eliedebrauwer@gmail.com>
 
 USE_RMMOD(NEWTOY(rmmod, "<1wf", TOYFLAG_BIN|TOYFLAG_NEEDROOT))
 
 config RMMOD
-	bool "rmmod"
-	default y
-	help
-	  usage: rmmod [-wf] [MODULE]
+  bool "rmmod"
+  default y
+  help
+    usage: rmmod [-wf] [MODULE]
 
-	  Unload the module named MODULE from the Linux kernel.
-	  -f   Force unload of a module
-	  -w   Wait until the module is no longer used.
+    Unload the module named MODULE from the Linux kernel.
+    -f	Force unload of a module
+    -w	Wait until the module is no longer used.
 
 */
 
@@ -26,25 +24,22 @@ config RMMOD
 
 void rmmod_main(void)
 {
-	unsigned int flags = O_NONBLOCK|O_EXCL;
-	char * mod_name;
-	int len;
-
-	// Basename
-	mod_name = strrchr(toys.optargs[0],'/');
-	if (mod_name)
-		mod_name++;
-	else
-		mod_name = toys.optargs[0];
-
-	// Remove .ko if present
-	len = strlen(mod_name);
-	if (len > 3 && !strcmp(&mod_name[len-3], ".ko" ))
-		mod_name[len-3] = 0;
-
-	if (toys.optflags & FLAG_f) flags |= O_TRUNC;
-	if (toys.optflags & FLAG_w) flags &= ~O_NONBLOCK;
-
-	if (delete_module(mod_name, flags))
-		perror_exit("failed to unload %s", mod_name);
+  unsigned int flags = O_NONBLOCK|O_EXCL;
+  char * mod_name;
+  int len;
+
+  // Basename
+  mod_name = strrchr(toys.optargs[0],'/');
+  if (mod_name) mod_name++;
+  else mod_name = toys.optargs[0];
+
+  // Remove .ko if present
+  len = strlen(mod_name);
+  if (len > 3 && !strcmp(&mod_name[len-3], ".ko" )) mod_name[len-3] = 0;
+
+  if (toys.optflags & FLAG_f) flags |= O_TRUNC;
+  if (toys.optflags & FLAG_w) flags &= ~O_NONBLOCK;
+
+  if (delete_module(mod_name, flags))
+    perror_exit("failed to unload %s", mod_name);
 }