pull upstream changes, add auto formatting

1 files changed, 28 insertions, 25 deletions

diff --git a/user/progDE.c b/user/progDE.c
index a1aa0b3..be2dd1b 100644
--- a/user/progDE.c
+++ b/user/progDE.c
@@ -12,45 +12,48 @@
 **		   n is the iteration count
 */
 
-USERMAIN( main ) {
+USERMAIN(main)
+{
 	int n;
-	int count = 30;	  // default iteration count
-	char ch = '2';	  // default character to print
+	int count = 30; // default iteration count
+	char ch = '2'; // default character to print
 	char buf[128];
 
 	// process the command-line arguments
-	switch( argc ) {
-	case 3:	count = str2int( argv[2], 10 );
-			// FALL THROUGH
-	case 2:	ch = argv[1][0];
-			break;
+	switch (argc) {
+	case 3:
+		count = str2int(argv[2], 10);
+		// FALL THROUGH
+	case 2:
+		ch = argv[1][0];
+		break;
 	default:
-			sprint( buf, "main2: 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, "main2: 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
-	n = swritech( ch );
-	if( n != 1 ) {
-		sprint( buf, "== %c, write #1 returned %d\n", ch, n );
-		cwrites( buf );
+	n = swritech(ch);
+	if (n != 1) {
+		sprint(buf, "== %c, write #1 returned %d\n", ch, n);
+		cwrites(buf);
 	}
 
 	// iterate and print the required number of other characters
-	for( int i = 0; i < count; ++i ) {
+	for (int i = 0; i < count; ++i) {
 		DELAY(STD);
-		n = swritech( ch );
-		if( n != 1 ) {
-			sprint( buf, "== %c, write #2 returned %d\n", ch, n );
-			cwrites( buf );
+		n = swritech(ch);
+		if (n != 1) {
+			sprint(buf, "== %c, write #2 returned %d\n", ch, n);
+			cwrites(buf);
 		}
 	}
 
 	// all done!
-	return( 0 );
+	return (0);
 }