kee

commit 82cd86dd1122675544c1631d949886bd583d2bc3
parent 52d73eea9a069cff8bf48f9877b98cfd41b2ce9a
Author: lash <dev@holbrook.no>
Date:   Fri, 31 May 2024 22:43:08 +0100

Move uc sym to liblash

Diffstat:
M
src/aux/liblash/src/Makefile
 | 
11
+++++++----
M
src/aux/liblash/src/rerr/rerr.c
 | 
2
++
M
src/cadir.c
 | 
1
-
M
src/gpg.c
 | 
1
-

4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/aux/liblash/src/Makefile b/src/aux/liblash/src/Makefile
@@ -6,28 +6,29 @@ all:
 	make -C hex all
 	make -C llog all
 	make -C rerr all
-	#make -C case all
+	make -C case all
 
 clean:
 	make -C endian clean
 	make -C hex clean
 	make -C llog clean
 	make -C rerr clean
-	#make -C case clean
+	make -C case clean
 
 test: all
 	make -C endian test
 	make -C hex test
 	make -C llog test
 	make -C rerr test
-	#make -C case test
+	make -C case test
 
 shared: all
 	make -C endian shared
 	make -C hex shared
 	make -C llog shared
 	make -C rerr shared
-	$(CC) $(CFLAGS) -shared -o liblash.so endian/strip.so.o endian/endian.so.o hex/hex.so.o llog/llog.so.o rerr/rerr.so.o
+	make -C case shared
+	$(CC) $(CFLAGS) -shared -o liblash.so endian/strip.so.o endian/endian.so.o hex/hex.so.o llog/llog.so.o rerr/rerr.so.o case/case.so.o
 
 install: shared
 	cat -v endian/*.h >> $(DESTDIR)/include/lash.h
@@ -38,6 +39,8 @@ install: shared
 	install -m0644 -v llog/*.h -t $(DESTDIR)/include
 	cat -v rerr/*.h >> $(DESTDIR)/include/lash.h
 	install -m0644 -v rerr/*.h -t $(DESTDIR)/include
+	cat -v case/*.h >> $(DESTDIR)/include/lash.h
+	install -m0644 -v case/*.h -t $(DESTDIR)/include
 	#cp -v liblash.so $(DESTDIR)/lib/
 	install -m0644 -v liblash.so -t $(DESTDIR)/lib
 	cd $(DESTDIR)/lib && ln -svf liblash.so liblash.so.$(VERSION)
diff --git a/src/aux/liblash/src/rerr/rerr.c b/src/aux/liblash/src/rerr/rerr.c
@@ -62,6 +62,8 @@ char *rerrstrv(int code) {
 	char v;
 	splitcode(code, &k, &v);
 	return strv(k, v);
+#else
+	return "";
 #endif
 }
 
diff --git a/src/cadir.c b/src/cadir.c
@@ -10,7 +10,6 @@
 /// \todo fail on file size too big for buffer
 //int cadiz_resolve(const char *locator, enum CadizKeyType key_type, const char *key, char *out, size_t *out_len) {
 int cadiz_resolve(Cadiz *cadiz, const char *key, char *out, size_t *out_len) {
-	int r;
 	int c;
 	int fd;
 	char *p;
diff --git a/src/gpg.c b/src/gpg.c
@@ -511,7 +511,6 @@ int gpg_store_check(struct gpg_store *gpg, const char *passphrase) {
 	//unsigned char fingerprint[20] = { 0x00 };
 	unsigned char fingerprint[41] = { 0x00 };
 	//size_t fingerprint_len = 41;
-	size_t fingerprint_len = 41;
 	//char passphrase_hash[m_passphrase_digest_len];
 	char passphrase_hash[gpg->passphrase_digest_len];