# HG changeset patch
# User Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
# Date 1734813852 18000
#      Sat Dec 21 15:44:12 2024 -0500
# Node ID 35e48b5252533482964862856f5b2ed49d0fc232
# Parent  689b9645e4cdab94f066862c1e37784a1421beff
common: move instance id code from rpc to common

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -37,6 +37,7 @@
 	country.c
 	csv.c
 	index.c
+	instance.c
 	iso3166.c
 	lcd.c
 	maidenhead.c
diff --git a/rpc/include/hlog-rpc/instance.h b/common/include/hlog/instance.h
rename from rpc/include/hlog-rpc/instance.h
rename to common/include/hlog/instance.h
--- a/rpc/include/hlog-rpc/instance.h
+++ b/common/include/hlog/instance.h
@@ -20,8 +20,8 @@
  * SOFTWARE.
  */
 
-#ifndef __RPC_INSTANCE_H
-#define __RPC_INSTANCE_H
+#ifndef __INSTANCE_H
+#define __INSTANCE_H
 
 extern int instance_init(int dirfd);
 extern uint32_t instance_get(void);
diff --git a/rpc/instance.c b/common/instance.c
rename from rpc/instance.c
rename to common/instance.c
--- a/rpc/instance.c
+++ b/common/instance.c
@@ -25,7 +25,7 @@
 #include <jeffpc/io.h>
 #include <jeffpc/val.h>
 
-#include <hlog-rpc/instance.h>
+#include <hlog/instance.h>
 
 /*
  * This file implements the 'instance id'.  Ideally, an instance id would
diff --git a/hlog/contest.c b/hlog/contest.c
--- a/hlog/contest.c
+++ b/hlog/contest.c
@@ -36,11 +36,11 @@
 #include <hlog/version.h>
 #include <hlog/qso.h>
 #include <hlog/index.h>
+#include <hlog/instance.h>
 #include <hlog/util.h>
 #include <hlog-lua/xlua.h>
 
 #include <hlog-rpc/announce-pub.h>
-#include <hlog-rpc/instance.h>
 #include <hlog-rpc/hamlib.h>
 #include <hlog-rpc/rpc-server.h>
 
diff --git a/rpc/CMakeLists.txt b/rpc/CMakeLists.txt
--- a/rpc/CMakeLists.txt
+++ b/rpc/CMakeLists.txt
@@ -29,7 +29,6 @@
 	announce-track.c
 	hamlib.c
 	hamlib-quirks.c
-	instance.c
 	rpc-client.c
 	rpc-server.c
 )
diff --git a/rpc/announce-sock.c b/rpc/announce-sock.c
--- a/rpc/announce-sock.c
+++ b/rpc/announce-sock.c
@@ -25,11 +25,11 @@
 #include <jeffpc/cstr.h>
 #include <jeffpc/time.h>
 
+#include <hlog/instance.h>
 #include <hlog/udpsvc.h>
 
 #include <hlog-rpc/announce.h>
 #include <hlog-rpc/announce-pub.h>
-#include <hlog-rpc/instance.h>
 
 #include "announce-impl.h"
 
diff --git a/rpc/announce-track.c b/rpc/announce-track.c
--- a/rpc/announce-track.c
+++ b/rpc/announce-track.c
@@ -31,9 +31,10 @@
 #include <jeffpc/cbor.h>
 #include <jeffpc/nvl.h>
 
+#include <hlog/instance.h>
+
 #include <hlog-rpc/announce.h>
 #include <hlog-rpc/announce-sub.h>
-#include <hlog-rpc/instance.h>
 
 #include "announce-impl.h"