Removed one leftover check for server->encoding against NULL.

This commit is contained in:
Arnavion 2015-01-18 02:55:32 -08:00
parent b783c827c8
commit c5bbf75f5e
1 changed files with 1 additions and 4 deletions

View File

@ -590,7 +590,6 @@ static int
cmd_charset (struct session *sess, char *tbuf, char *word[], char *word_eol[]) cmd_charset (struct session *sess, char *tbuf, char *word[], char *word_eol[])
{ {
server *serv = sess->server; server *serv = sess->server;
const char *locale = NULL;
int offset = 0; int offset = 0;
if (strcmp (word[2], "-quiet") == 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]) if (!word[2 + offset][0])
{ {
g_get_charset (&locale); PrintTextf (sess, "Current charset: %s\n", serv->encoding);
PrintTextf (sess, "Current charset: %s\n",
serv->encoding ? serv->encoding : locale);
return TRUE; return TRUE;
} }