From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 8 Jan 2018 17:14:53 +0000 (+0000)
Subject: Drop loc_load function
X-Git-Tag: 0.9.0~110
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Flibloc.git;a=commitdiff_plain;h=67cb758ec5cb116888b96581ef7d723ba24816e1;hp=30ac38a14d6117a662014f231a8e2974985dac08

Drop loc_load function

We don't need this any more

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libloc.c b/src/libloc.c
index 630a4d5..61f7c56 100644
--- a/src/libloc.c
+++ b/src/libloc.c
@@ -26,7 +26,6 @@
 #include <ctype.h>
 
 #include <loc/libloc.h>
-#include <loc/database.h>
 #include <loc/private.h>
 
 struct loc_ctx {
@@ -35,8 +34,6 @@ struct loc_ctx {
 		int priority, const char *file, int line, const char *fn,
 		const char *format, va_list args);
 	int log_priority;
-
-	struct loc_database* db;
 };
 
 void loc_log(struct loc_ctx* ctx,
@@ -85,8 +82,6 @@ LOC_EXPORT int loc_new(struct loc_ctx** ctx) {
 	c->log_fn = log_stderr;
 	c->log_priority = LOG_ERR;
 
-	c->db = NULL;
-
 	const char* env = secure_getenv("LOC_LOG");
 	if (env)
 		loc_set_log_priority(c, log_priority(env));
@@ -114,10 +109,6 @@ LOC_EXPORT struct loc_ctx* loc_unref(struct loc_ctx* ctx) {
 	if (--ctx->refcount > 0)
 		return NULL;
 
-	// Release any loaded databases
-	if (ctx->db)
-		loc_database_unref(ctx->db);
-
 	INFO(ctx, "context %p released\n", ctx);
 	free(ctx);
 
@@ -139,26 +130,6 @@ LOC_EXPORT void loc_set_log_priority(struct loc_ctx* ctx, int priority) {
 	ctx->log_priority = priority;
 }
 
-LOC_EXPORT int loc_load(struct loc_ctx* ctx, const char* path) {
-	FILE* f = fopen(path, "r");
-	if (!f)
-		return -errno;
-
-	// Release any previously openend database
-	if (ctx->db)
-		loc_database_unref(ctx->db);
-
-	// Open the new database
-	int r = loc_database_new(ctx, &ctx->db, f);
-	if (r)
-		return r;
-
-	// Close the file
-	fclose(f);
-
-	return 0;
-}
-
 LOC_EXPORT int loc_parse_address(struct loc_ctx* ctx, const char* string, struct in6_addr* address) {
 	DEBUG(ctx, "Paring IP address %s\n", string);
 
diff --git a/src/libloc.sym b/src/libloc.sym
index 5a99bf6..9005010 100644
--- a/src/libloc.sym
+++ b/src/libloc.sym
@@ -26,7 +26,6 @@ global:
 	loc_unref;
 	loc_set_log_priority;
 	loc_new;
-	loc_load;
 
 	# AS
 	loc_as_cmp;
diff --git a/src/loc/libloc.h b/src/loc/libloc.h
index 2d392fe..4854a41 100644
--- a/src/loc/libloc.h
+++ b/src/loc/libloc.h
@@ -36,8 +36,6 @@ void loc_set_log_fn(struct loc_ctx* ctx,
 int loc_get_log_priority(struct loc_ctx* ctx);
 void loc_set_log_priority(struct loc_ctx* ctx, int priority);
 
-int loc_load(struct loc_ctx* ctx, const char* path);
-
 #ifdef LIBLOC_PRIVATE
 int loc_parse_address(struct loc_ctx* ctx, const char* string, struct in6_addr* address);
 #endif