Rename to unitd, clean up CMakeLists.txt

4 files changed, 17 insertions, 15 deletions

diff --git a/service/instance.c b/service/instance.c
index 7c902f9..3641369 100644
--- a/service/instance.c
+++ b/service/instance.c
@@ -1,7 +1,9 @@
 /*
+ * Copyright (C) 2015 Matthias Schiffer <mschiffer@universe-factory.net>
+ *
+ * Based on "procd" by:
  * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
  * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
- * Copyright (C) 2015 Matthias Schiffer <mschiffer@universe-factory.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 2.1
@@ -29,7 +31,7 @@
 
 #include <libubox/md5.h>
 
-#include "../procd.h"
+#include "../unitd.h"
 
 #include "service.h"
 #include "instance.h"
@@ -308,7 +310,7 @@ instance_stdio(struct ustream *s, int prio, struct service_instance *in)
 		ustream_consume(s, len);
 	} while (1);
 
-	ulog_open(ULOG_SYSLOG, LOG_DAEMON, "procd");
+	ulog_open(ULOG_SYSLOG, LOG_DAEMON, "unitd");
 }
 
 static void
diff --git a/service/instance.h b/service/instance.h
index 4970dca..22f4ae5 100644
--- a/service/instance.h
+++ b/service/instance.h
@@ -1,7 +1,9 @@
 /*
+ * Copyright (C) 2015 Matthias Schiffer <mschiffer@universe-factory.net>
+ *
+ * Based on "procd" by:
  * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
  * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
- * Copyright (C) 2015 Matthias Schiffer <mschiffer@universe-factory.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 2.1
@@ -13,8 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef __PROCD_INSTANCE_H
-#define __PROCD_INSTANCE_H
+#pragma once
 
 #include <libubox/vlist.h>
 #include <libubox/uloop.h>
@@ -76,5 +77,3 @@ bool instance_update(struct service_instance *in, struct service_instance *in_ne
 void instance_init(struct service_instance *in, struct service *s, struct blob_attr *config);
 void instance_free(struct service_instance *in);
 void instance_dump(struct blob_buf *b, struct service_instance *in, int debug);
-
-#endif
diff --git a/service/service.c b/service/service.c
index 8d5dd95..a57d470 100644
--- a/service/service.c
+++ b/service/service.c
@@ -1,7 +1,9 @@
 /*
+ * Copyright (C) 2015 Matthias Schiffer <mschiffer@universe-factory.net>
+ *
+ * Based on "procd" by:
  * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
  * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
- * Copyright (C) 2015 Matthias Schiffer <mschiffer@universe-factory.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 2.1
@@ -16,7 +18,7 @@
 #include <libubox/blobmsg_json.h>
 #include <libubox/avl-cmp.h>
 
-#include "../procd.h"
+#include "../unitd.h"
 
 #include "service.h"
 #include "instance.h"
diff --git a/service/service.h b/service/service.h
index e346058..2b6071c 100644
--- a/service/service.h
+++ b/service/service.h
@@ -1,7 +1,9 @@
 /*
+ * Copyright (C) 2015 Matthias Schiffer <mschiffer@universe-factory.net>
+ *
+ * Based on "procd" by:
  * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
  * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
- * Copyright (C) 2015 Matthias Schiffer <mschiffer@universe-factory.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 2.1
@@ -13,8 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef __PROCD_SERVICE_H
-#define __PROCD_SERVICE_H
+#pragma once
 
 #include <libubox/avl.h>
 #include <libubox/vlist.h>
@@ -39,5 +40,3 @@ struct service {
 int service_start_early(char *name, char *cmdline);
 void service_init(void);
 void service_event(const char *type, const char *service, const char *instance);
-
-#endif