← Back to branch summary

~registry/ngircd/testing

« back to all changes in this revision

Viewing changes to src/ngircd/irc-encoding.c

  • Committer: DNS
  • Date: 2013-08-27 14:48:36 UTC
  • mfrom: (2671.5.8)
  • Revision ID: git-v1:bdb2850b399a7fac6a70fe24bd1f58dbd78cc307
Merge branch 'master' into testing

· Remove Conf_PreventLocalChans and Conf_PreventMLChans, obsolete now
· Remove RPL_HELP_MSG

Fixed conflicts with:
        doc/sample-ngircd.conf.tmpl
        man/ngircd.conf.5.tmpl
        src/ngircd/conf.c
        src/ngircd/irc-channel.c
        src/ngircd/irc-info.c
        src/ngircd/messages.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ngircd/irc-encoding.c
1
1
/*
2
2
 * ngIRCd -- The Next Generation IRC Daemon
3
 
 * Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors.
 
3
 * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
4
4
 *
5
5
 * This program is free software; you can redistribute it and/or modify
6
6
 * it under the terms of the GNU General Public License as published by
49
49
        assert (Req != NULL);
50
50
 
51
51
        if (Req->argc != 1)
52
 
                return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
 
52
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
53
53
                                          Client_ID(Client), Req->command);
54
54
 
55
55
        strlcpy(encoding, Req->argv[0], sizeof(encoding));
56
56
        ngt_UpperStr(encoding);
57
57
 
58
58
        if (!Conn_SetEncoding(Client_Conn(Client), encoding))
59
 
                return IRC_WriteStrClient(Client, ERR_IP_CHARCONV_MSG,
 
59
                return IRC_WriteErrClient(Client, ERR_IP_CHARCONV_MSG,
60
60
                                          Client_ID(Client), encoding);
61
61
 
62
62
        return IRC_WriteStrClient(Client, RPL_IP_CHARCONV_MSG,