diff mbox series

[v2] main: Remove unused main.conf option NameResolving

Message ID 20220406084357.iai4k6jvg6gnnbyi@pelzflorian.localdomain
State New
Headers show
Series [v2] main: Remove unused main.conf option NameResolving | expand

Commit Message

Florian Pelz April 6, 2022, 8:43 a.m. UTC 
Commit 826023de5689 ("core: Create devices dynamically during
discovery") removed the last use of name_resolv.
---
 src/btd.h     | 1 -
 src/main.c    | 8 --------
 src/main.conf | 4 ----
 3 files changed, 13 deletions(-)


base-commit: 234d60423c3b8186a27b31028d4c0acb847eedb1
diff mbox series

Patch

diff --git a/src/btd.h b/src/btd.h
index d13646889..c11076cce 100644
--- a/src/btd.h
+++ b/src/btd.h
@@ -109,7 +109,6 @@  struct btd_opts {
 	struct btd_defaults defaults;
 
 	gboolean	reverse_discovery;
-	gboolean	name_resolv;
 	gboolean	debug_keys;
 	gboolean	fast_conn;
 	gboolean	refresh_discovery;
diff --git a/src/main.c b/src/main.c
index a448320c1..52fa4829b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -766,13 +766,6 @@  static void parse_config(GKeyFile *config)
 	} else
 		btd_opts.reverse_discovery = boolean;
 
-	boolean = g_key_file_get_boolean(config, "General",
-						"NameResolving", &err);
-	if (err)
-		g_clear_error(&err);
-	else
-		btd_opts.name_resolv = boolean;
-
 	boolean = g_key_file_get_boolean(config, "General",
 						"DebugKeys", &err);
 	if (err)
@@ -954,7 +947,6 @@  static void init_defaults(void)
 	btd_opts.discovto = DEFAULT_DISCOVERABLE_TIMEOUT;
 	btd_opts.tmpto = DEFAULT_TEMPORARY_TIMEOUT;
 	btd_opts.reverse_discovery = TRUE;
-	btd_opts.name_resolv = TRUE;
 	btd_opts.debug_keys = FALSE;
 	btd_opts.refresh_discovery = TRUE;
 	btd_opts.name_request_retry_delay = DEFAULT_NAME_REQUEST_RETRY_DELAY;
diff --git a/src/main.conf b/src/main.conf
index 401796235..337dc77e5 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -37,10 +37,6 @@ 
 # Defaults to 'true'.
 #ReverseServiceDiscovery = true
 
-# Enable name resolving after inquiry. Set it to 'false' if you don't need
-# remote devices name and want shorter discovery cycle. Defaults to 'true'.
-#NameResolving = true
-
 # Enable runtime persistency of debug link keys. Default is false which
 # makes debug link keys valid only for the duration of the connection
 # that they were created for.