summary refs log tree commit diff stats
path: root/src/common
diff options
context:
space:
mode:
authorArnavion <arnavion@gmail.com>2015-01-18 02:55:32 -0800
committerArnavion <arnavion@gmail.com>2015-01-18 02:55:32 -0800
commitc5bbf75f5ef0e164cea4ef92c9112944552e631f (patch)
treea24a69d5632c64b5161fac51574eddef7e5f004a /src/common
parentb783c827c817c0fe69a7f033767cc7f2ab5ad759 (diff)
Removed one leftover check for server->encoding against NULL.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/outbound.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/common/outbound.c b/src/common/outbound.c
index 0e63f899..8884b41e 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -590,7 +590,6 @@ static int
 cmd_charset (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 {
 	server *serv = sess->server;
-	const char *locale = NULL;
 	int offset = 0;
 
 	if (strcmp (word[2], "-quiet") == 0)
@@ -598,9 +597,7 @@ cmd_charset (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 
 	if (!word[2 + offset][0])
 	{
-		g_get_charset (&locale);
-		PrintTextf (sess, "Current charset: %s\n",
-						serv->encoding ? serv->encoding : locale);
+		PrintTextf (sess, "Current charset: %s\n", serv->encoding);
 		return TRUE;
 	}