Refactor: Drop tk_test macro

I found it confusing, because it was unclear that it referred to a
member of the object pointed to by tk.

Signed-off-by: Reid Wahl <[email protected]>

Author: nrwahl2

src/config.c

@@ -398,8 +398,8 @@ read_time(char *val)
 }
 
 /* make arguments for execv(2)
- * tk_test.path points to the path
- * tk_test.argv is argument vector (starts with the prog)
+ * tk->clu_test.path points to the path
+ * tk->clu_test.argv is argument vector (starts with the prog)
  * (strtok pokes holes in the configuration parameter value, i.e.
  * we don't need to allocate memory for arguments)
  */
@@ -409,24 +409,24 @@ parse_extprog(char *val, struct ticket_config *tk)
 	char *p;
 	int i = 0;
 
-	if (tk_test.path) {
-		free(tk_test.path);
+	if (tk->clu_test.path) {
+		free(tk->clu_test.path);
 	}
-	if (!(tk_test.path = strdup(val))) {
+	if (!(tk->clu_test.path = strdup(val))) {
 		log_error("out of memory");
 		return -1;
 	}
 
-	p = strtok(tk_test.path, " \t");
-	tk_test.argv[i++] = p;
+	p = strtok(tk->clu_test.path, " \t");
+	tk->clu_test.argv[i++] = p;
 	do {
 		p = strtok(NULL, " \t");
 		if (i >= MAX_ARGS) {
 			log_error("too many arguments for the acquire-handler");
-			free(tk_test.path);
+			free(tk->clu_test.path);
 			return -1;
 		}
-		tk_test.argv[i++] = p;
+		tk->clu_test.argv[i++] = p;
 	} while (p);
 
 	return 0;

src/config.h

@@ -58,8 +58,6 @@ typedef enum {
 	EXTPROG_IGNORE,
 } extprog_state_e;
 
-#define tk_test tk->clu_test
-
 typedef enum {
 	ATTR_OP_EQ = 1,
 	ATTR_OP_NE,

src/handler.c

@@ -77,7 +77,7 @@ run_ext_prog(const struct booth_config *conf, struct ticket_config *tk,
 	}
 	closefiles(); /* don't leak open files */
 	tk_log_debug("running handler %s", prog);
-	execv(prog, tk_test.argv);
+	execv(prog, tk->clu_test.argv);
 	tk_log_error("%s: execv failed (%s)", prog, strerror(errno));
 	_exit(1);
 }
@@ -117,7 +117,7 @@ test_exit_status(struct ticket_config *tk, char *prog, int status, int log_msg)
 static void
 reset_test_state(struct ticket_config *tk)
 {
-	tk_test.pid = 0;
+	tk->clu_test.pid = 0;
 	set_progstate(tk, EXTPROG_IDLE);
 }
 
@@ -126,7 +126,8 @@ tk_test_exit_status(struct ticket_config *tk)
 {
 	int rv;
 
-	rv = test_exit_status(tk, tk_test.path, tk_test.status, !tk_test.is_dir);
+	rv = test_exit_status(tk, tk->clu_test.path, tk->clu_test.status,
+			      !tk->clu_test.is_dir);
 	reset_test_state(tk);
 	return rv;
 }
@@ -141,15 +142,15 @@ wait_child(struct booth_config *conf, int sig)
 		struct ticket_config *tk = iter->data;
 		int status = 0;
 
-		if (tk_test.path && tk_test.pid > 0 &&
-				(tk_test.progstate == EXTPROG_RUNNING ||
-				tk_test.progstate == EXTPROG_IGNORE) &&
-				waitpid(tk_test.pid, &status, WNOHANG) == tk_test.pid) {
-			if (tk_test.progstate == EXTPROG_IGNORE) {
+		if (tk->clu_test.path && tk->clu_test.pid > 0 &&
+				(tk->clu_test.progstate == EXTPROG_RUNNING ||
+				tk->clu_test.progstate == EXTPROG_IGNORE) &&
+				waitpid(tk->clu_test.pid, &status, WNOHANG) == tk->clu_test.pid) {
+			if (tk->clu_test.progstate == EXTPROG_IGNORE) {
 				/* not interested in the outcome */
 				reset_test_state(tk);
 			} else {
-				tk_test.status = status;
+				tk->clu_test.status = status;
 				set_progstate(tk, EXTPROG_EXITED);
 			}
 		}
@@ -178,18 +179,18 @@ ext_prog_timeout(struct ticket_config *tk)
 int
 is_ext_prog_running(struct ticket_config *tk)
 {
-	if (!tk_test.path)
+	if (!tk->clu_test.path)
 		return 0;
-	return (tk_test.pid > 0 && tk_test.progstate == EXTPROG_RUNNING);
+	return (tk->clu_test.pid > 0) && (tk->clu_test.progstate == EXTPROG_RUNNING);
 }
 
 void
 ignore_ext_test(struct ticket_config *tk)
 {
 	if (is_ext_prog_running(tk)) {
-		(void)kill(tk_test.pid, SIGTERM);
+		(void)kill(tk->clu_test.pid, SIGTERM);
 		set_progstate(tk, EXTPROG_IGNORE);
-	} else if (tk_test.progstate == EXTPROG_EXITED) {
+	} else if (tk->clu_test.progstate == EXTPROG_EXITED) {
 		/* external prog exited, but the status not yet examined;
 		 * we're not interested in checking the status anymore */
 		reset_test_state(tk);
@@ -207,22 +208,22 @@ process_ext_dir(const struct booth_config *conf, struct ticket_config *tk)
 	signal(SIGCHLD, SIG_DFL);
 	signal(SIGUSR1, SIG_DFL);
 	signal(SIGINT, SIG_DFL);
-	tk_log_debug("running programs in directory %s", tk_test.path);
-	n_progs = scandir(tk_test.path, &proglist, prog_filter, alphasort);
+	tk_log_debug("running programs in directory %s", tk->clu_test.path);
+	n_progs = scandir(tk->clu_test.path, &proglist, prog_filter, alphasort);
 	if (n_progs == -1) {
-		tk_log_error("%s: scandir failed (%s)", tk_test.path, strerror(errno));
+		tk_log_error("%s: scandir failed (%s)", tk->clu_test.path, strerror(errno));
 		_exit(1);
 	}
 	for (i = 0; i < n_progs; i++) {
 		if (ignore_status)
 			break;
 		dp = proglist[i];
-		if (strlen(dp->d_name) + strlen(tk_test.path) + 1 > FILENAME_MAX) {
+		if (strlen(dp->d_name) + strlen(tk->clu_test.path) + 1 > FILENAME_MAX) {
 			tk_log_error("%s: name exceeds max length (%s)",
-				tk_test.path, dp->d_name);
+				tk->clu_test.path, dp->d_name);
 			_exit(1);
 		}
-		strcpy(prog, tk_test.path);
+		strcpy(prog, tk->clu_test.path);
 		strcat(prog, "/");
 		strcat(prog, dp->d_name);
 		switch(curr_pid=fork()) {
@@ -266,27 +267,27 @@ run_handler(const struct booth_config *conf, struct ticket_config *tk)
 	pid_t pid;
 	struct stat stbuf;
 
-	if (!tk_test.path)
+	if (!tk->clu_test.path)
 		return 0;
 
-	if (stat(tk_test.path, &stbuf)) {
-		tk_log_error("%s: stat failed (%s)", tk_test.path, strerror(errno));
+	if (stat(tk->clu_test.path, &stbuf)) {
+		tk_log_error("%s: stat failed (%s)", tk->clu_test.path, strerror(errno));
 		return RUNCMD_ERR;
 	}
-	tk_test.is_dir = (stbuf.st_mode & S_IFDIR);
+	tk->clu_test.is_dir = (stbuf.st_mode & S_IFDIR);
 
 	switch(pid=fork()) {
 	case -1:
 		log_error("fork: %s", strerror(errno));
 		return RUNCMD_ERR;
 	case 0: /* child */
-		if (tk_test.is_dir) {
+		if (tk->clu_test.is_dir) {
 			process_ext_dir(conf, tk);
 		} else {
-			run_ext_prog(conf, tk, tk_test.path);
+			run_ext_prog(conf, tk, tk->clu_test.path);
 		}
 	default: /* parent */
-		tk_test.pid = pid;
+		tk->clu_test.pid = pid;
 		set_progstate(tk, EXTPROG_RUNNING);
 		rv = RUNCMD_MORE; /* program runs */
 	}

src/ticket.c

@@ -284,11 +284,11 @@ do_ext_prog(struct booth_config *conf, struct ticket_config *tk,
 {
 	int rv = 0;
 
-	if (!tk_test.path) {
+	if (!tk->clu_test.path) {
 		return 0;
 	}
 
-	switch(tk_test.progstate) {
+	switch(tk->clu_test.progstate) {
 	case EXTPROG_IDLE:
 		rv = run_handler(conf, tk);
 		if (rv == RUNCMD_ERR) {