From da592565e080b2eb3f6cedf26a2927640b5af137 Mon Sep 17 00:00:00 2001
From: Jack Halford <jack@crans.org>
Date: Thu, 2 Feb 2017 01:20:51 +0100
Subject: [PATCH] cleaned up debug macros before merge

---
 42sh/src/exec/process_setgroup.c             | 4 ----
 42sh/src/job-control/job_format_head.c       | 1 -
 42sh/src/job-control/job_getrank.c           | 2 --
 42sh/src/job-control/job_wait.c              | 1 -
 42sh/src/job-control/put_job_in_foreground.c | 3 ---
 42sh/src/main/main.c                         | 1 -
 6 files changed, 12 deletions(-)

diff --git a/42sh/src/exec/process_setgroup.c b/42sh/src/exec/process_setgroup.c
index e9db1959..186ed6d9 100644
--- a/42sh/src/exec/process_setgroup.c
+++ b/42sh/src/exec/process_setgroup.c
@@ -23,12 +23,8 @@ int		process_setgroup(t_process *p, pid_t pid)
 	j = &data_singleton()->exec.job;
 	if (!j->pgid)
 		j->pgid = pid ? pid : getpid();
-	DG("pid:%i gonna setpgid(%i, %i)", getpid(), pid, j->pgid);
 	setpgid(pid, j->pgid);
 	if (pid == 0 && JOB_IS_FG(j->attributes))
-	{
-		DG("pid:%i gonna setpgrp(%i)", getpid(), j->pgid);
 		tcsetpgrp(STDIN, j->pgid);
-	}
 	return (0);
 }
diff --git a/42sh/src/job-control/job_format_head.c b/42sh/src/job-control/job_format_head.c
index e463a269..c7b8854f 100644
--- a/42sh/src/job-control/job_format_head.c
+++ b/42sh/src/job-control/job_format_head.c
@@ -18,7 +18,6 @@ void	job_format_head(t_job *j)
 	int		rank[2];
 
 	job_getrank(&rank);
-	DG("rank[0]=%i,rank[1]=%i", rank[0], rank[1]);
 	if (j->id == rank[0])
 		crank = '+';
 	else if (j->id == rank[1])
diff --git a/42sh/src/job-control/job_getrank.c b/42sh/src/job-control/job_getrank.c
index aadd7745..f07263e0 100644
--- a/42sh/src/job-control/job_getrank.c
+++ b/42sh/src/job-control/job_getrank.c
@@ -24,11 +24,9 @@ void	job_getrank(int (*rank)[2])
 	jlist = jobc->first_job;
 	(*rank)[0] = 0;
 	(*rank)[1] = 0;
-	DG("check 1");
 	while (jlist && i < 2)
 	{
 		job = jlist->content;
-		DG("check 2: id=%i", job->id);
 		if (job_is_stopped(job->id))
 			(*rank)[i++] = job->id;
 		jlist = jlist->next;
diff --git a/42sh/src/job-control/job_wait.c b/42sh/src/job-control/job_wait.c
index 4bfb6b60..62f5ebef 100644
--- a/42sh/src/job-control/job_wait.c
+++ b/42sh/src/job-control/job_wait.c
@@ -17,7 +17,6 @@ int		job_wait(int id)
 	pid_t	pid;
 	int		status;
 
-	DG("waiting for [%i]", id);
 	if (job_is_stopped(id))
 		return (0);
 	job_update_status();
diff --git a/42sh/src/job-control/put_job_in_foreground.c b/42sh/src/job-control/put_job_in_foreground.c
index 0f462a1a..187ca02f 100644
--- a/42sh/src/job-control/put_job_in_foreground.c
+++ b/42sh/src/job-control/put_job_in_foreground.c
@@ -17,7 +17,6 @@ int		put_job_in_foreground(t_job *j, int cont)
 	t_jobc	*jobc;
 
 	jobc = &data_singleton()->jobc;
-	DG("pid:%i gonna setpgrp(%i) (JOB)", getpid(), j->pgid);
 	tcsetpgrp(STDIN, j->pgid);
 	tcsetattr(STDIN, TCSADRAIN, &jobc->shell_tmodes);
 
@@ -28,10 +27,8 @@ int		put_job_in_foreground(t_job *j, int cont)
 			DG("kill(SIGCONT) failed");
 	}
 	job_wait(j->id);
-	DG("finished waiting for [%i]", j->id);
 	job_remove(j->id);
 
-	DG("pid:%i gonna setpgrp(%i) (SHELL)", getpid(), jobc->shell_pgid);
 	tcsetpgrp(STDIN, jobc->shell_pgid);
 
 	tcgetattr(STDIN, &j->tmodes);
diff --git a/42sh/src/main/main.c b/42sh/src/main/main.c
index a575c718..6731ea08 100644
--- a/42sh/src/main/main.c
+++ b/42sh/src/main/main.c
@@ -28,7 +28,6 @@ int		shell_single_command(char *command)
 		return (0);
 	if (ft_post_tokenize(&token, command))
 		return (1);
-	DG("after post_tokenize");
 	token_print(token);
 	if (ft_parse(&ast, &token))
 		return (1);