Format hw1 makeFileDemo & add 2022 fix

Author: jamestiotio

hw/hw1/makeFileDemo/binary.c

@@ -1,18 +1,15 @@
 #include "functions.h"
 
-
-void decimalToBinary (int num) {
-
-        //Initialize mask
-        unsigned int mask = 0x80000000;
-        size_t bits = sizeof(num) * CHAR_BIT;
-
-        for (int count = 0 ;count < bits; count++) {
-
-            //print
-            (mask & num ) ? printf("1") : printf("0");
-
-            //shift one to the right
-            mask = mask >> 1;
-        }
+void decimalToBinary(int num) {
+    // Initialize mask
+    unsigned int mask = 0x80000000;
+    size_t bits = sizeof(num) * CHAR_BIT;
+
+    for (int count = 0; count < bits; count++) {
+        // print
+        (mask & num) ? printf("1") : printf("0");
+
+        // shift one to the right
+        mask = mask >> 1;
+    }
 }

hw/hw1/makeFileDemo/factorial.c

@@ -1,8 +1,8 @@
 #include "functions.h"
 
-int factorial(int n){
-   if(n!=1){
-      return(n * factorial(n-1));
-   } else return 1;
+int factorial(int n) {
+    if (n != 1) {
+        return (n * factorial(n - 1));
+    } else
+        return 1;
 }
-

hw/hw1/makeFileDemo/functions.h

@@ -1,8 +1,8 @@
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
 
 void print_hello();
 int factorial(int n);
-void decimalToBinary (int num);
+void decimalToBinary(int num);

hw/hw1/makeFileDemo/hello.c

@@ -1,9 +1,9 @@
 #include "functions.h"
 
-void print_hello(){
-   printf("Hello World!\n");
+void print_hello() {
+    printf("Hello World!\n");
 }
 
-void print_anotherhello(){
-	printf("Hello from hello.c main function!\n");
+void print_anotherhello() {
+    printf("Hello from hello.c main function!\n");
 }

hw/hw1/makeFileDemo/main.c

@@ -2,20 +2,20 @@
 
 #define BUFFERLENGTH 64
 
-int main(){
-   print_hello();
+int main() {
+    print_hello();
 
-   printf("Key in a number to obtain its factorial:\n");
-   char inputNum[BUFFERLENGTH];
+    printf("Key in a number to obtain its factorial:\n");
+    char inputNum[BUFFERLENGTH];
 
-   fgets(inputNum, BUFFERLENGTH, stdin);
+    fgets(inputNum, BUFFERLENGTH, stdin);
 
-   int num = atoi(inputNum);
-   printf("The factorial of %d is %d \n", num, factorial(5));
+    int num = atoi(inputNum);
+    printf("The factorial of %d is %d \n", num, factorial(num));
 
-   printf("The 32-bit binary representation of %d is ", num);
-   decimalToBinary(num);
-   printf("\n");
+    printf("The 32-bit binary representation of %d is ", num);
+    decimalToBinary(num);
+    printf("\n");
 
-   return 0;
+    return 0;
 }

hw/hw1/makeFileDemo/makefile

@@ -2,37 +2,37 @@
 REMOVE = rm
 CC = gcc
 DEPENDENCIES = main.c hello.c factorial.c binary.c
-OUT = myexecoutprogMacro.o
+OUT = prog.o
 
 # Explicit rules, all the commands you can call with make 
 # (note: the <tab> in the command line is necessary for make to work) 
-# target:  dependency1 dependency2 ...
+# target: dependency1 dependency2 ...
 #       <tab> command
 
-#Called by: make myexecout 
-#also executed when you just called make. This calls the first target. 
-myexecout: main.c hello.c factorial.c binary.c
-	gcc -o myexecoutprog.o main.c hello.c factorial.c binary.c 
+# Called by: make prog
+# Also executed when you just called make. This calls the first target. 
+prog: main.c hello.c factorial.c binary.c
+	gcc -o prog.o main.c hello.c factorial.c binary.c 
 
-myexecoutFromMacro: $(DEPENDENCIES)
+prog1: $(DEPENDENCIES)
 	$(CC) $(DEPENDENCIES) -o $(OUT)
 
-myexecout2: main.o hello.o factorial.o binary.o
-	gcc -o myexecoutprog2 main.o hello.o factorial.o binary.o
+prog2: main.o hello.o factorial.o binary.o
+	gcc -o prog2 main.o hello.o factorial.o binary.o
 
 
-##make clean will remove myexecoutprog.o from the directory
+## make clean will remove prog.o from the directory
 clean:
-	rm myexecoutprog.o
+	rm prog.o
 
-cleanFromMacro: 
+clean1:
 	$(REMOVE) $(OUT)
 
 clean2:
-	rm myexecoutprog2 *.o
+	rm prog2 *.o
 
-#Implicit rules
-main.o : main.c functions.h
+# Implicit rules
+main.o: main.c functions.h
 factorial.o: factorial.c functions.h
 hello.o: hello.c functions.h
 binary.o: binary.c functions.h