pull upstream changes, add auto formatting

1 files changed, 19 insertions, 17 deletions

diff --git a/user/progQ.c b/user/progQ.c
index ecfcffc..660c2d6 100644
--- a/user/progQ.c
+++ b/user/progQ.c
@@ -9,35 +9,37 @@
 **	 where x is the ID character
 */
 
-USERMAIN( main ) {
-	char ch = 'q';	  // default character to print
+USERMAIN(main)
+{
+	char ch = 'q'; // default character to print
 	char buf[128];
 
 	// process the command-line arguments
-	switch( argc ) {
-	case 2:	ch = argv[1][0];
-			break;
+	switch (argc) {
+	case 2:
+		ch = argv[1][0];
+		break;
 	default:
-			sprint( buf, "userQ: argc %d, args: ", argc );
-			cwrites( buf );
-			for( int i = 0; i <= argc; ++i ) {
-				sprint( buf, " %s", argv[argc] ? argv[argc] : "(null)" );
-				cwrites( buf );
-			}
-			cwrites( "\n" );
+		sprint(buf, "userQ: argc %d, args: ", argc);
+		cwrites(buf);
+		for (int i = 0; i <= argc; ++i) {
+			sprint(buf, " %s", argv[argc] ? argv[argc] : "(null)");
+			cwrites(buf);
+		}
+		cwrites("\n");
 	}
 
 	// announce our presence
-	write( CHAN_SIO, &ch, 1 );
+	write(CHAN_SIO, &ch, 1);
 
 	// try something weird
 	bogus();
 
 	// should not have come back here!
-	sprint( buf, "!!!!! %c returned from bogus syscall!?!?!\n", ch );
-	cwrites( buf );
+	sprint(buf, "!!!!! %c returned from bogus syscall!?!?!\n", ch);
+	cwrites(buf);
 
-	exit( 1 );
+	exit(1);
 
-	return( 42 );  // shut the compiler up!
+	return (42); // shut the compiler up!
 }