From 5e99b5e735c52f68065674866b29b9b4d9109e59 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Sat, 29 Sep 2012 15:13:11 +0200
Subject: [PATCH] Minor API change.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 helpers.c |  8 ++++----
 helpers.h |  2 +-
 plugin.c  |  2 +-
 svc.c     | 18 +++++++++---------
 svc.h     |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/helpers.c b/helpers.c
index d250e554..a1071267 100644
--- a/helpers.c
+++ b/helpers.c
@@ -364,7 +364,7 @@ static int print_uptime(void)
 	return 0;
 }
 
-void print_descr(char *action, char *descr)
+void print_desc(char *action, char *desc)
 {
 	const char home[] = "\r\e[K";
 	const char dots[] = " .....................................................................";
@@ -374,8 +374,8 @@ void print_descr(char *action, char *descr)
 	print_uptime();
 
 	write(STDERR_FILENO, action, strlen(action));
-	write(STDERR_FILENO, descr, strlen(descr));
-	write(STDERR_FILENO, dots, 60 - strlen(descr) - strlen(action)); /* pad with dots. */
+	write(STDERR_FILENO, desc, strlen(desc));
+	write(STDERR_FILENO, dots, 60 - strlen(desc) - strlen(action)); /* pad with dots. */
 }
 
 int print_result(int fail)
@@ -499,7 +499,7 @@ int run_interactive(char *cmd, char *fmt, ...)
 	vsnprintf(line, sizeof(line), fmt, ap);
 	va_end(ap);
 
-	print_descr("", line);
+	print_desc("", line);
 	if (fp && !debug) {
 		oldout = dup(STDOUT_FILENO);
 		olderr = dup(STDERR_FILENO);
diff --git a/helpers.h b/helpers.h
index 9315b2db..d0c7e2de 100644
--- a/helpers.h
+++ b/helpers.h
@@ -76,7 +76,7 @@ char   *pid_get_name    (pid_t pid, char *name, size_t len);
 void    procname_set    (const char *name, char *args[]);
 int     procname_kill   (const char *name, int signo);
 
-void    print_descr     (char *action, char *descr);
+void    print_desc     (char *action, char *desc);
 int     print_result    (int fail);
 int     start_process   (char *cmd, char *args[], int console);
 void    cls             (void);
diff --git a/plugin.c b/plugin.c
index c7ff5166..96bc5539 100644
--- a/plugin.c
+++ b/plugin.c
@@ -196,7 +196,7 @@ int load_plugins(char *path)
 			char filename[1024];
 
 			snprintf(filename, sizeof(filename), "%s/%s", path, entry->d_name);
-			print_descr("   Loading plugin ", basename(filename));
+			print_desc("   Loading plugin ", basename(filename));
 			handle = dlopen(filename, RTLD_LAZY);
 			if (!handle) {
 				_d("Failed loading plugin %s: %s", filename, dlerror());
diff --git a/svc.c b/svc.c
index 757b6967..fed4eb1d 100644
--- a/svc.c
+++ b/svc.c
@@ -156,7 +156,7 @@ svc_t *svc_iterator(int restart)
 int svc_register(char *line, char *username)
 {
 	int i = 0;
-	char *cmd, *descr;
+	char *cmd, *desc;
 	svc_t *svc;
 
 	if (!line) {
@@ -164,9 +164,9 @@ int svc_register(char *line, char *username)
 		return errno = EINVAL;
 	}
 
-	descr = strstr(line, "-- ");
-	if (descr)
-		*descr = 0;
+	desc = strstr(line, "-- ");
+	if (desc)
+		*desc = 0;
 
 	cmd = strtok(line, " ");
 	if (!cmd) {
@@ -190,8 +190,8 @@ int svc_register(char *line, char *username)
 		return errno = ENOMEM;
 	}
 
-	if (descr)
-		strlcpy(svc->descr, descr + 3, sizeof(svc->descr));
+	if (desc)
+		strlcpy(svc->desc, desc + 3, sizeof(svc->desc));
 	if (username)
 		strlcpy(svc->username, username, sizeof(svc->username));
 	strlcpy(svc->cmd, cmd, sizeof(svc->cmd));
@@ -292,7 +292,7 @@ int svc_start(svc_t *svc)
 		return 0;
 
 	if (!respawn)
-		print_descr("Starting ", svc->descr);
+		print_desc("Starting ", svc->desc);
 
 	pid = fork();
 	if (pid == 0) {
@@ -357,12 +357,12 @@ int svc_stop(svc_t *svc)
 	}
 
 	if (svc->pid <= 1) {
-		_d("Bad PID %d for %s, SIGTERM", svc->pid, svc->descr);
+		_d("Bad PID %d for %s, SIGTERM", svc->pid, svc->desc);
 		svc->pid = 0;
 		return 1;
 	}
 
-	print_descr("Stopping ", svc->descr);
+	print_desc("Stopping ", svc->desc);
 	_d("Sending SIGTERM to pid:%d name:'%s'", svc->pid, pid_get_name(svc->pid, NULL, 0));
 	res = kill(svc->pid, SIGTERM);
 	print_result(res);
diff --git a/svc.h b/svc.h
index a9b763ab..5f232a03 100644
--- a/svc.h
+++ b/svc.h
@@ -55,10 +55,10 @@ typedef struct svc {
 	pid_t	       pid;
 	char	       cmd[MAX_ARG_LEN];
 	char	       args[MAX_NUM_SVC_ARGS][MAX_ARG_LEN];
-	char	       descr[MAX_STR_LEN];
+	char	       desc[MAX_STR_LEN];
 	char           username[MAX_USER_LEN];
 	/* Public */
-	int	       delayed_reload; /* For external service plugin. */
+	int	       reload; /* For external plugins. */
 	plugin_svc_t  *plugin;
 } svc_t;