From 9da641409d2f6e39081a25039c343b80f75434c9 Mon Sep 17 00:00:00 2001 From: Lorenzo Bianchi Date: Sun, 18 Jun 2023 15:58:16 +0200 Subject: [PATCH] tolti fixme e todo --- Makefile | 10 +++++----- src/F4Client.c | 2 -- src/F4Server.c | 1 - src/custom_shm.c | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 7d4f3fa..b6c4688 100644 --- a/Makefile +++ b/Makefile @@ -46,13 +46,13 @@ test: comp @ ipcrm --all=sem @ ipcrm --all=msg @ ipcrm --all=shm - $(OPEN_NEW_TERMINAL) $(TERMINAL_ARGS1) $(MKFILE_DIR) $(TARGET2) $(ARGSCLIENT1) - $(OPEN_NEW_TERMINAL) $(TERMINAL_ARGS2) $(MKFILE_DIR) $(TARGET2) $(ARGSCLIENT2) - ./$(TARGET1) $(ARGSSERVER) + # $(OPEN_NEW_TERMINAL) $(TERMINAL_ARGS1) $(MKFILE_DIR) $(TARGET2) $(ARGSCLIENT1) + # $(OPEN_NEW_TERMINAL) $(TERMINAL_ARGS2) $(MKFILE_DIR) $(TARGET2) $(ARGSCLIENT2) + # ./$(TARGET1) $(ARGSSERVER) comp: server_c client_c server_c: bin/F4Server - gcc src/F4Server.c src/custom_sem.c src/custom_shm.c src/custom_sig.c src/custom_msgq.c src/errExit.c src/forza4.c src/client.c src/server.c -o bin/F4Server -I inc/ + gcc src/F4Server.c src/custom_sem.c src/custom_shm.c src/custom_sig.c src/custom_msgq.c src/errExit.c src/forza4.c src/client.c src/server.c -o bin/F4Server -I inc/ client_c: bin/F4Client - gcc src/F4Client.c src/custom_sem.c src/custom_shm.c src/custom_sig.c src/custom_msgq.c src/errExit.c src/forza4.c src/client.c src/server.c -o bin/F4Client -I inc/ \ No newline at end of file + gcc src/F4Client.c src/custom_sem.c src/custom_shm.c src/custom_sig.c src/custom_msgq.c src/errExit.c src/forza4.c src/client.c src/server.c -o bin/F4Client -I inc/ \ No newline at end of file diff --git a/src/F4Client.c b/src/F4Client.c index 75eb2a0..1b5ae39 100644 --- a/src/F4Client.c +++ b/src/F4Client.c @@ -73,7 +73,6 @@ int main(int argc, char *argv[]){ printf(PCLIENT "Your Turn: "); } - int pos; do { if (!clientBot) { scanf("%d", &move.move); @@ -103,7 +102,6 @@ int generateMove() { // appena trova una colonna con spazio libero la ritorna do { collums = rand() % _COLLUMS; - collums; } while (_BOARD[collums] != 0); return collums + 1; diff --git a/src/F4Server.c b/src/F4Server.c index 1cdd15f..f028c96 100644 --- a/src/F4Server.c +++ b/src/F4Server.c @@ -68,7 +68,6 @@ int main(int argc, char *argv[]) { printf(PSERVER "Starting game\n"); int turns_left = _INPUT_S.rows * _INPUT_S.collums; - time_t timeout; tile_t result = -1; move_t move; diff --git a/src/custom_shm.c b/src/custom_shm.c index b08f215..b661340 100644 --- a/src/custom_shm.c +++ b/src/custom_shm.c @@ -30,7 +30,7 @@ void setupClientShm() { } int getShmidClient() { - shmget(ftok(KEYFILE, SHMKEY), _ROWS * _COLLUMS * sizeof(tile_t), S_IRUSR | S_IWUSR); + return shmget(ftok(KEYFILE, SHMKEY), _ROWS * _COLLUMS * sizeof(tile_t), S_IRUSR | S_IWUSR); } int getShmidServer() {