From 09a48623fa914a985770ab17cfbecc2286cfae19 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 14 Jun 2015 18:31:38 +0200 Subject: [PATCH 1/1] service: reorder function to avoid forward declaration Signed-off-by: Felix Fietkau --- service/instance.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/service/instance.c b/service/instance.c index 29fb834..35b2def 100644 --- a/service/instance.c +++ b/service/instance.c @@ -295,7 +295,21 @@ instance_run(struct service_instance *in, int _stdout, int _stderr) exit(127); } -static void instance_free_stdio(struct service_instance *in); +static void +instance_free_stdio(struct service_instance *in) +{ + if (in->_stdout.fd.fd > -1) { + ustream_free(&in->_stdout.stream); + close(in->_stdout.fd.fd); + in->_stdout.fd.fd = -1; + } + + if (in->_stderr.fd.fd > -1) { + ustream_free(&in->_stderr.stream); + close(in->_stderr.fd.fd); + in->_stderr.fd.fd = -1; + } +} void instance_start(struct service_instance *in) @@ -823,22 +837,6 @@ instance_update(struct service_instance *in, struct service_instance *in_new) return true; } -static void -instance_free_stdio(struct service_instance *in) -{ - if (in->_stdout.fd.fd > -1) { - ustream_free(&in->_stdout.stream); - close(in->_stdout.fd.fd); - in->_stdout.fd.fd = -1; - } - - if (in->_stderr.fd.fd > -1) { - ustream_free(&in->_stderr.stream); - close(in->_stderr.fd.fd); - in->_stderr.fd.fd = -1; - } -} - void instance_free(struct service_instance *in) { -- 2.11.0