From 835ea397ac2a05c0af1416e90498f9934b94271f Mon Sep 17 00:00:00 2001
From: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
Date: Tue, 14 Nov 2023 14:55:29 +0100
Subject: [PATCH] Tidy up some code

Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
---
 src/common.c              | 4 ++--
 src/event/server_events.c | 3 +--
 src/plugins/plugins.c     | 4 +---
 src/ui/console.c          | 3 +--
 src/xmpp/connection.c     | 4 +---
 src/xmpp/session.c        | 4 +---
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/common.c b/src/common.c
index 1f235d58..be065a49 100644
--- a/src/common.c
+++ b/src/common.c
@@ -652,7 +652,7 @@ format_call_external_argv(const char* template, const char* url, const char* fil
     return argv;
 }
 
-gchar*
+static gchar*
 _unique_filename(const char* filename)
 {
     gchar* unique = g_strdup(filename);
@@ -676,7 +676,7 @@ _unique_filename(const char* filename)
     return unique;
 }
 
-bool
+static bool
 _has_directory_suffix(const char* path)
 {
     return (g_str_has_suffix(path, ".")
diff --git a/src/event/server_events.c b/src/event/server_events.c
index d7ea97cd..e759088e 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -190,8 +190,7 @@ sv_ev_roster_received(void)
     connection_set_presence_msg(status_message);
     cl_ev_presence_send(conn_presence, diff_secs);
 
-    const char* fulljid = connection_get_fulljid();
-    plugins_on_connect(account_name, fulljid);
+    plugins_on_connect(account_name, connection_get_fulljid());
 }
 
 void
diff --git a/src/plugins/plugins.c b/src/plugins/plugins.c
index 274b711e..c64dceef 100644
--- a/src/plugins/plugins.c
+++ b/src/plugins/plugins.c
@@ -252,9 +252,7 @@ plugins_load(const char* const name, GString* error_message)
     if (plugin) {
         g_hash_table_insert(plugins, strdup(name), plugin);
         if (connection_get_status() == JABBER_CONNECTED) {
-            const char* account_name = session_get_account_name();
-            const char* fulljid = connection_get_fulljid();
-            plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, account_name, fulljid);
+            plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, session_get_account_name(), connection_get_fulljid());
         } else {
             plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, NULL, NULL);
         }
diff --git a/src/ui/console.c b/src/ui/console.c
index 370fa5bb..dfbbfc14 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -458,8 +458,7 @@ cons_show_login_success(ProfAccount* account, gboolean secured)
 {
     ProfWin* console = wins_get_console();
 
-    const char* fulljid = connection_get_fulljid();
-    win_print(console, THEME_DEFAULT, "-", "%s logged in successfully, ", fulljid);
+    win_print(console, THEME_DEFAULT, "-", "%s logged in successfully, ", connection_get_fulljid());
 
     resource_presence_t presence = accounts_get_login_presence(account->name);
     const char* presence_str = string_from_resource_presence(presence);
diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index 759fded8..b199eb05 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -836,9 +836,7 @@ connection_create_stanza_id(void)
                                                        (guchar*)prof_identifier, strlen(prof_identifier),
                                                        rndid, strlen(rndid));
 
-    char* ret = g_strdup_printf("%s%s", rndid, hmac);
-
-    return ret;
+    return g_strdup_printf("%s%s", rndid, hmac);
 }
 
 char*
diff --git a/src/xmpp/session.c b/src/xmpp/session.c
index 05c35e87..5e6ae09d 100644
--- a/src/xmpp/session.c
+++ b/src/xmpp/session.c
@@ -209,9 +209,7 @@ session_disconnect(void)
     if (connection_get_status() == JABBER_CONNECTED) {
         log_info("Closing connection");
 
-        char* account_name = session_get_account_name();
-        const char* fulljid = connection_get_fulljid();
-        plugins_on_disconnect(account_name, fulljid);
+        plugins_on_disconnect(session_get_account_name(), connection_get_fulljid());
 
         accounts_set_last_activity(session_get_account_name());