about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-01-08 00:30:21 -0500
committerJune McEnroe <june@causal.agency>2019-01-08 00:30:21 -0500
commit643af427588de649b66717d9d7eed19d3d147f62 (patch)
treefd4db42dc8742c7fd564daa78e62e3460dc7e302
parentRemove incorrect default coordinates (diff)
downloadtorus-643af427588de649b66717d9d7eed19d3d147f62.tar.gz
torus-643af427588de649b66717d9d7eed19d3d147f62.zip
Factor out default paths
-rw-r--r--client.c2
-rw-r--r--image.c4
-rw-r--r--server.c4
-rw-r--r--torus.h4
4 files changed, 9 insertions, 5 deletions
diff --git a/client.c b/client.c
index 32c2022..af2f985 100644
--- a/client.c
+++ b/client.c
@@ -679,7 +679,7 @@ static void readInput(void) {
 }
 
 int main(int argc, char *argv[]) {
-	const char *sockPath = "torus.sock";
+	const char *sockPath = DefaultSockPath;
 	int opt;
 	while (0 < (opt = getopt(argc, argv, "hs:"))) {
 		switch (opt) {
diff --git a/image.c b/image.c
index 38cd7cd..d8fcbc7 100644
--- a/image.c
+++ b/image.c
@@ -256,8 +256,8 @@ next:
 
 int main(int argc, char *argv[]) {
 	bool kcgi = false;
-	const char *fontPath = "default8x16.psfu";
-	const char *dataPath = "torus.dat";
+	const char *fontPath = DefaultFontPath;
+	const char *dataPath = DefaultDataPath;
 	uint32_t tileX = TileInitX;
 	uint32_t tileY = TileInitY;
 
diff --git a/server.c b/server.c
index b01e81d..9d1fe16 100644
--- a/server.c
+++ b/server.c
@@ -372,8 +372,8 @@ static bool clientTele(struct Client *client, uint8_t port) {
 int main(int argc, char *argv[]) {
 	int error;
 
-	const char *dataPath = "torus.dat";
-	const char *sockPath = "torus.sock";
+	const char *dataPath = DefaultDataPath;
+	const char *sockPath = DefaultSockPath;
 	const char *pidPath = NULL;
 	int opt;
 	while (0 < (opt = getopt(argc, argv, "d:p:s:"))) {
diff --git a/torus.h b/torus.h
index b9d842f..d5accf5 100644
--- a/torus.h
+++ b/torus.h
@@ -25,6 +25,10 @@
 
 #define ARRAY_LEN(a) (sizeof(a) / sizeof((a)[0]))
 
+static const char DefaultDataPath[] = "torus.dat";
+static const char DefaultSockPath[] = "torus.sock";
+static const char DefaultFontPath[] = "default8x16.psfu";
+
 enum {
 	ColorBlack,
 	ColorRed,