summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Holy <oholy@redhat.com>2017-09-21 19:28:22 +0200
committerOndrej Holy <oholy@redhat.com>2017-09-29 12:50:15 +0200
commit7c0f22cb03803e4937188bab2efde1263eca96a6 (patch)
treeb1c9b8a1e99d97685d4875918f7327017c06eb3d
parentffbe2adcbf7952130b8ea0ef071c92b0c1f19c11 (diff)
downloadgvfs-7c0f22cb03803e4937188bab2efde1263eca96a6.tar.gz
afp: Prevent usage of uninitialized variable
More warnings are printed when building thanks to meson port. The code contains goto command which skips initialization of server_name variable. Let's move the initialization to another place in order to prevent usage of uninitialized variable and the following warning: warning: ‘server_name’ may be used uninitialized in this function https://bugzilla.gnome.org/show_bug.cgi?id=786149
-rw-r--r--daemon/gvfsafpserver.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/daemon/gvfsafpserver.c b/daemon/gvfsafpserver.c
index 48645604..c1153525 100644
--- a/daemon/gvfsafpserver.c
+++ b/daemon/gvfsafpserver.c
@@ -1015,6 +1015,9 @@ g_vfs_afp_server_login (GVfsAfpServer *server,
if (!res)
return FALSE;
+ /* Use utf8_server_name if it exists */
+ server_name = priv->info.utf8_server_name ? priv->info.utf8_server_name : priv->info.server_name;
+
olduser = g_strdup (initial_user);
if (initial_user)
@@ -1046,9 +1049,6 @@ g_vfs_afp_server_login (GVfsAfpServer *server,
}
}
- /* Use utf8_server_name if it exists */
- server_name = priv->info.utf8_server_name ? priv->info.utf8_server_name : priv->info.server_name;
-
while (TRUE)
{
GString *str;