From 26b5fafa01f6b02eb62db6a30e534c852628a680 Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <slococo@itba.edu.ar>
Date: Sat, 6 Nov 2021 01:06:11 -0300
Subject: [PATCH] Refactor code

---
 Makefile             |  2 --
 challenges.c         | 38 +++-----------------------------------
 include/challenges.h |  2 --
 3 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/Makefile b/Makefile
index e052720..28f057d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,6 @@
 CC = gcc
 CCFLAGS = -Wall -std=c99 -pedantic -g
 
-# OBJECTS = errors.o server.o client.o 
-
 CLIENT=client.o
 SERVER=server.o
 ERROR=errors.o
diff --git a/challenges.c b/challenges.c
index 93d0b52..af8a814 100644
--- a/challenges.c
+++ b/challenges.c
@@ -1,45 +1,13 @@
 #include "include/challenges.h"
 
-// char introChallenge(int fd, char * output, char * message, char * question, char * flag) {
-//     printf("%s\n", message);
-    
-//     int readChars;
-//     while ((readChars = read(fd, output, MAX_LEN - 1)) != 0) {
-//         if (readChars < 0)
-//             printSystemError("Challenges: read()");
-//         output[readChars] = '\0';
-//     }
-
-//     printf("%s\n", question);
-
-//     return strcmp(output, flag) == 0;
-// }
-
-// char genChallenge(int fd, char * output, char * message, char * question, char * flag) {
-//     printf("%s\n", message);
-    
-//     int readChars;
-//     while ((readChars = read(fd, output, MAX_LEN - 1)) != 0) {
-//         if (readChars < 0)
-//             printSystemError("Challenges: read()");
-//         output[readChars] = '\0';
-//     }
-
-//     printf("%s\n", question);
-
-//     return !strcmp(output, flag);
-// }
-
 char genChallenge(int fd, char * output, challenge_t challenge) {
     printf("%s\n", challenge.message);
     
     int readChars;
-    // while ((readChars = read(fd, output, MAX_LEN - 1)) != 0) {
     readChars = read(fd, output, MAX_LEN - 1);
-        if (readChars < 0)
-            printSystemError("Challenges: read()");
-        output[readChars] = '\0';
-    // }
+    if (readChars < 0)
+        printSystemError("Challenges: read()");
+    output[readChars] = '\0';
 
     printf("%s\n", challenge.question);
 
diff --git a/include/challenges.h b/include/challenges.h
index 24c3e20..515acf8 100644
--- a/include/challenges.h
+++ b/include/challenges.h
@@ -10,13 +10,11 @@
 #define MAX_LEN 100
 
 typedef struct challenge_t {
-    // char (* challenge) (int fd, char * output, char * message, char * question, char * flag);
     char * message;
     char * question;
     char * flag;
 } challenge_t;
 
-// char genChallenge(int fd, char * output, char * message, char * question, char * flag);
 char genChallenge(int fd, char * output, challenge_t challenge);
 
 #endif
\ No newline at end of file