X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=service%2Finstance.c;h=12c2efe2b2cc467d1ff6ac9174d5a3b870a9631d;hb=a5954cf302fe46d8e29770c818336763112b9a6e;hp=35804de7c19e2e4d1c666d92c1316ddbbec1e213;hpb=b39c362c6d1c6a0515e12f14f808c6fc79d5ec2d;p=project%2Fprocd.git

diff --git a/service/instance.c b/service/instance.c
index 35804de..12c2efe 100644
--- a/service/instance.c
+++ b/service/instance.c
@@ -241,8 +241,7 @@ instance_removepid(struct service_instance *in) {
 	if (!in->pidfile)
 		return 0;
 	if (unlink(in->pidfile)) {
-		ERROR("Failed to removed pidfile: %s: %d - %s\n",
-			in->pidfile, errno, strerror(errno));
+		ERROR("Failed to removed pidfile: %s: %m\n", in->pidfile);
 		return 1;
 	}
 	return 0;
@@ -258,19 +257,16 @@ instance_writepid(struct service_instance *in)
 	}
 	_pidfile = fopen(in->pidfile, "w");
 	if (_pidfile == NULL) {
-		ERROR("failed to open pidfile for writing: %s: %d (%s)",
-			in->pidfile, errno, strerror(errno));
+		ERROR("failed to open pidfile for writing: %s: %m", in->pidfile);
 		return 1;
 	}
 	if (fprintf(_pidfile, "%d\n", in->proc.pid) < 0) {
-		ERROR("failed to write pidfile: %s: %d (%s)",
-			in->pidfile, errno, strerror(errno));
+		ERROR("failed to write pidfile: %s: %m", in->pidfile);
 		fclose(_pidfile);
 		return 2;
 	}
 	if (fclose(_pidfile)) {
-		ERROR("failed to close pidfile: %s: %d (%s)",
-			in->pidfile, errno, strerror(errno));
+		ERROR("failed to close pidfile: %s: %m", in->pidfile);
 		return 3;
 	}
 
@@ -353,11 +349,11 @@ instance_run(struct service_instance *in, int _stdout, int _stderr)
 	}
 
 	if (in->gid && setgid(in->gid)) {
-		ERROR("failed to set group id %d: %d (%s)\n", in->gid, errno, strerror(errno));
+		ERROR("failed to set group id %d: %m\n", in->gid);
 		exit(127);
 	}
 	if (in->uid && setuid(in->uid)) {
-		ERROR("failed to set user id %d: %d (%s)\n", in->uid, errno, strerror(errno));
+		ERROR("failed to set user id %d: %m\n", in->uid);
 		exit(127);
 	}
 
@@ -407,14 +403,14 @@ instance_start(struct service_instance *in)
 	instance_free_stdio(in);
 	if (in->_stdout.fd.fd > -2) {
 		if (pipe(opipe)) {
-			ULOG_WARN("pipe() failed: %d (%s)\n", errno, strerror(errno));
+			ULOG_WARN("pipe() failed: %m\n");
 			opipe[0] = opipe[1] = -1;
 		}
 	}
 
 	if (in->_stderr.fd.fd > -2) {
 		if (pipe(epipe)) {
-			ULOG_WARN("pipe() failed: %d (%s)\n", errno, strerror(errno));
+			ULOG_WARN("pipe() failed: %m\n");
 			epipe[0] = epipe[1] = -1;
 		}
 	}