Add travis config exempting 1.8

find include/ src/ lang/ docs/ *.* Config -exec sed -i 's/-20.. Anope Team/-2014 Anope Team/i' {} \;

.gitignore

@@ -1,7 +1,35 @@
+*.so
+*.o
+*.s
 Makefile
+Makefile.inc
 autom4te.cache/
 config.cache
 config.log
 config.status
 include/sysconf.h
+include/version.h
+include/language.h
+lang/language.h
 src/bin/anoperc
+lang/cat
+lang/de
+lang/en_us
+lang/es
+lang/fr
+lang/gr
+lang/hun
+lang/index
+lang/it
+lang/langcheck
+lang/langcomp
+lang/nl
+lang/pl
+lang/pt
+lang/ru
+lang/tr
+lang/ja_utf8
+src/services
+src/tools/anopesmtp
+src/tools/db-merger
+src/tools/epona2anope

.travis.yml

@@ -0,0 +1,3 @@
+branches:
+  except:
+    - 1.8

Changes

@@ -1,5 +1,34 @@
+Anope Version 1.8.9
+-------------------
+06/05  F Fixed modules being loaded regardless of the load abort signal. [#1527]
+08/16  F Fixed hs_request to show requested ident in memos               [#1545]
+08/16  F Fix kick reason in cs_suspend/cs_forbid if no reason is given   [#1544]
+12/09  F Fix undefined symbol error on Solaris11                         [  #00]
+
+Provided by Michael Wobst - 2013
+05/25  U Update Hybrid protocol module to support Hybrid 8.1
+06/21  U Update Hybrid protocol module to support vhosts
+
+Anope Version 1.8.8
+-------------------
+01/29  F Fixed user modes on BotServ bots on Unreal3.2.10                [#1474]
+02/13  F Do not allow invalid nicknames to be forbidden in ns_forbid     [  #00]
+
+Provided by Ryuunosuke Ayanokouzi - 2013
+02/17  A Added Japanese language support                                 [  #00]
+
+Provided by Anope Dev. <team@anope.org> - 2012
+02/22  F Fixed several grammar errors in docs/ (patch provided by Simba) [  #00]
+02/25  F Do not allow akill masks to end in @                            [#1380]
+07/14  F Fixed crash with cs_enforce and empty permanent channels        [  #00]
+12/23  A Added Hybrid 8.0 support. (Patch provided by Hybrid Team)       [  #00]
+12/23  R Removed experimental Hybrid 7.0 support.                        [  #00]
+
+Provided by Anope Dev. <team@anope.org> - 2011
+12/31  F Fixed os_svsnick to allow changing the case of a users' nick    [#1369]
+
 Anope Version 1.8.7
------------------------
+-------------------
 08/18  A Added support for Hybrid's channel mode +S                      [#1319]
 08/18  A Added support for Hybrid's channel mode +O                      [#1320]
 08/21  A Added internal event when a nickcore is dropped.                [  #00]

Changes.conf

@@ -1,5 +1,22 @@
+Anope Version 1.8.9
+-------------------
+** ADDED    CONFIGURATION DIRECTIVES **
+
+** MODIFIED CONFIGURATION DIRECTIVES **
+
+** DELETED  CONFIGURATION DIRECTIVES **
+
+Anope Version 1.8.8
+-------------------
+** ADDED    CONFIGURATION DIRECTIVES **
+
+** MODIFIED CONFIGURATION DIRECTIVES **
+
+** DELETED  CONFIGURATION DIRECTIVES **
+
+
 Anope Version 1.8.7
------------------------ 
+-------------------
 ** ADDED    CONFIGURATION DIRECTIVES **
 
 ** MODIFIED CONFIGURATION DIRECTIVES **

Changes.lang

@@ -1,5 +1,23 @@
+Anope Version 1.8.9
+-------------------
+*** New Strings:
+
+*** Mod Strings:
+
+*** Del Strings:
+
+
+Anope Version 1.8.8
+-------------------
+*** New Strings:
+
+*** Mod Strings:
+
+*** Del Strings:
+
+
 Anope Version 1.8.7
------------------------
+-------------------
 *** New Strings:
 
 *** Mod Strings:

Changes.mysql

@@ -1,5 +1,13 @@
+Anope Version 1.8.9
+-------------------
+- NONE
+
+Anope Version 1.8.8
+-------------------
+- NONE
+
 Anope Version 1.8.7
---------------------
+-------------------
 - NONE
 
 Anope Version 1.8.6

Config

@@ -2,7 +2,7 @@
 #
 # Configuration script for Services.
 #
-# Anope (c) 2003-2011 Anope team
+# Anope (c) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for

Makefile.win32

@@ -1,6 +1,6 @@
 # Makefile for Anope.
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for

configure.in

@@ -1,6 +1,6 @@
 dnl autoconf.in for Services.
 dnl
-dnl Anope (c) 2003-2011 Anope team
+dnl Anope (c) 2003-2014 Anope Team
 dnl Contact us at team@anope.org
 
 dnl This program is free but copyrighted software; see the file COPYING for

data/example.conf

@@ -78,7 +78,7 @@
 #     Bahamut 1.4.27 [or later]         - "bahamut"
 #     Charybdis 1.0 [or later]          - "charybdis"
 #     DreamForge 4.6.7                  - "dreamforge"
-#     Hybrid IRCd 7.0 [experimental]    - "hybrid"
+#     Hybrid IRCd 8.1                   - "hybrid"
 #     InspIRCd 1.1 [beta 8 or later]    - "inspircd11"
 #     InspIRCd 1.2 [RC3 or later]       - "inspircd12"
 #     InspIRCd 2.0                      - "inspircd20"

docs/COPYING

@@ -1,339 +1,347 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
 
-			    Preamble
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+                         Preamble
+
+ The licenses for most software are designed to take away your 
+freedom to share and change it. By contrast, the GNU General Public 
+License is intended to guarantee your freedom to share and change free 
+software--to make sure the software is free for all its users. This 
+General Public License applies to most of the Free Software 
+Foundation's software and to any other program whose authors commit to 
+using it. (Some other Free Software Foundation software is covered by 
+the GNU Lesser General Public License instead.) You can apply it to 
 your programs, too.
 
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you 
+have the freedom to distribute copies of free software (and charge for 
+this service if you wish), that you receive source code or can get it 
+if you want it, that you can change the software or use pieces of it 
 in new free programs; and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
+ To protect your rights, we need to make restrictions that forbid 
+anyone to deny you these rights or to ask you to surrender the rights. 
+These restrictions translate to certain responsibilities for you if you 
 distribute copies of the software, or if you modify it.
 
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
+ For example, if you distribute copies of such a program, whether 
+gratis or for a fee, you must give the recipients all the rights that 
+you have. You must make sure that they, too, receive or can get the 
+source code. And you must show them these terms so they know their 
 rights.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
+ We protect your rights with two steps: (1) copyright the software, and 
+(2) offer you this license which gives you legal permission to copy, 
 distribute and/or modify the software.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
+ Also, for each author's protection and ours, we want to make certain 
+that everyone understands that there is no warranty for this free 
+software. If the software is modified by someone else and passed on, we 
+want its recipients to know that what they have is not the original, so 
+that any problems introduced by others will not reflect on the original 
 authors' reputations.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
+ Finally, any free program is threatened constantly by software 
+patents. We wish to avoid the danger that redistributors of a free 
+program will individually obtain patent licenses, in effect making the 
+program proprietary. To prevent this, we have made it clear that any 
 patent must be licensed for everyone's free use or not licensed at all.
 
-  The precise terms and conditions for copying, distribution and
+ The precise terms and conditions for copying, distribution and 
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                      GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
+ 0. This License applies to any program or other work which contains 
+a notice placed by the copyright holder saying it may be distributed 
+under the terms of this General Public License. The "Program", below, 
+refers to any such program or work, and a "work based on the Program" 
+means either the Program or any derivative work under copyright law: 
+that is to say, a work containing the Program or a portion of it, 
+either verbatim or with modifications and/or translated into another 
+language. (Hereinafter, translation is included without limitation in 
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not 
+covered by this License; they are outside its scope. The act of 
+running the Program is not restricted, and the output from the Program 
+is covered only if its contents constitute a work based on the 
+Program (independent of having been made by running the Program). 
 Whether that is true depends on what the Program does.
 
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
+ 1. You may copy and distribute verbatim copies of the Program's 
+source code as you receive it, in any medium, provided that you 
+conspicuously and appropriately publish on each copy an appropriate 
+copyright notice and disclaimer of warranty; keep intact all the 
+notices that refer to this License and to the absence of any warranty; 
+and give any other recipients of the Program a copy of this License 
 along with the Program.
 
-You may charge a fee for the physical act of transferring a copy, and
+You may charge a fee for the physical act of transferring a copy, and 
 you may at your option offer warranty protection in exchange for a fee.
 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
+ 2. You may modify your copy or copies of the Program or any portion 
+of it, thus forming a work based on the Program, and copy and 
+distribute such modifications or work under the terms of Section 1 
 above, provided that you also meet all of these conditions:
 
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+   a) You must cause the modified files to carry prominent notices 
+   stating that you changed the files and the date of any change.
 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+   b) You must cause any work that you distribute or publish, that in 
+   whole or in part contains or is derived from the Program or any 
+   part thereof, to be licensed as a whole at no charge to all third 
+   parties under the terms of this License.
 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+   c) If the modified program normally reads commands interactively 
+   when run, you must cause it, when started running for such 
+   interactive use in the most ordinary way, to print or display an 
+   announcement including an appropriate copyright notice and a 
+   notice that there is no warranty (or else, saying that you provide 
+   a warranty) and that users may redistribute the program under 
+   these conditions, and telling the user how to view a copy of this 
+   License. (Exception: if the Program itself is interactive but 
+   does not normally print such an announcement, your work based on 
+   the Program is not required to print an announcement.)
 
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
+These requirements apply to the modified work as a whole. If 
+identifiable sections of that work are not derived from the Program, 
+and can be reasonably considered independent and separate works in 
+themselves, then this License, and its terms, do not apply to those 
+sections when you distribute them as separate works. But when you 
+distribute the same sections as part of a whole which is a work based 
+on the Program, the distribution of the whole must be on the terms of 
+this License, whose permissions for other licensees extend to the entire 
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest 
+your rights to work written entirely by you; rather, the intent is to 
+exercise the right to control the distribution of derivative or 
 collective works based on the Program.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
+In addition, mere aggregation of another work not based on the Program 
+with the Program (or with a work based on the Program) on a volume of 
+a storage or distribution medium does not bring the other work under 
 the scope of this License.
 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
+ 3. You may copy and distribute the Program (or a work based on it, 
+under Section 2) in object code or executable form under the terms of 
 Sections 1 and 2 above provided that you also do one of the following:
 
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
+   a) Accompany it with the complete corresponding machine-readable 
+   source code, which must be distributed under the terms of Sections 
+   1 and 2 above on a medium customarily used for software interchange; or,
 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+   b) Accompany it with a written offer, valid for at least three years, 
+   to give any third party, for a charge no more than your cost of 
+   physically performing source distribution, a complete machine-readable 
+   copy of the corresponding source code, to be distributed under the terms 
+   of Sections 1 and 2 above on a medium customarily used for software 
+   interchange; or,
 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+   c) Accompany it with the information you received as to the offer 
+   to distribute corresponding source code. (This alternative is allowed 
+   only for noncommercial distribution and only if you received the program 
+   in object code or executable form with such an offer, in accord with 
+   Subsection b above.)
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
+The source code for a work means the preferred form of the work for 
+making modifications to it. For an executable work, complete source 
+code means all the source code for all modules it contains, plus any 
+associated interface definition files, plus the scripts used to 
+control compilation and installation of the executable. However, as a 
+special exception, the source code distributed need not include 
+anything that is normally distributed (in either source or binary 
+form) with the major components (compiler, kernel, and so on) of the 
+operating system on which the executable runs, unless that component 
 itself accompanies the executable.
 
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
+If distribution of executable or object code is made by offering 
+access to copy from a designated place, then offering equivalent 
+access to copy the source code from the same place counts as 
+distribution of the source code, even though third parties are not 
 compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
+
+ 4. You may not copy, modify, sublicense, or distribute the Program 
+except as expressly provided under this License. Any attempt 
+otherwise to copy, modify, sublicense or distribute the Program is 
+void, and will automatically terminate your rights under this License. 
+However, parties who have received copies, or rights, from you under 
+this License will not have their licenses terminated so long as such 
 parties remain in full compliance.
 
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
+ 5. You are not required to accept this License, since you have not 
+signed it. However, nothing else grants you permission to modify or 
+distribute the Program or its derivative works. These actions are 
+prohibited by law if you do not accept this License. Therefore, by 
+modifying or distributing the Program (or any work based on the 
+Program), you indicate your acceptance of this License to do so, and 
+all its terms and conditions for copying, distributing or modifying 
 the Program or works based on it.
 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+ 6. Each time you redistribute the Program (or any work based on the 
+Program), the recipient automatically receives a license from the 
+original licensor to copy, distribute or modify the Program subject to 
+these terms and conditions. You may not impose any further 
+restrictions on the recipients' exercise of the rights granted herein. 
+You are not responsible for enforcing compliance by third parties to 
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+ 7. If, as a consequence of a court judgment or allegation of patent 
+infringement or for any other reason (not limited to patent issues), 
+conditions are imposed on you (whether by court order, agreement or 
+otherwise) that contradict the conditions of this License, they do not 
+excuse you from the conditions of this License. If you cannot 
+distribute so as to satisfy simultaneously your obligations under this 
+License and any other pertinent obligations, then as a consequence you 
+may not distribute the Program at all. For example, if a patent license
+would not permit royalty-free redistribution of the Program by all those
+who receive copies directly or indirectly through you, then the only way
+you could satisfy both it and this License would be to refrain entirely
+from distribution of the Program.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
+If any portion of this section is held invalid or unenforceable under 
+any particular circumstance, the balance of the section is intended to 
+apply and the section as a whole is intended to apply in other 
 circumstances.
 
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+It is not the purpose of this section to induce you to infringe any 
+patents or other property right claims or to contest validity of any 
+such claims; this section has the sole purpose of protecting the 
+integrity of the free software distribution system, which is implemented 
+by public license practices. Many people have made generous contributions 
+to the wide range of software distributed through that system in reliance 
+on consistent application of that system; it is up to the author/donor to 
+decide if he or she is willing to distribute software through any other 
+system and a licensee cannot impose that choice.
 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
+This section is intended to make thoroughly clear what is believed to be 
+a consequence of the rest of this License.
+
+
+ 8. If the distribution and/or use of the Program is restricted in 
+certain countries either by patents or by copyrighted interfaces, the 
+original copyright holder who places the Program under this License 
+may add an explicit geographical distribution limitation excluding 
+those countries, so that distribution is permitted only in or among 
+countries not thus excluded. In such case, this License incorporates 
 the limitation as if written in the body of this License.
 
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
+ 9. The Free Software Foundation may publish revised and/or new versions 
+of the General Public License from time to time. Such new versions will 
+be similar in spirit to the present version, but may differ in detail to 
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
+Each version is given a distinguishing version number. If the Program 
+specifies a version number of this License which applies to it and "any 
+later version", you have the option of following the terms and conditions 
+either of that version or of any later version published by the Free 
+Software Foundation. If the Program does not specify a version number of 
+this License, you may choose any version ever published by the Free Software 
 Foundation.
 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
+ 10. If you wish to incorporate parts of the Program into other free 
+programs whose distribution conditions are different, write to the author 
+to ask for permission. For software which is copyrighted by the Free 
+Software Foundation, write to the Free Software Foundation; we sometimes 
+make exceptions for this. Our decision will be guided by the two goals 
+of preserving the free status of all derivatives of our free software and 
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                                 NO WARRANTY
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY 
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN 
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES 
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED 
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS 
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE 
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, 
 REPAIR OR CORRECTION.
 
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, 
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING 
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED 
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY 
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER 
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE 
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
+                         END OF TERMS AND CONDITIONS
 
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
+How to Apply These Terms to Your New Programs
 
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+ If you develop a new program, and you want it to be of the greatest 
+possible use to the public, the best way to achieve this is to make 
+it free software which everyone can redistribute and change under 
+these terms.
+
+ To do so, attach the following notices to the program. It is safest 
+to attach them to the start of each source file to most effectively 
+convey the exclusion of warranty; and each file should have at least 
 the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+   <one line to give the program's name and an idea of what it does.>
+   Copyright (C) yyyy  name of author
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+   02110-1301, USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
+If the program is interactive, make it output a short notice like this 
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
+   Gnomovision version 69, Copyright (C) year name of author
+   Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
+   type `show w'.  This is free software, and you are welcome
+   to redistribute it under certain conditions; type `show c' 
+   for details.
 
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
+The hypothetical commands `show w' and `show c' should show the appropriate 
+parts of the General Public License. Of course, the commands you use may 
+be called something other than `show w' and `show c'; they could even be 
 mouse-clicks or menu items--whatever suits your program.
 
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+You should also get your employer (if you work as a programmer) or your 
+school, if any, to sign a "copyright disclaimer" for the program, if 
+necessary. Here is a sample; alter the names:
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+   Yoyodyne, Inc., hereby disclaims all copyright interest in the program 
+   `Gnomovision' (which makes passes at compilers) written  by James Hacker.
 
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
+   <signature of Ty Coon>, 1 April 1989
+   Ty Coon, President of Vice
 
 This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+proprietary programs. If your program is a subroutine library, you may 
+consider it more useful to permit linking proprietary applications with the 
+library. If this is what you want to do, use the GNU Lesser General 
 Public License instead of this License.
+
+

docs/EVENTS

@@ -279,7 +279,7 @@ Anope Internal Events
         av[0]  The name of the channel that has been unsuspended.
 
     EVENT_CHANGE_NICK
-        A user has just changed it's nick.
+        A user has just changed its nick.
         av[0]  The new nickname of the user. Event is called after the user has been changed
                to this nickname.
         av[1]  The old nickname of the user.
@@ -314,7 +314,7 @@ Anope Internal Events
         av[0]  The new level of DefCon being invoked.
 
     EVENT_GROUP
-        A user has grouped it's nickname to another user group.
+        A user has grouped its nickname to another user group.
         av[0]  The nickname of the user that joined the group.
 
     EVENT_JOIN_CHANNEL
@@ -365,7 +365,7 @@ Anope Internal Events
         av[2]  The nickname being ghosted.
 
     EVENT_NICK_IDENTIFY
-        A user has just identified for it's nickname with NickServ.
+        A user has just identified for its nickname with NickServ.
         av[0]  The nickname of the user that just identified.
 
     EVENT_NICK_LOGOUT
@@ -380,7 +380,7 @@ Anope Internal Events
         av[2]  The nickname being recovered.
 
     EVENT_NICK_REGISTERED
-        A new user has just registered it's nickname. This event is being
+        A new user has just registered its nickname. This event is being
         emitted when the registration is completed, but the user modes have not
         yet been set.
         av[0]  The nickname of the newly registered user.

docs/IRCD

@@ -72,7 +72,7 @@ How To Add IRCd Support
     of each.
 
     1) Name: This member tells Anope about the IRCD's name. It may contain
-             text about it's name and version. This is used to identify the
+             text about its name and version. This is used to identify the
              build on startup.
 
     2) NickServ Mode: This is the user mode set by Anope on NickServ.

docs/MYSQL

@@ -8,7 +8,7 @@ Anope MySQL Support
     core, we decided to save it for 2.0. However, having your db's easily 
     accessible on your website is still a great feature.
 
-    PHASE 1:Anope will be able to save all it's databases to MySQL. It will 
+    PHASE 1:Anope will be able to save all its databases to MySQL. It will 
     happen in conjunction with the current FFF databases. This first step is 
     nothing more than a MySQL dump of the databases (i.e. read-only), since 
     Anope will not (for now) read from Mysql. (COMPLETED)

docs/OLDCHANGES

@@ -167,7 +167,7 @@ Provided by Anope Dev. <team@anope.org>
 2003/07/20  Fixed chanserv badword MySQL issue
 2003/08/30  Allow for E/F lines when handling akilled host's joining the network
 2003/07/25  Added External socket support (*VERY* EXPERIMENTAL)
-2003/07/20  Made MySQL ns_id, na_id and ci_id useful by preserving it's value across updates
+2003/07/20  Made MySQL ns_id, na_id and ci_id useful by preserving its value across updates
 2003/07/20  Some MySQL Optimizations (MySQL 3.23.32+ required)
 
 Provided by DrStein

docs/PROXY

@@ -6,9 +6,9 @@ Anope Proxy Detector
 
 1) Introduction
 
-    Anope has had a built-in proxy detector since it's first version. Recently,
+    Anope has had a built-in proxy detector since its first version. Recently,
     however, this built-in proxy detector has been removed. This was because
-    the Anope team found that the proxy detector was showing it's age, and the
+    the Anope team found that the proxy detector was showing its age, and the
     time needed to restore it to a good state wasn't worth it, also considering
     that there are currently good alternatives out there which do the job as
     good as it can be done already.

docs/README

@@ -1,7 +1,7 @@
 Anope - a set of IRC services for IRC networks
 ----------------------------------------------
 
-Anope is          2003-2011 Anope Team    <team@anope.org>.
+Anope is          2003-2014 Anope Team    <team@anope.org>.
 Based on Epona    2000-2002 PegSoft       <epona@pegsoft.net>.
 Based on Services 1996-1999 Andrew Church <achurch@achurch.org>.
 
@@ -202,7 +202,7 @@ Table of Contents
         * Bahamut 1.4.27 or later (including 1.8)
         * Charybdis 1.0 or later
         * DreamForge 4.6.7
-        * Hybrid 7 or later
+        * Hybrid 8.1 or later
         * InspIRCd 1.x, and 2.0
         * Plexus 2.0 or later (including 3.0)
         * PTlink 6.15 or later
@@ -366,13 +366,13 @@ Table of Contents
 
 6) Adding Your Translation Into The Source
 
-    First, get the latest svn version of Anope. This can be done by doing
-    'svn co http://anope.svn.sourceforge.net/svnroot/anope/stable ./anope-stable`
+    First, get the latest version of Anope. This can be done by doing
+    'git clone git://github.com/anope/anope anope-stable'
 
-    Second, Place your language file in lang/, and type 'svn add file.l`. Where file is
+    Second, Place your language file in lang/, and type 'git add file.l`. Where file is
     your language file.
 
-    Next, edit lang/Makefile and add your file into both the LANGOBJS variable and
+    Next, edit lang/Makefile(.win32) and add your file into both the LANGOBJS variable and
     the LANGSRCS variable (alphabetically please). Then, go down and add an entry for
     it similar the others, eg:
        en_us:    en_us.l    langcomp index
@@ -398,7 +398,7 @@ Table of Contents
        load_lang(LANG_PL, "pl");
        load_lang(LANG_BLAH, "blah");
 
-    Now use 'svn diff > language.diff` to get the changes you made, and if it looks good (test it)
+    Now use 'git diff HEAD > language.diff` to get the changes you made, and if it looks good (test it)
     email it to team@anope.org!
 
     Please be aware we will only include a new language if there is sufficient demand for it.

docs/WIN32.txt

@@ -20,36 +20,20 @@ Anope for Windows
         * Current Anope source:
             http://sourceforge.net/project/showfiles.php?group_id=94081
 
-        If you have Visual C++ 6, 7 (.NET 2002/2003), 8 (2005) or 10 (2010) skip ahead to step 2, else you
+        If you have Visual C++ 2008, 2010, or 2012 skip ahead to step 2, else you
         need to download the following free components from Microsoft. Once
         downloaded, install one of the following, for best results use MS VC 2010.
 
 		* Microsoft Visual C++ 2010 Express
-			http://www.microsoft.com/express/vc/
+			http://www.microsoft.com/visualstudio/eng/products/visual-studio-2010-express
 
 		or
 
 		* Microsoft Visual C++ 2008 Express Edition:
-			http://www.microsoft.com/visualstudio/en-us/products/2008-editions/express
+			http://www.microsoft.com/en-us/download/details.aspx?id=14597
 
-		or
-
-		* Microsoft Visual C++ 2005 Express Edition:
-			http://msdn.microsoft.com/vstudio/express/visualc/download/
-            
-	if you installed Visual C++ 2010, it comes included with an SDK, so skip ahead to step 2, otherwise
-	install the following PlatformSDK:
-
-		* Microsoft Windows PlatformSDK: (Requires WGA validation)
-			http://www.microsoft.com/downloads/details.aspx?FamilyId=0BAF2B35-C656-4969-ACE8-E4C0C0716ADB&displaylang=en
-
-			(NOTE: Although this says for Windows Server 2003, it does infact work on all supported
-			versions of Windows.)
-	    
-			When installing, you should select the Custom option, and ensure that the top option relating to
-			the registering of environment variables, is enabled in addition to the default selections.
-
-			If you do not do this, you may run into problems with the PSDK not being found properly during install.
+		* Microsoft Windows Platform SDK: (Requires WGA validation)
+			http://www.microsoft.com/en-us/download/details.aspx?id=3138
 
 		* MySQL for Windows (only needed if building with MySQL enabled):
 			http://dev.mysql.com/

include/commands.h

@@ -1,6 +1,6 @@
 /* Declarations for command data.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/config.h

@@ -1,6 +1,6 @@
 /* Services configuration.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/datafiles.h

@@ -1,6 +1,6 @@
 /* Database file descriptor structure and file handling routine prototypes.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/defs.h

@@ -1,6 +1,6 @@
 /* Set default values for any constants that should be in include files but
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/depricated.h

@@ -1,6 +1,6 @@
 /* depricated.h
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/encrypt.h

@@ -1,6 +1,6 @@
 /* Include file for high-level encryption routines.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/events.h

@@ -1,6 +1,6 @@
 /* Prototypes and external variable declarations.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/extern.h

@@ -1,6 +1,6 @@
 /* Prototypes and external variable declarations.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/makefile.win32

@@ -1,6 +1,6 @@
 # Make file for Win32
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.

include/messages.h

@@ -1,6 +1,6 @@
 /* Declarations of IRC message structures, variables, and functions.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules.h

@@ -1,6 +1,6 @@
 /* Modular support
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/pseudo.h

@@ -1,6 +1,6 @@
 /* Include extra includes needed by most/all pseudo-clients.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/services.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -496,6 +496,8 @@ struct memo_ {
     ModuleData *moduleData; 	/* Module saved data attached to the Memo */
 #ifdef USE_MYSQL
 	uint32 id;		/* Database ID; see mysql.c */
+#else
+	uint32 notused;		/* ABI compat with no mysql */
 #endif
 };
 
@@ -1326,9 +1328,10 @@ typedef struct ircd_modes_ {
 #define LANG_RU                13   	/* Russian */
 #define LANG_HUN               14   	/* Hungarian */
 #define LANG_PL                15   	/* Polish */
+#define LANG_JA_UTF8           16	/* Japanese (UTF-8 encoding) */
 
-#define NUM_LANGS              16	/* Number of languages */
-#define USED_LANGS             13	/* Number of languages provided */
+#define NUM_LANGS              17	/* Number of languages */
+#define USED_LANGS             14	/* Number of languages provided */
 
 
 #define DEF_LANGUAGE	LANG_EN_US

include/slist.h

@@ -1,6 +1,6 @@
 /* Header for Services list handler.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/sockets.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2004-2011 Anope Team
+ * (C) 2004-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/timeout.h

@@ -1,6 +1,6 @@
 /* Time-delay routine include stuff.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/version.sh

@@ -27,7 +27,7 @@ fi
 cat >version.h <<EOF
 /* Version information for Services.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and CREDITS for further details.

include/version.sh.c

@@ -1,6 +1,6 @@
 /* version file handler for win32.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

install.js

@@ -1,7 +1,7 @@
 //
 // install.js - Windows Configuration
 //
-// (C) 2003-2011 Anope Team
+// (C) 2003-2014 Anope Team
 // Contact us at team@anope.org
 //
 // This program is free but copyrighted software; see the file COPYING for
@@ -70,6 +70,27 @@ var installerQuestions = [
                                        ];
 
 var buildPackages = [
+                                        {
+                                                         'name' : 'Microsoft Visual Studio 2012',
+                                                                    'libpaths' : [
+                                                                    'Program Files\\Microsoft Visual Studio 11.0\\VC\\lib',
+                                                                    'Program Files (x86)\\Microsoft Visual Studio 11.0\\VC\\lib',
+                                                                    'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib',
+                                                                    'Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0\\Lib',
+                                                                    ],
+                                                         'incpaths': [
+                                                                    'Program Files\\Microsoft Visual Studio 11.0\\VC\\include',
+                                                                    'Program Files (x86)\\Microsoft Visual Studio 11.0\\VC\\include',
+                                                                    'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Include',
+                                                                    'Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0\\Include',
+                                                                    ],
+                                                         'nmake' : [
+                                                                    'Program Files\\Microsoft Visual Studio 11.0\\VC\\bin',
+                                                                    'Program Files (x86)\\Microsoft Visual Studio 11.0\\VC\\bin',
+                                                                   ],
+                                                        'additional_switches' : [ '/w' ],
+                                                        'installedDrive' : 'C'
+                                        },
                                         {
                                                         'name' : 'Microsoft Visual Studio 2010 (64bit)',
                                                         'libpaths' : [
@@ -77,7 +98,7 @@ var buildPackages = [
                                                                      'Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib',
                                                                      'Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib',
                                                                      'Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0A\\Lib'
-								     ],
+                                       ],
                                                         'incpaths': [
                                                                      'Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\include',
                                                                      'Program Files\\Microsoft SDKs\\Windows\\v7.1\\Include',
@@ -87,8 +108,8 @@ var buildPackages = [
                                                          'nmake' : [
                                                                    'Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\bin',
                                                                    ],
-							 'additional_switches' : [ '/w' ],
-							 'installedDrive' : 'C'
+                                                         'additional_switches' : [ '/w' ],
+                                                         'installedDrive' : 'C'
                                         },
                                         {
                                                         'name' : 'Microsoft Visual Studio 2010',
@@ -159,8 +180,8 @@ var buildPackages = [
                                                                         ],
                                                         'additional_switches' : [
                                                                                                 '/w'
-                                                                      	],
-							'installedDrive' : 'C'
+                                                                                ],
+                                                        'installedDrive' : 'C'
                                         },
                                         {                                        
                                                         'name' : 'Microsoft Visual Studio 2005 (Old PSDK)',
@@ -178,26 +199,8 @@ var buildPackages = [
                                                                         ],
                                                         'additional_switches' : [
                                                                                                 '/w'
-                                                               		],
-							'installedDrive' : 'C'
-                                        },
-                                        
-                                        {
-                                                        'name' : 'Microsoft Visual Studio .NET 2003',
-                                                        'libpaths' : [
-                                                                                'Program Files\\Microsoft Visual Studio .NET 2003\\VC7\\Lib',
-                                                                                'Program Files\\Microsoft Visual Studio .NET 2003\\PlatformSDK\\Lib'
-                                                                         ],
-                                                        'incpaths' : [
-                                                                                'Program Files\\Microsoft Visual Studio .NET 2003\\VC7\\Include',
-                                                                                'Program Files\\Microsoft Visual Studio .NET 2003\\PlatformSDK\\Include'
-                                                                         ],
-                                                        'nmake' : [
-                                                                                'Program Files\\Microsoft Visual Studio .NET 2003\\VC7\\Bin',
-                                                                                ''
-                                                                        ],                                                                    
-                                                        'additional_switches' : false,
-							'installedDrive' : 'C'
+                                                               	                ],
+                                                         'installedDrive' : 'C'
                                         }
                                 ];                  
                                                               

lang/Makefile

@@ -6,8 +6,8 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
    	   'RUNGROUP=${RUNGROUP}' 'USE_MODULES=${USE_MODULES}'
 
-LANGOBJS = cat de en_us es fr gr hun it nl pl pt ru tr
-LANGSRCS = cat.l de.l en_us.l es.l fr.l gr.l hun.l it.l nl.l pl.l pt.l ru.l tr.l
+LANGOBJS = cat de en_us es fr gr hun it ja_utf8 nl pl pt ru tr
+LANGSRCS = cat.l de.l en_us.l es.l fr.l gr.l hun.l it.l ja_utf8.l nl.l pl.l pt.l ru.l tr.l
 
 LANGCOMP = ./langcomp
 #LANGCOMP = ./langcomp -w
@@ -59,6 +59,8 @@ hun:      hun.l       langcomp index
 	./langcomp $@.l
 it:       it.l       langcomp index
 	./langcomp $@.l
+ja_utf8:  ja_utf8.l  langcomp index
+	./langcomp $@.l
 nl:       nl.l       langcomp index
 	./langcomp $@.l
 pl:       pl.l       langcomp index

lang/Makefile.win32

@@ -3,8 +3,8 @@
 include ../Makefile.inc.win32
 
 
-LANGOBJS = cat de en_us es fr hun gr nl pl pt tr it ru
-LANGSRCS = cat de en_us.l es fr.l hun.l gr.l nl.l pl.l pt.l tr.l it.l ru.l
+LANGOBJS = cat de en_us es fr hun gr nl pl pt tr it ja_utf8 ru
+LANGSRCS = cat de en_us.l es fr.l hun.l gr.l nl.l pl.l pt.l tr.l it.l ja_utf8.l ru.l
 
 LANGCOMP = ./langcomp
 #LANGCOMP = ./langcomp -w
@@ -26,6 +26,7 @@ install: all
         -copy pt ..\$(DATDEST)\languages
         -copy tr ..\$(DATDEST)\languages
         -copy it ..\$(DATDEST)\languages
+        -copy ja_utf8 ..\$(DATDEST)\languages
         -copy ru ..\$(DATDEST)\languages
 
 clean:
@@ -59,6 +60,8 @@ tr:       tr.l       langtool.exe langcomp.exe index
         langcomp $@.l
 it:       it.l       langtool.exe langcomp.exe index
         langcomp $@.l
+ja_utf8:  ja_utf8.l  langtool.exe langcomp.exe index
+        langcomp $@.l
 ru:       ru.l       langtool.exe langcomp.exe index
         langcomp $@.l
 

lang/cat.l

@@ -1,6 +1,6 @@
 # Catalan Language File.
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.
@@ -3423,7 +3423,7 @@ NEWS_HELP_LOGON
 	
 	Edits or displays the list of logon news messages.  When a
 	user connects to the network, these messages will be sent
-	to them.  (However, no more than %s messages will be
+	to them.  (However, no more than %d messages will be
 	sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3437,7 +3437,7 @@ NEWS_HELP_OPER
 	
 	Edits or displays the list of oper news messages.  When a
 	user opers up (with the /OPER command), these messages will
-	be sent to them.  (However, no more than %s messages will
+	be sent to them.  (However, no more than %d messages will
 	be sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.

lang/de.l

@@ -1,6 +1,6 @@
 # Deutsches Language file.
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #   
 # Please read COPYING and README for further details.
@@ -3373,7 +3373,7 @@ NEWS_HELP_LOGON
 	
 	Zeigt oder bearbeitet die Liste der LogonNews.
 	Nach der Verbindung des Users werden diese Nachrichten
-	angezeigt. (Es werden jedoch nur max. %s angezeigt, um ein
+	angezeigt. (Es werden jedoch nur max. %d angezeigt, um ein
 	Flooding des Users zu verhindern. Wenn mehr News
 	existieren, werden nur die neuesten angezeigt.)
 	Die Anzahl der News können in der services.conf festgelegt werden.
@@ -3388,7 +3388,7 @@ NEWS_HELP_OPER
 	Zeigt oder bearbeitet die Liste der Oper-News.Nachdem 
 	sich ein User die Oper-Flags gesetzt hat (mit dem
 	/OPER Befehl) werden ihm diese Nachrichten angezeigt.
-	(Es werden jedoch nur max. %s Nachrichten angezeigt, um ein
+	(Es werden jedoch nur max. %d Nachrichten angezeigt, um ein
 	Flooding des Users zu verhindern. Wenn mehr News
 	existieren, werden nur die neüsten angezeigt.)
 	Die Anzahl der News können in der services.conf festgelegt werden.

lang/en_us.l

@@ -1,6 +1,6 @@
 # United States English language file.
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #   
 # Please read COPYING and README for further details.
@@ -664,7 +664,7 @@ NICK_SASET_HIDE_STATUS_OFF
 	
 # SASET MSG responses
 NICK_SASET_MSG_SYNTAX
-	SASAET nickname MSG {ON | OFF}
+	SASET nickname MSG {ON | OFF}
 NICK_SASET_MSG_ON
 	Services will now reply to %s with messages.
 NICK_SASET_MSG_OFF
@@ -3283,7 +3283,7 @@ NEWS_HELP_LOGON
 	
 	Edits or displays the list of logon news messages.  When a
 	user connects to the network, these messages will be sent
-	to them.  (However, no more than %s messages will be
+	to them.  (However, no more than %d messages will be
 	sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3297,7 +3297,7 @@ NEWS_HELP_OPER
 	
 	Edits or displays the list of oper news messages.  When a
 	user opers up (with the /OPER command), these messages will
-	be sent to them.  (However, no more than %s messages will
+	be sent to them.  (However, no more than %d messages will
 	be sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.

lang/es.l

@@ -1,6 +1,6 @@
 # Spanish Language File.
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.
@@ -3397,7 +3397,7 @@ NEWS_HELP_LOGON
 	
 	Edits or displays the list of logon news messages.  When a
 	user connects to the network, these messages will be sent
-	to them.  (However, no more than %s messages will be
+	to them.  (However, no more than %d messages will be
 	sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3411,7 +3411,7 @@ NEWS_HELP_OPER
 	
 	Edits or displays the list of oper news messages.  When a
 	user opers up (with the /OPER command), these messages will
-	be sent to them.  (However, no more than %s messages will
+	be sent to them.  (However, no more than %d messages will
 	be sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.

lang/fr.l

@@ -1,6 +1,6 @@
 # French language file.
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.
@@ -3483,7 +3483,7 @@ NEWS_HELP_LOGON
 	
 	Édite ou affiche la liste de messages Logon News. Lorsqu'un 
 	utilisateur se connecte au réseau, ces messages leur seront 
-	envoyés. (Cependant, pas plus de %s messages ne seront envoyés 
+	envoyés. (Cependant, pas plus de %d messages ne seront envoyés 
 	pour éviter le flood des utilisateurs. Si il y a plusieurs 
 	messages de news, seuls les plus récents seront envoyés.) Le 
 	nombre de news envoyées peut être configuré dans le 
@@ -3498,7 +3498,7 @@ NEWS_HELP_OPER
 	
 	Édite ou affiche la liste des messages Oper News. Quand un 
 	utilisateur utilise la commande /OPER, ces messages lui seront 
-	envoyés. (Cependant, pas plus de %s messages ne seront envoyés 
+	envoyés. (Cependant, pas plus de %d messages ne seront envoyés 
 	afin de ne pas flooder l'utilisateur. Si il y a plusieurs 
 	messages news, seuls les plus récents seront envoyés.) Le nombre 
 	de news envoyées peut être configuré dans le services.conf.

lang/gr.l

@@ -1,6 +1,6 @@
 # Greek language file.
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.
@@ -3415,7 +3415,7 @@ NEWS_HELP_LOGON
 	
 	Edits or displays the list of logon news messages.  When a
 	user connects to the network, these messages will be sent
-	to them.  (However, no more than %s messages will be
+	to them.  (However, no more than %d messages will be
 	sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3429,7 +3429,7 @@ NEWS_HELP_OPER
 	
 	Edits or displays the list of oper news messages.  When a
 	user opers up (with the /OPER command), these messages will
-	be sent to them.  (However, no more than %s messages will
+	be sent to them.  (However, no more than %d messages will
 	be sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.

lang/hun.l

@@ -1,6 +1,6 @@
 # Hungarian (magyar) language file.
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #    
 # Translated by:                                      
@@ -3349,7 +3349,7 @@ NEWS_HELP_LOGON
 	
 	Edits or displays the list of logon news messages.  When a
 	user connects to the network, these messages will be sent
-	to them.  (However, no more than %s messages will be
+	to them.  (However, no more than %d messages will be
 	sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3363,7 +3363,7 @@ NEWS_HELP_OPER
 	
 	Edits or displays the list of oper news messages.  When a
 	user opers up (with the /OPER command), these messages will
-	be sent to them.  (However, no more than %s messages will
+	be sent to them.  (However, no more than %d messages will
 	be sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.

lang/it.l

@@ -1,6 +1,6 @@
 # Italian language file.
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.
@@ -3308,7 +3308,7 @@ NEWS_HELP_LOGON
 	
 	Edits or displays the list of logon news messages.  When a
 	user connects to the network, these messages will be sent
-	to them.  (However, no more than %s messages will be
+	to them.  (However, no more than %d messages will be
 	sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3322,7 +3322,7 @@ NEWS_HELP_OPER
 	
 	Edits or displays the list of oper news messages.  When a
 	user opers up (with the /OPER command), these messages will
-	be sent to them.  (However, no more than %s messages will
+	be sent to them.  (However, no more than %d messages will
 	be sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.

lang/langcomp.c

@@ -1,6 +1,6 @@
 /* Compiler for language definition files.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

lang/langtool.c

@@ -1,6 +1,6 @@
 /* Language stuff generator for win32.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

lang/nl.l

@@ -1,6 +1,6 @@
 # Dutch Language File
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.
@@ -3376,7 +3376,7 @@ NEWS_HELP_LOGON
 	Wijzigt de lijst met login nieuwsberichten of geeft deze weer.
 	Wanneer een gebruiker met het netwerk verbindt, worden deze
 	berichten naar hem/haar verzonden.  (Echter, er zullen nooit
-	meer dan %s berichten worden verstuurd om het flooden van de
+	meer dan %d berichten worden verstuurd om het flooden van de
 	gebruiker te voorkomen. Als er meer nieuwsberichten
 	zijn worden alleen de meest recente vestuurd.)
 	NewsCount kan geconfigureerd worden in services.conf.
@@ -3391,7 +3391,7 @@ NEWS_HELP_OPER
 	Wijzigt de lijst met oper nieuwsberichten of geeft deze weer.
 	Wanneer een gebruiker opert (dmv het /OPER commando), worden
 	deze berichtennaar hem/haar verzonden.  (Echter, er zullen
-	nooit meer dan %s berichten worden verstuurd om het flooden
+	nooit meer dan %d berichten worden verstuurd om het flooden
 	van de gebruiker te voorkomen. Als er meer nieuwsberichten 
 	zijn worden alleen de meest recente vestuurd.)
 	NewsCount kan geconfigureerd worden in services.conf.

lang/pl.l

@@ -14,7 +14,7 @@
 #
 ###########################################################################
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #   
 # Please read COPYING and README for further details.
@@ -845,7 +845,7 @@ NICK_SASET_HIDE_STATUS_OFF
 
 # SASET MSG responses
 NICK_SASET_MSG_SYNTAX
-	SASAET nick MSG {ON | OFF}
+	SASET nick MSG {ON | OFF}
 
 NICK_SASET_MSG_ON
 	Serwisy bêd± teraz wysy³aæ do %s wiadomo¶ci.
@@ -4392,7 +4392,7 @@ NEWS_HELP_LOGON
 	
 	Edytuje lub wy¶wietla listê wiadomo¶ci wysy³anych po
 	przy³±czeniu u¿ytkownika do sieci. Je¶li zdefniowanych
-	wiadomo¶ci jest wiêcej tylko najnowsze %s zostanie
+	wiadomo¶ci jest wiêcej tylko najnowsze %d zostanie
 	wys³anych (aby zapobiec floodowaniu). Warto¶æ NewsCount
 	mo¿e zostaæ zmieniona w pliku konfiguracyjym serwisów.
 	
@@ -4405,7 +4405,7 @@ NEWS_HELP_OPER
 	
 	Edytuje lub wy¶wietla listê wiadomo¶ci wysy³anych po
 	wykonaniu polecenia /OPER. Je¶li zdefiniowanych
-	wiadomo¶ci jest wiêcej tylko najnowsze %s zostanie
+	wiadomo¶ci jest wiêcej tylko najnowsze %d zostanie
 	wys³anych (aby zapobiec floodowaniu). Warto¶æ NewsCount
 	mo¿e zostaæ zmieniona w pliku konfiguracyjym serwisów.
 	
@@ -4800,7 +4800,7 @@ NICK_HELP_SET_HIDE
 	Sk³adnia: SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}
 	
 	To polecenie pozwala na ukrycie czê¶ci informacji, które
-	s± wy¶wietlane przez polecenie INFO serwisu %s.
+	s± wy¶wietlane przez polecenie %S INFO serwisu.
 	Pierwszy argument okre¶la ukrywan± informacjê:
 	EMAIL - adres e-mail, USERMASK - ostatnio u¿ywany host,
 	QUIT - ostatnia wiadomo¶æ po¿egnalna, STATUS - status
@@ -4926,7 +4926,7 @@ NICK_HELP_SASET_HIDE
 	Sk³adnia: SASET nick HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}
 	
 	To polecenie pozwala na ukrycie czê¶ci informacji, które
-	s± wy¶wietlane przez polecenie INFO serwisu %s.
+	s± wy¶wietlane przez polecenie %S INFO serwisu.
 	Pierwszy argument okre¶la ukrywan± informacjê:
 	EMAIL - adres e-mail, USERMASK - ostatnio u¿ywany host,
 	QUIT - ostatnia wiadomo¶æ po¿egnalna, STATUS - status

lang/pt.l

@@ -1,6 +1,6 @@
 # Portuguese language file.
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.
@@ -3325,7 +3325,7 @@ NEWS_HELP_LOGON
 	
 	Edits or displays the list of logon news messages.  When a
 	user connects to the network, these messages will be sent
-	to them.  (However, no more than %s messages will be
+	to them.  (However, no more than %d messages will be
 	sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.
@@ -3339,7 +3339,7 @@ NEWS_HELP_OPER
 	
 	Edits or displays the list of oper news messages.  When a
 	user opers up (with the /OPER command), these messages will
-	be sent to them.  (However, no more than %s messages will
+	be sent to them.  (However, no more than %d messages will
 	be sent in order to avoid flooding the user.  If there are
 	more news messages, only the most recent will be sent.)
 	NewsCount can be configured in services.conf.

lang/ru.l

@@ -1,6 +1,6 @@
 # Russian language file for Anope
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.
@@ -3299,7 +3299,7 @@ NEWS_HELP_LOGON
 	Ïîçâîëÿåò  óïðàâëÿòü ñïèñêîì íîâîñòåé,  êîòîðûå áóäóò àâòîìàòè÷åñêè
 	âûäàâàòüñÿ ïîëüçîâàòåëþ  ñðàçó æå, êàê òîëüêî îí ïîäêëþ÷èòñÿ ê ñåòè.
 	Ñòîèò çàìåòèòü, ÷òî âî èçáåæàíèå  ôëóäà ïîëüçîâàòåëü ïîëó÷èò òîëüêî
-	%s íîâîñòü(è), òàê ÷òî åñëè ó  âàñ â ñïèñêå èõ  áîëüøå - ïîêàçàíû
+	%d íîâîñòü(è), òàê ÷òî åñëè ó  âàñ â ñïèñêå èõ  áîëüøå - ïîêàçàíû
 	áóäóò òîëüêî  ïîñëåäíèå èç íèõ. Çíà÷åíèå  NewsCount,  îòâå÷àþùåå çà
 	îäíîâðåìåííî ïîñûëàåìîå êîë-âî íîâîñòåé, óêàçûâàåòñÿ â services.conf
 	
@@ -3320,7 +3320,7 @@ NEWS_HELP_OPER
 	ïîëüçîâàòåëü ïîëó÷èò ñòàòóñ IRC-îïåðàòîðà (èñïîëüçîâàâ êîìàíäó /OPER),
 	äàííûå ñîîáùåíèÿ áóäóò åìó îòïðàâëåíû àâòîìàòè÷åñêè.
 	Ñòîèò çàìåòèòü, ÷òî âî èçáåæàíèå  ôëóäà ïîëüçîâàòåëü ïîëó÷èò òîëüêî
-	%s íîâîñòü(è), òàê ÷òî åñëè ó  âàñ â ñïèñêå èõ  áîëüøå - ïîêàçàíû
+	%d íîâîñòü(è), òàê ÷òî åñëè ó  âàñ â ñïèñêå èõ  áîëüøå - ïîêàçàíû
 	áóäóò òîëüêî  ïîñëåäíèå èç íèõ. Çíà÷åíèå  NewsCount,  îòâå÷àþùåå çà
 	îäíîâðåìåííî ïîñûëàåìîå êîë-âî íîâîñòåé, óêàçûâàåòñÿ â services.conf
 	

lang/tr.l

@@ -1,6 +1,6 @@
 # Turkish language file.
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.
@@ -3418,7 +3418,7 @@ NEWS_HELP_LOGON
 	
 	Giriþ haberleri ve mesajlarýný düzenlemek icin kullanýlýr. 
 	Kullanýcý sunucuya baðlantýðý anda bu belirtilen mesajlar giris yapan kullanýcýya 
-	iletilir.  (Bununla beraber, %s adetten fazla mesaj kullanýcýya
+	iletilir.  (Bununla beraber, %d adetten fazla mesaj kullanýcýya
 	gonderilmez.  Eðer cok fazla mesaj eklenmiþ bulunuyor ise
 	bunlardan en yenileri kullanýcýya ulaþtýrýlýr.)
 	NewsCount(Giriþ haberleri) Özellikleri services.conf'ta belirtilmiþtir ve bu dosyadan ayarlanabilir.
@@ -3432,7 +3432,7 @@ NEWS_HELP_OPER
 	
 	Giriþ haberleri ve mesajlarýný düzenlemek icin kullanýlýr(Yönetici giriþleri). 
 	Kullanýcý sunucu içerisinde yönetici konumuna gectiði anda bu belirtilen mesajlar giris yapan operatore 
-	iletilir.  (Bununla beraber, %s adetten fazla mesaj yöneticiye
+	iletilir.  (Bununla beraber, %d adetten fazla mesaj yöneticiye
 	gonderilmez.  Eðer cok fazla mesaj eklenmiþ bulunuyor ise
 	bunlardan en yenileri kullanýcýya ulaþtýrýlýr.)
 	NewsCount(Giriþ haberleri) Özellikleri services.conf'ta belirtilmiþtir ve bu dosyadan ayarlanabilir.

src/actions.c

@@ -1,6 +1,6 @@
 /* Various routines to perform simple actions.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

src/base64.c

@@ -1,6 +1,6 @@
 /* base64 routines.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -295,7 +295,7 @@ char *encode_ip(unsigned char *ip)
     } else {
         s_ip = str_signed(ip);
         ia.s_addr = inet_addr(s_ip);
-        cp = (unsigned char *) ia.s_addr;
+        cp = (unsigned char *) &ia.s_addr;
         b64_encode((char *) &cp, sizeof(struct in_addr), buf, 25);
     }
     return buf;
@@ -305,14 +305,14 @@ int decode_ip(char *buf)
 {
     int len = strlen(buf);
     char targ[25];
-    struct in_addr ia;
+    struct in_addr *ia;
 
     b64_decode(buf, targ, 25);
-    ia = *(struct in_addr *) targ;
+    ia = (struct in_addr *) targ;
     if (len == 24) {            /* IPv6 */
         return 0;
     } else if (len == 8)        /* IPv4 */
-        return ia.s_addr;
+        return ia->s_addr;
     else                        /* Error?? */
         return 0;
 }

src/bin/anoperc.in

@@ -2,7 +2,7 @@
 #
 # Configuration script for Services
 #
-# (C) 2003-2011 Anope Team
+# (C) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.

src/botserv.c

@@ -1,6 +1,6 @@
 /* BotServ functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

src/channels.c

@@ -1,6 +1,6 @@
 /* Channel-handling routines.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -199,6 +199,8 @@ void chan_set_modes(const char *source, Channel * chan, int ac, char **av,
         /* Set the resulting mode buffer */
         anope_cmd_mode(whosends(chan->ci), chan->name, merge_args(ac, av));
 
+        chan_set_modes(whosends(chan->ci), chan, ac, av, check);
+
         return;
     }
 
@@ -1741,6 +1743,7 @@ void chan_delete(Channel * c)
         while (c->bans->entries) {
             entry_delete(c->bans, c->bans->entries);
         }
+        free(c->bans);
     }
 
     if (ircd->except) {
@@ -1748,6 +1751,7 @@ void chan_delete(Channel * c)
             while (c->excepts->entries) {
                 entry_delete(c->excepts, c->excepts->entries);
             }
+            free(c->excepts);
         }
     }
 
@@ -1756,6 +1760,7 @@ void chan_delete(Channel * c)
             while (c->invites->entries) {
                 entry_delete(c->invites, c->invites->entries);
             }
+            free(c->invites);
         }
     }
 
@@ -1784,6 +1789,10 @@ void del_ban(Channel * chan, char *mask)
 
     if (ban) {
         entry_delete(chan->bans, ban);
+        if (chan->bans->count == 0) {
+            free(chan->bans);
+            chan->bans = NULL;
+        }
 
         if (debug)
             alog("debug: Deleted ban %s from channel %s", mask,
@@ -1808,6 +1817,10 @@ void del_exception(Channel * chan, char *mask)
 
     if (exception) {
         entry_delete(chan->excepts, exception);
+        if (chan->excepts->count == 0) {
+            free(chan->excepts);
+            chan->excepts = NULL;
+        }
 
         if (debug)
             alog("debug: Deleted except %s to channel %s", mask,
@@ -1830,6 +1843,10 @@ void del_invite(Channel * chan, char *mask)
 
     if (invite) {
         entry_delete(chan->invites, invite);
+        if(chan->invites->count == 0) {
+            free(chan->invites);
+            chan->invites = NULL;
+        }
 
         if (debug)
             alog("debug: Deleted invite %s to channel %s", mask,

src/chanserv.c

@@ -1,6 +1,6 @@
 /* ChanServ functions.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -276,7 +276,7 @@ void listchans(int count_only, const char *chan)
             }
             if (ci->flags & CI_SUSPENDED) {
                 printf
-                    ("This nickname is currently suspended by %s, reason: %s\n",
+                    ("This channel is currently suspended by %s, reason: %s\n",
                      ci->forbidby,
                      (ci->forbidreason ? ci->forbidreason : "No reason"));
             }

src/commands.c

@@ -1,6 +1,6 @@
 /* Routines for looking up commands in a *Serv command list.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

src/compat.c

@@ -1,6 +1,6 @@
 /* Compatibility routines.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

src/config.c

@@ -1,6 +1,6 @@
 /* Configuration file handling.
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -220,7 +220,7 @@ char *GlobalOnCycleMessage;
 char *GlobalOnCycleUP;
 char *ServicesRoot;
 char **ServicesRoots;
-int RootNumber;
+int RootNumber = 0;
 int SuperAdmin;
 int LogBot;
 int LogMaxUsers;
@@ -272,8 +272,8 @@ int OSOpersOnly;
 char *Modules;
 char *ModulesDelayed;
 char **ModulesAutoload;
-int ModulesNumber;
-int ModulesDelayedNumber;
+int ModulesNumber = 0;
+int ModulesDelayedNumber = 0;
 char **ModulesDelayedAutoload;
 
 /**
@@ -281,31 +281,31 @@ char **ModulesDelayedAutoload;
  **/
 char *HostCoreModules;
 char **HostServCoreModules;
-int HostServCoreNumber;
+int HostServCoreNumber = 0;
 
 char *MemoCoreModules;
 char **MemoServCoreModules;
-int MemoServCoreNumber;
+int MemoServCoreNumber = 0;
 
 char *HelpCoreModules;
 char **HelpServCoreModules;
-int HelpServCoreNumber;
+int HelpServCoreNumber = 0;
 
 char *BotCoreModules;
 char **BotServCoreModules;
-int BotServCoreNumber;
+int BotServCoreNumber = 0;
 
 char *OperCoreModules;
 char **OperServCoreModules;
-int OperServCoreNumber;
+int OperServCoreNumber = 0;
 
 char *NickCoreModules;
 char **NickServCoreModules;
-int NickServCoreNumber;
+int NickServCoreNumber = 0;
 
 char *ChanCoreModules;
 char **ChanServCoreModules;
-int ChanServCoreNumber;
+int ChanServCoreNumber = 0;
 
 
 char *MysqlHost;
@@ -346,7 +346,7 @@ int UnRestrictSAdmin;
 
 char *UlineServers;
 char **Ulines;
-int NumUlines;
+int NumUlines = 0;
 
 int UseTS6;
 
@@ -708,10 +708,16 @@ int parse_directive(Directive * d, char *dir, int ac, char *av[MAXPARAMS],
         /* Should we remove PARAM_DEPRECATED because it's
          * useless right now? -GD */
         if (d->params[i].type == PARAM_DEPRECATED) {
-            void (*func) (void);
+            union func_union
+            {
+                void *ptr;
+                void (*func)(void);
+            } u;
+
             error(linenum, "Deprecated directive `%s' used", d->name);
-            func = (void (*)(void)) (d->params[i].ptr);
-            func();             /* For clarity */
+
+            u.ptr = d->params[i].ptr;
+            u.func();
             continue;
         }
         if (optind >= ac) {
@@ -723,7 +729,7 @@ int parse_directive(Directive * d, char *dir, int ac, char *av[MAXPARAMS],
         }
         switch (d->params[i].type) {
         case PARAM_INT:
-            val = strtol(av[optind++], &s, 0);
+            val = strtol(av[optind++], &s, 10);
             if (*s) {
                 error(linenum,
                       "%s: Expected an integer for parameter %d",
@@ -734,7 +740,7 @@ int parse_directive(Directive * d, char *dir, int ac, char *av[MAXPARAMS],
             *(int *) d->params[i].ptr = val;
             break;
         case PARAM_POSINT:
-            val = strtol(av[optind++], &s, 0);
+            val = strtol(av[optind++], &s, 10);
             if (*s || val <= 0) {
                 error(linenum,
                       "%s: Expected a positive integer for parameter %d",
@@ -751,7 +757,7 @@ int parse_directive(Directive * d, char *dir, int ac, char *av[MAXPARAMS],
             *(int *) d->params[i].ptr = val;
             break;
         case PARAM_PORT:
-            val = strtol(av[optind++], &s, 0);
+            val = strtol(av[optind++], &s, 10);
             if (*s) {
                 error(linenum,
                       "%s: Expected a port number for parameter %d",
@@ -768,8 +774,11 @@ int parse_directive(Directive * d, char *dir, int ac, char *av[MAXPARAMS],
             *(int *) d->params[i].ptr = val;
             break;
         case PARAM_STRING:
-/*	      if (reload && *(char **)d->params[i].ptr)
-	      	free(*(char **)d->params[i].ptr); */
+            /*
+	     * Anope_Free(*(char **)d->params[i].ptr);
+	     * Historically dumb modules pass uninitialized values here so
+	     * we can't free this
+	     */
             *(char **) d->params[i].ptr = sstrdup(av[optind++]);
             if (!d->params[i].ptr) {
                 error(linenum, "%s: Out of memory", d->name);
@@ -1241,7 +1250,8 @@ int read_config(int reload)
     /* Services Root building */
 
     if (ServicesRoot && !reload) {      /* Check to prevent segmentation fault if it's missing */
-        RootNumber = 0;
+        while( RootNumber )
+            free(ServicesRoots[--RootNumber]);
 
         s = strtok(ServicesRoot, " ");
         do {
@@ -1262,7 +1272,8 @@ int read_config(int reload)
     /* Ulines */
 
     if (UlineServers) {
-        NumUlines = 0;
+        while( NumUlines )
+            free(Ulines[--NumUlines]);
 
         s = strtok(UlineServers, " ");
         do {
@@ -1275,30 +1286,56 @@ int read_config(int reload)
     }
 
     /* Host Setters building... :P */
+    while( HostNumber )
+        free(HostSetters[--HostNumber]);
+    Anope_Free(HostSetters);
     HostSetters = buildStringList(HostSetter, &HostNumber);
 
     /* Modules Autoload building... :P */
+    while( ModulesNumber )
+        free(ModulesAutoload[--ModulesNumber]);
+    Anope_Free(ModulesAutoload);
     ModulesAutoload = buildStringList(Modules, &ModulesNumber);
-    ModulesDelayedAutoload =
-        buildStringList(ModulesDelayed, &ModulesDelayedNumber);
-    HostServCoreModules =
-        buildStringList(HostCoreModules, &HostServCoreNumber);
-    MemoServCoreModules =
-        buildStringList(MemoCoreModules, &MemoServCoreNumber);
-    HelpServCoreModules =
-        buildStringList(HelpCoreModules, &HelpServCoreNumber);
 
-    BotServCoreModules =
-        buildStringList(BotCoreModules, &BotServCoreNumber);
+    while( ModulesDelayedNumber )
+        free(ModulesDelayedAutoload[--ModulesDelayedNumber]);
+    Anope_Free(ModulesDelayedAutoload);
+    ModulesDelayedAutoload = buildStringList(ModulesDelayed, &ModulesDelayedNumber);
 
-    OperServCoreModules =
-        buildStringList(OperCoreModules, &OperServCoreNumber);
+    while( HostServCoreNumber )
+        free(HostServCoreModules[--HostServCoreNumber]);
+    Anope_Free(HostServCoreModules);
+    HostServCoreModules = buildStringList(HostCoreModules, &HostServCoreNumber);
 
-    ChanServCoreModules =
-        buildStringList(ChanCoreModules, &ChanServCoreNumber);
+    while( MemoServCoreNumber )
+        free(MemoServCoreModules[--MemoServCoreNumber]);
+    Anope_Free(MemoServCoreModules);
+    MemoServCoreModules = buildStringList(MemoCoreModules, &MemoServCoreNumber);
 
-    NickServCoreModules =
-        buildStringList(NickCoreModules, &NickServCoreNumber);
+    while( HelpServCoreNumber )
+        free(HelpServCoreModules[--HelpServCoreNumber]);
+    Anope_Free(HelpServCoreModules);
+    HelpServCoreModules = buildStringList(HelpCoreModules, &HelpServCoreNumber);
+
+    while( BotServCoreNumber )
+        free(BotServCoreModules[--BotServCoreNumber]);
+    Anope_Free(BotServCoreModules);
+    BotServCoreModules = buildStringList(BotCoreModules, &BotServCoreNumber);
+
+    while( OperServCoreNumber )
+        free(OperServCoreModules[--OperServCoreNumber]);
+    Anope_Free(OperServCoreModules);
+    OperServCoreModules = buildStringList(OperCoreModules, &OperServCoreNumber);
+
+    while( ChanServCoreNumber )
+        free(ChanServCoreModules[--ChanServCoreNumber]);
+    Anope_Free(ChanServCoreModules);
+    ChanServCoreModules = buildStringList(ChanCoreModules, &ChanServCoreNumber);
+
+    while( NickServCoreNumber )
+        free(NickServCoreModules[--NickServCoreNumber]);
+    Anope_Free(NickServCoreModules);
+    NickServCoreModules = buildStringList(NickCoreModules, &NickServCoreNumber);
 
 
     if (LimitSessions) {
@@ -1407,6 +1444,7 @@ int read_config(int reload)
         CHECK(UseMail);
         CHECK(NSForceEmail);
     } else {
+        Anope_Free(PreNickDBName);
         PreNickDBName = NULL;
         NSRExpire = 0;
     }

src/core/Makefile.win32

@@ -3,7 +3,7 @@ include ../../Makefile.inc.win32
 SRCS=bs_act.c bs_assign.c bs_badwords.c bs_bot.c bs_botlist.c bs_fantasy.c bs_fantasy_kick.c bs_fantasy_kickban.c bs_fantasy_owner.c bs_fantasy_seen.c bs_help.c bs_info.c bs_kick.c bs_say.c bs_set.c bs_unassign.c cs_access.c cs_akick.c cs_ban.c cs_clear.c cs_drop.c cs_forbid.c cs_getkey.c cs_getpass.c cs_help.c cs_identify.c cs_info.c cs_invite.c cs_kick.c cs_list.c cs_logout.c cs_modes.c cs_register.c cs_sendpass.c cs_set.c cs_status.c cs_suspend.c cs_topic.c cs_xop.c enc_none.c enc_md5.c enc_old.c enc_sha1.c he_help.c hs_del.c hs_delall.c hs_group.c hs_help.c hs_list.c hs_off.c hs_on.c hs_set.c hs_setall.c ms_cancel.c ms_check.c ms_del.c ms_help.c ms_info.c ms_list.c ms_read.c ms_rsend.c ms_send.c ms_sendall.c ms_set.c ms_staff.c ns_access.c ns_alist.c ns_drop.c ns_forbid.c ns_getemail.c ns_getpass.c ns_ghost.c ns_group.c ns_help.c ns_identify.c ns_info.c ns_list.c ns_logout.c ns_recover.c ns_register.c ns_release.c ns_sendpass.c ns_set.c ns_saset.c ns_status.c ns_suspend.c ns_update.c os_admin.c os_akill.c os_chankill.c os_chanlist.c os_clearmodes.c os_defcon.c os_global.c os_help.c os_ignore.c os_jupe.c os_kick.c os_logonnews.c os_mode.c os_modinfo.c os_modlist.c os_modload.c os_modunload.c os_noop.c os_oline.c os_oper.c os_opernews.c os_quit.c os_randomnews.c os_raw.c os_reload.c os_restart.c os_session.c os_set.c os_sgline.c os_shutdown.c os_sqline.c os_staff.c os_stats.c os_svsnick.c os_szline.c os_umode.c os_update.c os_userlist.c
 OBJECTS= $(SRCS:.c=.dll)
 CFLAGS=/LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../include"
-LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /export:AnopeFini /VERSION:$(VERSION)
+LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /export:AnopeFini /VERSION:1.8
 
 all: $(OBJECTS)
 

src/core/bs_act.c

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_act(User * u);
-void myBotServHelp(User * u);
+static int do_act(User * u);
+static void myBotServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -50,7 +50,7 @@ void AnopeFini(void)
  * Add the help response to Anopes /bs help output.
  * @param u The user who is requesting help
  **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
     notice_lang(s_BotServ, u, BOT_HELP_CMD_ACT);
 }
@@ -60,7 +60,7 @@ void myBotServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_act(User * u)
+static int do_act(User * u)
 {
     ChannelInfo *ci;
 

src/core/bs_assign.c

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_assign(User * u);
-void myBotServHelp(User * u);
+static int do_assign(User * u);
+static void myBotServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -52,7 +52,7 @@ void AnopeFini(void)
  * Add the help response to Anopes /bs help output.
  * @param u The user who is requesting help
  **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
     notice_lang(s_BotServ, u, BOT_HELP_CMD_ASSIGN);
 }
@@ -62,7 +62,7 @@ void myBotServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_assign(User * u)
+static int do_assign(User * u)
 {
     char *chan = strtok(NULL, " ");
     char *nick = strtok(NULL, " ");

src/core/bs_badwords.c

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,11 +14,11 @@
 
 #include "module.h"
 
-int do_badwords(User * u);
-void myBotServHelp(User * u);
-int badwords_del_callback(User * u, int num, va_list args);
-int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header);
-int badwords_list_callback(User * u, int num, va_list args);
+static int do_badwords(User * u);
+static void myBotServHelp(User * u);
+static int badwords_del_callback(User * u, int num, va_list args);
+static int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header);
+static int badwords_list_callback(User * u, int num, va_list args);
 
 /**
  * Create the command, and tell anope about it.
@@ -57,7 +57,7 @@ void AnopeFini(void)
  * Add the help response to Anopes /bs help output.
  * @param u The user who is requesting help
  **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
     notice_lang(s_BotServ, u, BOT_HELP_CMD_BADWORDS);
 }
@@ -67,7 +67,7 @@ void myBotServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_badwords(User * u)
+static int do_badwords(User * u)
 {
     char *chan = strtok(NULL, " ");
     char *cmd = strtok(NULL, " ");
@@ -283,7 +283,7 @@ int do_badwords(User * u)
     return MOD_CONT;
 }
 
-int badwords_del_callback(User * u, int num, va_list args)
+static int badwords_del_callback(User * u, int num, va_list args)
 {
     BadWord *bw;
     ChannelInfo *ci = va_arg(args, ChannelInfo *);
@@ -303,7 +303,7 @@ int badwords_del_callback(User * u, int num, va_list args)
     return 1;
 }
 
-int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header)
+static int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header)
 {
     BadWord *bw = &ci->badwords[index];
 
@@ -325,7 +325,7 @@ int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header)
     return 1;
 }
 
-int badwords_list_callback(User * u, int num, va_list args)
+static int badwords_list_callback(User * u, int num, va_list args)
 {
     ChannelInfo *ci = va_arg(args, ChannelInfo *);
     int *sent_header = va_arg(args, int *);

src/core/bs_bot.c

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,10 +14,10 @@
 
 #include "module.h"
 
-int do_bot(User * u);
-int delbot(BotInfo * bi);
-void myBotServHelp(User * u);
-void change_bot_nick(BotInfo * bi, char *newnick);
+static int do_bot(User * u);
+static int delbot(BotInfo * bi);
+static void myBotServHelp(User * u);
+static void change_bot_nick(BotInfo * bi, char *newnick);
 
 /**
  * Create the command, and tell anope about it.
@@ -56,7 +56,7 @@ void AnopeFini(void)
  * Add the help response to Anopes /bs help output.
  * @param u The user who is requesting help
  **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
     if (is_services_admin(u)) {
         notice_lang(s_BotServ, u, BOT_HELP_CMD_BOT);
@@ -68,7 +68,7 @@ void myBotServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_bot(User * u)
+static int do_bot(User * u)
 {
     BotInfo *bi;
     char *cmd = strtok(NULL, " ");
@@ -349,7 +349,7 @@ int do_bot(User * u)
     return MOD_CONT;
 }
 
-int delbot(BotInfo * bi)
+static int delbot(BotInfo * bi)
 {
     cs_remove_bot(bi);
 
@@ -372,7 +372,7 @@ int delbot(BotInfo * bi)
     return 1;
 }
 
-void change_bot_nick(BotInfo * bi, char *newnick)
+static void change_bot_nick(BotInfo * bi, char *newnick)
 {
     if (bi->next)
         bi->next->prev = bi->prev;

src/core/bs_botlist.c

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_botlist(User * u);
-void myBotServHelp(User * u);
+static int do_botlist(User * u);
+static void myBotServHelp(User * u);
 
 /**
  * Create the botlist command, and tell anope about it.
@@ -53,7 +53,7 @@ void AnopeFini(void)
  * Add the help response to Anopes /bs help output.
  * @param u The user who is requesting help
  **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
     notice_lang(s_BotServ, u, BOT_HELP_CMD_BOTLIST);
 }
@@ -63,7 +63,7 @@ void myBotServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_botlist(User * u)
+static int do_botlist(User * u)
 {
     int i, count = 0;
     BotInfo *bi;

src/core/bs_fantasy.c

@@ -1,6 +1,6 @@
 /* BotServ core fantasy functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,7 +14,7 @@
 
 #include "module.h"
 
-int do_fantasy(int argc, char **argv);
+static int do_fantasy(int argc, char **argv);
 
 /**
  * Create the hook, and tell anope about it.
@@ -49,7 +49,7 @@ void AnopeFini(void)
  * @param argv Argument list
  * @return MOD_CONT or MOD_STOP
  **/
-int do_fantasy(int argc, char **argv)
+static int do_fantasy(int argc, char **argv)
 {
     User *u;
     ChannelInfo *ci;

src/core/bs_fantasy_kick.c

@@ -1,6 +1,6 @@
 /* BotServ core fantasy functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,7 +14,7 @@
 
 #include "module.h"
 
-int do_fantasy(int argc, char **argv);
+static int do_fantasy(int argc, char **argv);
 
 /**
  * Create the hook, and tell anope about it.
@@ -51,7 +51,7 @@ void AnopeFini(void)
  * @param argv Argument list
  * @return MOD_CONT or MOD_STOP
  **/
-int do_fantasy(int argc, char **argv)
+static int do_fantasy(int argc, char **argv)
 {
     User *u, *u2;
     ChannelInfo *ci;

src/core/bs_fantasy_kickban.c

@@ -1,6 +1,6 @@
 /* BotServ core fantasy functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,7 +14,7 @@
 
 #include "module.h"
 
-int do_fantasy(int argc, char **argv);
+static int do_fantasy(int argc, char **argv);
 
 /**
  * Create the hook, and tell anope about it.
@@ -51,7 +51,7 @@ void AnopeFini(void)
  * @param argv Argument list
  * @return MOD_CONT or MOD_STOP
  **/
-int do_fantasy(int argc, char **argv)
+static int do_fantasy(int argc, char **argv)
 {
     User *u, *u2;
     ChannelInfo *ci;

src/core/bs_fantasy_owner.c

@@ -1,6 +1,6 @@
 /* BotServ core fantasy functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,7 +14,7 @@
 
 #include "module.h"
 
-int do_fantasy(int argc, char **argv);
+static int do_fantasy(int argc, char **argv);
 
 /**
  * Create the hook, and tell anope about it.
@@ -51,7 +51,7 @@ void AnopeFini(void)
  * @param argv Argument list
  * @return MOD_CONT or MOD_STOP
  **/
-int do_fantasy(int argc, char **argv)
+static int do_fantasy(int argc, char **argv)
 {
     User *u;
     ChannelInfo *ci;

src/core/bs_fantasy_seen.c

@@ -1,6 +1,6 @@
 /* BotServ core fantasy functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,7 +14,7 @@
 
 #include "module.h"
 
-int do_fantasy(int argc, char **argv);
+static int do_fantasy(int argc, char **argv);
 
 /**
  * Create the hook, and tell anope about it.
@@ -51,7 +51,7 @@ void AnopeFini(void)
  * @param argv Argument list
  * @return MOD_CONT or MOD_STOP
  **/
-int do_fantasy(int argc, char **argv)
+static int do_fantasy(int argc, char **argv)
 {
     User *u;
     ChannelInfo *ci;

src/core/bs_help.c

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,7 +14,7 @@
 
 #include "module.h"
 
-int do_help(User * u);
+static int do_help(User * u);
 
 /**
  * Create the help command, and tell anope about it.
@@ -51,7 +51,7 @@ void AnopeFini(void)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_help(User * u)
+static int do_help(User * u)
 {
     char *cmd = strtok(NULL, "");
 

src/core/bs_info.c

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,9 +14,9 @@
 
 #include "module.h"
 
-int do_info(User * u);
-void send_bot_channels(User * u, BotInfo * bi);
-void myBotServHelp(User * u);
+static int do_info(User * u);
+static void send_bot_channels(User * u, BotInfo * bi);
+static void myBotServHelp(User * u);
 
 /**
  * Create the info command, and tell anope about it.
@@ -54,7 +54,7 @@ void AnopeFini(void)
  * Add the help response to Anopes /bs help output.
  * @param u The user who is requesting help
  **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
     notice_lang(s_BotServ, u, BOT_HELP_CMD_INFO);
 }
@@ -64,7 +64,7 @@ void myBotServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_info(User * u)
+static int do_info(User * u)
 {
     BotInfo *bi;
     ChannelInfo *ci;
@@ -251,7 +251,7 @@ int do_info(User * u)
     return MOD_CONT;
 }
 
-void send_bot_channels(User * u, BotInfo * bi)
+static void send_bot_channels(User * u, BotInfo * bi)
 {
     int i;
     ChannelInfo *ci;

src/core/bs_kick.c

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,9 +14,9 @@
 
 #include "module.h"
 
-int do_kickcmd(User * u);
+static int do_kickcmd(User * u);
 
-void myBotServHelp(User * u);
+static void myBotServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -79,7 +79,7 @@ void AnopeFini(void)
  * Add the help response to Anopes /bs help output.
  * @param u The user who is requesting help
  **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
     notice_lang(s_BotServ, u, BOT_HELP_CMD_KICK);
 }
@@ -89,7 +89,7 @@ void myBotServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_kickcmd(User * u)
+static int do_kickcmd(User * u)
 {
     char *chan = strtok(NULL, " ");
     char *option = strtok(NULL, " ");

src/core/bs_say.c

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_say(User * u);
-void myBotServHelp(User * u);
+static int do_say(User * u);
+static void myBotServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -52,7 +52,7 @@ void AnopeFini(void)
  * Add the help response to Anopes /bs help output.
  * @param u The user who is requesting help
  **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
     notice_lang(s_BotServ, u, BOT_HELP_CMD_SAY);
 }
@@ -62,7 +62,7 @@ void myBotServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_say(User * u)
+static int do_say(User * u)
 {
     ChannelInfo *ci;
 

src/core/bs_set.c

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_set(User * u);
-void myBotServHelp(User * u);
+static int do_set(User * u);
+static void myBotServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -79,7 +79,7 @@ void AnopeFini(void)
  * Add the help response to Anopes /bs help output.
  * @param u The user who is requesting help
  **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
     notice_lang(s_BotServ, u, BOT_HELP_CMD_SET);
 }
@@ -89,7 +89,7 @@ void myBotServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_set(User * u)
+static int do_set(User * u)
 {
     char *chan = strtok(NULL, " ");
     char *option = strtok(NULL, " ");

src/core/bs_unassign.c

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_unassign(User * u);
-void myBotServHelp(User * u);
+static int do_unassign(User * u);
+static void myBotServHelp(User * u);
 
 /**
  * Create the unassign command, and tell anope about it.
@@ -53,7 +53,7 @@ void AnopeFini(void)
  * Add the help response to Anopes /bs help output.
  * @param u The user who is requesting help
  **/
-void myBotServHelp(User * u)
+static void myBotServHelp(User * u)
 {
     notice_lang(s_BotServ, u, BOT_HELP_CMD_UNASSIGN);
 }
@@ -63,7 +63,7 @@ void myBotServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_unassign(User * u)
+static int do_unassign(User * u)
 {
     char *chan = strtok(NULL, " ");
     ChannelInfo *ci;

src/core/cs_access.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -15,10 +15,10 @@
 #include "module.h"
 
 
-int do_access(User * u);
-int do_levels(User * u);
+static int do_access(User * u);
+static int do_levels(User * u);
 
-void myChanServHelp(User * u);
+static void myChanServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -63,7 +63,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     notice_lang(s_ChanServ, u, CHAN_HELP_CMD_ACCESS);
     notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LEVELS);
@@ -139,7 +139,7 @@ static int access_list_callback(User * u, int num, va_list args)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_access(User * u)
+static int do_access(User * u)
 {
     char *chan = strtok(NULL, " ");
     char *cmd = strtok(NULL, " ");
@@ -395,7 +395,7 @@ int do_access(User * u)
 }
 
 
-int do_levels(User * u)
+static int do_levels(User * u)
 {
     char *chan = strtok(NULL, " ");
     char *cmd = strtok(NULL, " ");

src/core/cs_akick.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -15,9 +15,9 @@
 #include "module.h"
 
 
-int do_akick(User * u);
-void myChanServHelp(User * u);
-int get_access_nc(NickCore *nc, ChannelInfo *ci);
+static int do_akick(User * u);
+static void myChanServHelp(User * u);
+static int get_access_nc(NickCore *nc, ChannelInfo *ci);
 
 /**
  * Create the command, and tell anope about it.
@@ -56,7 +56,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     notice_lang(s_ChanServ, u, CHAN_HELP_CMD_AKICK);
 }
@@ -67,7 +67,7 @@ void myChanServHelp(User * u)
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
  /* `last' is set to the last index this routine was called with */
-int akick_del(User * u, AutoKick * akick)
+static int akick_del(User * u, AutoKick * akick)
 {
     if (!(akick->flags & AK_USED))
         return 0;
@@ -90,7 +90,7 @@ int akick_del(User * u, AutoKick * akick)
     return 1;
 }
 
-int akick_del_callback(User * u, int num, va_list args)
+static int akick_del_callback(User * u, int num, va_list args)
 {
     ChannelInfo *ci = va_arg(args, ChannelInfo *);
     int *last = va_arg(args, int *);
@@ -104,7 +104,7 @@ int akick_del_callback(User * u, int num, va_list args)
 }
 
 
-int akick_list(User * u, int index, ChannelInfo * ci, int *sent_header)
+static int akick_list(User * u, int index, ChannelInfo * ci, int *sent_header)
 {
     AutoKick *akick = &ci->akick[index];
 
@@ -123,7 +123,7 @@ int akick_list(User * u, int index, ChannelInfo * ci, int *sent_header)
     return 1;
 }
 
-int akick_list_callback(User * u, int num, va_list args)
+static int akick_list_callback(User * u, int num, va_list args)
 {
     ChannelInfo *ci = va_arg(args, ChannelInfo *);
     int *sent_header = va_arg(args, int *);
@@ -132,7 +132,7 @@ int akick_list_callback(User * u, int num, va_list args)
     return akick_list(u, num - 1, ci, sent_header);
 }
 
-int akick_view(User * u, int index, ChannelInfo * ci, int *sent_header)
+static int akick_view(User * u, int index, ChannelInfo * ci, int *sent_header)
 {
     AutoKick *akick = &ci->akick[index];
     char timebuf[64];
@@ -167,7 +167,7 @@ int akick_view(User * u, int index, ChannelInfo * ci, int *sent_header)
     return 1;
 }
 
-int akick_view_callback(User * u, int num, va_list args)
+static int akick_view_callback(User * u, int num, va_list args)
 {
     ChannelInfo *ci = va_arg(args, ChannelInfo *);
     int *sent_header = va_arg(args, int *);
@@ -178,7 +178,7 @@ int akick_view_callback(User * u, int num, va_list args)
 
 
 
-int do_akick(User * u)
+static int do_akick(User * u)
 {
     char *chan = strtok(NULL, " ");
     char *cmd = strtok(NULL, " ");
@@ -368,8 +368,6 @@ int do_akick(User * u)
             free(mask);
 
     } else if (stricmp(cmd, "STICK") == 0) {
-        NickAlias *na;
-        NickCore *nc;
 
         if (readonly) {
             notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED);
@@ -381,9 +379,6 @@ int do_akick(User * u)
             return MOD_CONT;
         }
 
-        na = findnick(mask);
-        nc = (na ? na->nc : NULL);
-
         for (akick = ci->akick, i = 0; i < ci->akickcount; akick++, i++) {
             if (!(akick->flags & AK_USED) || (akick->flags & AK_ISNICK))
                 continue;
@@ -406,9 +401,6 @@ int do_akick(User * u)
         if (ci->c)
             stick_mask(ci, akick);
     } else if (stricmp(cmd, "UNSTICK") == 0) {
-        NickAlias *na;
-        NickCore *nc;
-
         if (readonly) {
             notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED);
             return MOD_CONT;
@@ -419,9 +411,6 @@ int do_akick(User * u)
             return MOD_CONT;
         }
 
-        na = findnick(mask);
-        nc = (na ? na->nc : NULL);
-
         for (akick = ci->akick, i = 0; i < ci->akickcount; akick++, i++) {
             if (!(akick->flags & AK_USED) || (akick->flags & AK_ISNICK))
                 continue;
@@ -668,7 +657,7 @@ int do_akick(User * u)
 }
 
 
-int get_access_nc(NickCore *nc, ChannelInfo *ci)
+static int get_access_nc(NickCore *nc, ChannelInfo *ci)
 {
     ChanAccess *access;
     if (!ci || !nc)

src/core/cs_ban.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,9 +14,9 @@
 
 #include "module.h"
 
-int do_unban(User * u);
-int do_ban(User * u);
-void myChanServHelp(User * u);
+static int do_unban(User * u);
+static int do_ban(User * u);
+static void myChanServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -57,7 +57,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     notice_lang(s_ChanServ, u, CHAN_HELP_CMD_BAN);
     notice_lang(s_ChanServ, u, CHAN_HELP_CMD_UNBAN);
@@ -68,7 +68,7 @@ void myChanServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_ban(User * u)
+static int do_ban(User * u)
 {
     char *chan = strtok(NULL, " ");
     char *params = strtok(NULL, " ");
@@ -202,7 +202,7 @@ int do_ban(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_unban(User * u)
+static int do_unban(User * u)
 {
     char *chan = strtok(NULL, " ");
     Channel *c;

src/core/cs_clear.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_clear(User * u);
-void myChanServHelp(User * u);
+static int do_clear(User * u);
+static void myChanServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -54,7 +54,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     notice_lang(s_ChanServ, u, CHAN_HELP_CMD_CLEAR);
 }
@@ -64,7 +64,7 @@ void myChanServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_clear(User * u)
+static int do_clear(User * u)
 {
     char *chan = strtok(NULL, " ");
     char *what = strtok(NULL, " ");

src/core/cs_drop.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_drop(User * u);
-void myChanServHelp(User * u);
+static int do_drop(User * u);
+static void myChanServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -54,7 +54,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DROP);
 }
@@ -64,7 +64,7 @@ void myChanServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_drop(User * u)
+static int do_drop(User * u)
 {
     char *chan = strtok(NULL, " ");
     ChannelInfo *ci;

src/core/cs_forbid.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_forbid(User * u);
-void myChanServHelp(User * u);
+static int do_forbid(User * u);
+static void myChanServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -53,7 +53,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     if (is_services_admin(u)) {
         notice_lang(s_ChanServ, u, CHAN_HELP_CMD_FORBID);
@@ -65,7 +65,7 @@ void myChanServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_forbid(User * u)
+static int do_forbid(User * u)
 {
     Channel *c;
     ChannelInfo *ci;
@@ -137,7 +137,7 @@ int do_forbid(User * u)
 
                 av[0] = c->name;
                 av[1] = cu->user->nick;
-                av[2] = reason ? reason : "CHAN_FORBID_REASON";
+                av[2] = reason ? reason : getstring(cu->user->na, CHAN_FORBID_REASON);
                 anope_cmd_kick(s_ChanServ, av[0], av[1], av[2]);
                 do_kick(s_ChanServ, 3, av);
             }

src/core/cs_getkey.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_getkey(User * u);
-void myChanServHelp(User * u);
+static int do_getkey(User * u);
+static void myChanServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -54,7 +54,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETKEY);
 }
@@ -64,7 +64,7 @@ void myChanServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_getkey(User * u)
+static int do_getkey(User * u)
 {
     char *chan = strtok(NULL, " ");
     ChannelInfo *ci;

src/core/cs_getpass.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_getpass(User * u);
-void myChanServHelp(User * u);
+static int do_getpass(User * u);
+static void myChanServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -55,7 +55,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     if (is_services_admin(u)) {
         notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETPASS);
@@ -68,7 +68,7 @@ void myChanServHelp(User * u)
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
 
-int do_getpass(User * u)
+static int do_getpass(User * u)
 {
     char *chan = strtok(NULL, " ");
     char tmp_pass[PASSMAX];

src/core/cs_help.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,7 +14,7 @@
 
 #include "module.h"
 
-int do_help(User * u);
+static int do_help(User * u);
 
 /**
  * Create the off command, and tell anope about it.
@@ -49,7 +49,7 @@ void AnopeFini(void)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_help(User * u)
+static int do_help(User * u)
 {
     char *cmd = strtok(NULL, "");
 

src/core/cs_identify.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_identify(User * u);
-void myChanServHelp(User * u);
+static int do_identify(User * u);
+static void myChanServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -58,7 +58,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     notice_lang(s_ChanServ, u, CHAN_HELP_CMD_IDENTIFY);
 }
@@ -68,7 +68,7 @@ void myChanServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_identify(User * u)
+static int do_identify(User * u)
 {
     char *chan = strtok(NULL, " ");
     char *pass = strtok(NULL, " ");

src/core/cs_info.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_info(User * u);
-void myChanServHelp(User * u);
+static int do_info(User * u);
+static void myChanServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -55,7 +55,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     notice_lang(s_ChanServ, u, CHAN_HELP_CMD_INFO);
 }
@@ -65,7 +65,7 @@ void myChanServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_info(User * u)
+static int do_info(User * u)
 {
 /* SADMINS and users, who have identified for a channel, can now cause it's
  * Enstry Message and Successor to be displayed by supplying the ALL parameter.

src/core/cs_invite.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-void myChanServHelp(User * u);
-int do_invite(User * u);
+static void myChanServHelp(User * u);
+static int do_invite(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -54,7 +54,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     notice_lang(s_ChanServ, u, CHAN_HELP_CMD_INVITE);
 }
@@ -64,7 +64,7 @@ void myChanServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_invite(User * u)
+static int do_invite(User * u)
 {
     char *chan = strtok(NULL, " ");
     Channel *c;

src/core/cs_kick.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_cs_kick(User * u);
-void myChanServHelp(User * u);
+static int do_cs_kick(User * u);
+static void myChanServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -52,7 +52,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     notice_lang(s_ChanServ, u, CHAN_HELP_CMD_KICK);
 }
@@ -62,7 +62,7 @@ void myChanServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_cs_kick(User * u)
+static int do_cs_kick(User * u)
 {
     char *chan = strtok(NULL, " ");
     char *params = strtok(NULL, " ");

src/core/cs_list.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_list(User * u);
-void myChanServHelp(User * u);
+static int do_list(User * u);
+static void myChanServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -56,7 +56,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     if (!CSListOpersOnly || (is_oper(u))) {
         notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LIST);
@@ -68,7 +68,7 @@ void myChanServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_list(User * u)
+static int do_list(User * u)
 {
     char *pattern = strtok(NULL, " ");
     int spattern_size;

src/core/cs_logout.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,9 +14,9 @@
 
 #include "module.h"
 
-int do_logout(User * u);
-void myChanServHelp(User * u);
-void make_unidentified(User * u, ChannelInfo * ci);
+static int do_logout(User * u);
+static void myChanServHelp(User * u);
+static void make_unidentified(User * u, ChannelInfo * ci);
 
 /**
  * Create the command, and tell anope about it.
@@ -56,7 +56,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LOGOUT);
 }
@@ -66,7 +66,7 @@ void myChanServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_logout(User * u)
+static int do_logout(User * u)
 {
     char *chan = strtok(NULL, " ");
     char *nick = strtok(NULL, " ");
@@ -108,7 +108,7 @@ int do_logout(User * u)
     return MOD_CONT;
 }
 
-void make_unidentified(User * u, ChannelInfo * ci)
+static void make_unidentified(User * u, ChannelInfo * ci)
 {
     struct u_chaninfolist *uci;
 

src/core/cs_modes.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,18 +14,18 @@
 
 #include "module.h"
 
-void myChanServHelp(User * u);
-int do_util(User * u, CSModeUtil * util);
-int do_op(User * u);
-int do_deop(User * u);
-int do_voice(User * u);
-int do_devoice(User * u);
-int do_halfop(User * u);
-int do_dehalfop(User * u);
-int do_protect(User * u);
-int do_deprotect(User * u);
-int do_owner(User * u);
-int do_deowner(User * u);
+static void myChanServHelp(User * u);
+static int do_util(User * u, CSModeUtil * util);
+static int do_op(User * u);
+static int do_deop(User * u);
+static int do_voice(User * u);
+static int do_devoice(User * u);
+static int do_halfop(User * u);
+static int do_dehalfop(User * u);
+static int do_protect(User * u);
+static int do_deprotect(User * u);
+static int do_owner(User * u);
+static int do_deowner(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -87,7 +87,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     if (ircd->owner) {
         notice_lang(s_ChanServ, u, CHAN_HELP_CMD_OWNER);
@@ -117,35 +117,35 @@ void myChanServHelp(User * u)
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
 
-int do_op(User * u)
+static int do_op(User * u)
 {
     return do_util(u, &csmodeutils[MUT_OP]);
 }
 
 /*************************************************************************/
 
-int do_deop(User * u)
+static int do_deop(User * u)
 {
     return do_util(u, &csmodeutils[MUT_DEOP]);
 }
 
 /*************************************************************************/
 
-int do_voice(User * u)
+static int do_voice(User * u)
 {
     return do_util(u, &csmodeutils[MUT_VOICE]);
 }
 
 /*************************************************************************/
 
-int do_devoice(User * u)
+static int do_devoice(User * u)
 {
     return do_util(u, &csmodeutils[MUT_DEVOICE]);
 }
 
 /*************************************************************************/
 
-int do_halfop(User * u)
+static int do_halfop(User * u)
 {
     if (ircd->halfop) {
         return do_util(u, &csmodeutils[MUT_HALFOP]);
@@ -156,7 +156,7 @@ int do_halfop(User * u)
 
 /*************************************************************************/
 
-int do_dehalfop(User * u)
+static int do_dehalfop(User * u)
 {
     if (ircd->halfop) {
         return do_util(u, &csmodeutils[MUT_DEHALFOP]);
@@ -167,7 +167,7 @@ int do_dehalfop(User * u)
 
 /*************************************************************************/
 
-int do_protect(User * u)
+static int do_protect(User * u)
 {
     if (ircd->protect || ircd->admin) {
         return do_util(u, &csmodeutils[MUT_PROTECT]);
@@ -178,7 +178,7 @@ int do_protect(User * u)
 
 /*************************************************************************/
 
-int do_deprotect(User * u)
+static int do_deprotect(User * u)
 {
     if (ircd->protect || ircd->admin) {
         return do_util(u, &csmodeutils[MUT_DEPROTECT]);
@@ -189,7 +189,7 @@ int do_deprotect(User * u)
 
 /*************************************************************************/
 
-int do_owner(User * u)
+static int do_owner(User * u)
 {
     char *av[2];
     char *chan = strtok(NULL, " ");
@@ -245,7 +245,7 @@ int do_owner(User * u)
 
 /*************************************************************************/
 
-int do_deowner(User * u)
+static int do_deowner(User * u)
 {
     char *av[2];
     char *chan = strtok(NULL, " ");
@@ -301,7 +301,7 @@ int do_deowner(User * u)
 
 /* do_util: not a command, but does the job of other */
 
-int do_util(User * u, CSModeUtil * util)
+static int do_util(User * u, CSModeUtil * util)
 {
     char *av[2];
     char *chan = strtok(NULL, " ");

src/core/cs_register.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_register(User * u);
-void myChanServHelp(User * u);
+static int do_register(User * u);
+static void myChanServHelp(User * u);
 
 /**
  * Create the off command, and tell anope about it.
@@ -55,7 +55,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     notice_lang(s_ChanServ, u, CHAN_HELP_CMD_REGISTER);
 }
@@ -65,7 +65,7 @@ void myChanServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_register(User * u)
+static int do_register(User * u)
 {
     char *chan = strtok(NULL, " ");
     char *pass = strtok(NULL, " ");

src/core/cs_sendpass.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -14,8 +14,8 @@
 
 #include "module.h"
 
-int do_sendpass(User * u);
-void myChanServHelp(User * u);
+static int do_sendpass(User * u);
+static void myChanServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -58,7 +58,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     if (!RestrictMail || is_services_oper(u))
         notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SENDPASS);
@@ -69,7 +69,7 @@ void myChanServHelp(User * u)
  * @param u The user who issued the command
  * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
  **/
-int do_sendpass(User * u)
+static int do_sendpass(User * u)
 {
 
     char *chan = strtok(NULL, " ");

src/core/cs_set.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2011 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -15,29 +15,29 @@
 #include "module.h"
 #include "encrypt.h"
 
-int do_set(User * u);
-int do_set_founder(User * u, ChannelInfo * ci, char *param);
-int do_set_successor(User * u, ChannelInfo * ci, char *param);
-int do_set_password(User * u, ChannelInfo * ci, char *param);
-int do_set_desc(User * u, ChannelInfo * ci, char *param);
-int do_set_url(User * u, ChannelInfo * ci, char *param);
-int do_set_email(User * u, ChannelInfo * ci, char *param);
-int do_set_entrymsg(User * u, ChannelInfo * ci, char *param);
-int do_set_bantype(User * u, ChannelInfo * ci, char *param);
-int do_set_mlock(User * u, ChannelInfo * ci, char *param);
-int do_set_keeptopic(User * u, ChannelInfo * ci, char *param);
-int do_set_topiclock(User * u, ChannelInfo * ci, char *param);
-int do_set_private(User * u, ChannelInfo * ci, char *param);
-int do_set_secureops(User * u, ChannelInfo * ci, char *param);
-int do_set_securefounder(User * u, ChannelInfo * ci, char *param);
-int do_set_restricted(User * u, ChannelInfo * ci, char *param);
-int do_set_secure(User * u, ChannelInfo * ci, char *param);
-int do_set_signkick(User * u, ChannelInfo * ci, char *param);
-int do_set_opnotice(User * u, ChannelInfo * ci, char *param);
-int do_set_xop(User * u, ChannelInfo * ci, char *param);
-int do_set_peace(User * u, ChannelInfo * ci, char *param);
-int do_set_noexpire(User * u, ChannelInfo * ci, char *param);
-void myChanServHelp(User * u);
+static int do_set(User * u);
+static int do_set_founder(User * u, ChannelInfo * ci, char *param);
+static int do_set_successor(User * u, ChannelInfo * ci, char *param);
+static int do_set_password(User * u, ChannelInfo * ci, char *param);
+static int do_set_desc(User * u, ChannelInfo * ci, char *param);
+static int do_set_url(User * u, ChannelInfo * ci, char *param);
+static int do_set_email(User * u, ChannelInfo * ci, char *param);
+static int do_set_entrymsg(User * u, ChannelInfo * ci, char *param);
+static int do_set_bantype(User * u, ChannelInfo * ci, char *param);
+static int do_set_mlock(User * u, ChannelInfo * ci, char *param);
+static int do_set_keeptopic(User * u, ChannelInfo * ci, char *param);
+static int do_set_topiclock(User * u, ChannelInfo * ci, char *param);
+static int do_set_private(User * u, ChannelInfo * ci, char *param);
+static int do_set_secureops(User * u, ChannelInfo * ci, char *param);
+static int do_set_securefounder(User * u, ChannelInfo * ci, char *param);
+static int do_set_restricted(User * u, ChannelInfo * ci, char *param);
+static int do_set_secure(User * u, ChannelInfo * ci, char *param);
+static int do_set_signkick(User * u, ChannelInfo * ci, char *param);
+static int do_set_opnotice(User * u, ChannelInfo * ci, char *param);
+static int do_set_xop(User * u, ChannelInfo * ci, char *param);
+static int do_set_peace(User * u, ChannelInfo * ci, char *param);
+static int do_set_noexpire(User * u, ChannelInfo * ci, char *param);
+static void myChanServHelp(User * u);
 
 /**
  * Create the command, and tell anope about it.
@@ -140,7 +140,7 @@ void AnopeFini(void)
  * Add the help response to anopes /cs help output.
  * @param u The user who is requesting help
  **/
-void myChanServHelp(User * u)
+static void myChanServHelp(User * u)
 {
     notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SET);
 }
@@ -159,7 +159,7 @@ void myChanServHelp(User * u)
  * the first passed in the function call can be retrieved using
  * strtok(NULL, toks).
  */
-int do_set(User * u)
+static int do_set(User * u)
 {
     char *chan = strtok(NULL, " ");
     char *cmd = strtok(NULL, " ");
@@ -282,7 +282,7 @@ int do_set(User * u)
 
 /*************************************************************************/
 
-int do_set_founder(User * u, ChannelInfo * ci, char *param)
+static int do_set_founder(User * u, ChannelInfo * ci, char *param)
 {
     NickAlias *na = findnick(param);
     NickCore *nc, *nc0 = ci->founder;
@@ -320,7 +320,7 @@ int do_set_founder(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_successor(User * u, ChannelInfo * ci, char *param)
+static int do_set_successor(User * u, ChannelInfo * ci, char *param)
 {
     NickAlias *na;
     NickCore *nc;
@@ -364,7 +364,7 @@ int do_set_successor(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_password(User * u, ChannelInfo * ci, char *param)
+static int do_set_password(User * u, ChannelInfo * ci, char *param)
 {
     int len = strlen(param);
 
@@ -406,7 +406,7 @@ int do_set_password(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_desc(User * u, ChannelInfo * ci, char *param)
+static int do_set_desc(User * u, ChannelInfo * ci, char *param)
 {
     if (ci->desc)
         free(ci->desc);
@@ -419,7 +419,7 @@ int do_set_desc(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_url(User * u, ChannelInfo * ci, char *param)
+static int do_set_url(User * u, ChannelInfo * ci, char *param)
 {
     if (ci->url)
         free(ci->url);
@@ -439,7 +439,7 @@ int do_set_url(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_email(User * u, ChannelInfo * ci, char *param)
+static int do_set_email(User * u, ChannelInfo * ci, char *param)
 {
     if (ci->email)
         free(ci->email);
@@ -459,7 +459,7 @@ int do_set_email(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_entrymsg(User * u, ChannelInfo * ci, char *param)
+static int do_set_entrymsg(User * u, ChannelInfo * ci, char *param)
 {
     if (ci->entry_message)
         free(ci->entry_message);
@@ -480,7 +480,7 @@ int do_set_entrymsg(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_mlock(User * u, ChannelInfo * ci, char *param)
+static int do_set_mlock(User * u, ChannelInfo * ci, char *param)
 {
     int add = -1;               /* 1 if adding, 0 if deleting, -1 if neither */
     unsigned char mode;
@@ -580,7 +580,7 @@ int do_set_mlock(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_bantype(User * u, ChannelInfo * ci, char *param)
+static int do_set_bantype(User * u, ChannelInfo * ci, char *param)
 {
     char *endptr;
 
@@ -600,7 +600,7 @@ int do_set_bantype(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_keeptopic(User * u, ChannelInfo * ci, char *param)
+static int do_set_keeptopic(User * u, ChannelInfo * ci, char *param)
 {
     if (stricmp(param, "ON") == 0) {
         ci->flags |= CI_KEEPTOPIC;
@@ -621,7 +621,7 @@ int do_set_keeptopic(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_topiclock(User * u, ChannelInfo * ci, char *param)
+static int do_set_topiclock(User * u, ChannelInfo * ci, char *param)
 {
     if (stricmp(param, "ON") == 0) {
         ci->flags |= CI_TOPICLOCK;
@@ -642,7 +642,7 @@ int do_set_topiclock(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_private(User * u, ChannelInfo * ci, char *param)
+static int do_set_private(User * u, ChannelInfo * ci, char *param)
 {
     if (stricmp(param, "ON") == 0) {
         ci->flags |= CI_PRIVATE;
@@ -663,7 +663,7 @@ int do_set_private(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_secureops(User * u, ChannelInfo * ci, char *param)
+static int do_set_secureops(User * u, ChannelInfo * ci, char *param)
 {
     if (stricmp(param, "ON") == 0) {
         ci->flags |= CI_SECUREOPS;
@@ -684,7 +684,7 @@ int do_set_secureops(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_securefounder(User * u, ChannelInfo * ci, char *param)
+static int do_set_securefounder(User * u, ChannelInfo * ci, char *param)
 {
     if (stricmp(param, "ON") == 0) {
         ci->flags |= CI_SECUREFOUNDER;
@@ -705,7 +705,7 @@ int do_set_securefounder(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_restricted(User * u, ChannelInfo * ci, char *param)
+static int do_set_restricted(User * u, ChannelInfo * ci, char *param)
 {
     if (stricmp(param, "ON") == 0) {
         ci->flags |= CI_RESTRICTED;
@@ -730,7 +730,7 @@ int do_set_restricted(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_secure(User * u, ChannelInfo * ci, char *param)
+static int do_set_secure(User * u, ChannelInfo * ci, char *param)
 {
     if (stricmp(param, "ON") == 0) {
         ci->flags |= CI_SECURE;
@@ -750,7 +750,7 @@ int do_set_secure(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_signkick(User * u, ChannelInfo * ci, char *param)
+static int do_set_signkick(User * u, ChannelInfo * ci, char *param)
 {
     if (stricmp(param, "ON") == 0) {
         ci->flags |= CI_SIGNKICK;
@@ -778,7 +778,7 @@ int do_set_signkick(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_opnotice(User * u, ChannelInfo * ci, char *param)
+static int do_set_opnotice(User * u, ChannelInfo * ci, char *param)
 {
     if (stricmp(param, "ON") == 0) {
         ci->flags |= CI_OPNOTICE;
@@ -801,7 +801,7 @@ int do_set_opnotice(User * u, ChannelInfo * ci, char *param)
 
 #define CHECKLEV(lev) ((ci->levels[(lev)] != ACCESS_INVALID) && (access->level >= ci->levels[(lev)]))
 
-int do_set_xop(User * u, ChannelInfo * ci, char *param)
+static int do_set_xop(User * u, ChannelInfo * ci, char *param)
 {
     if (stricmp(param, "ON") == 0) {
         if (!(ci->flags & CI_XOP)) {
@@ -856,7 +856,7 @@ int do_set_xop(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_peace(User * u, ChannelInfo * ci, char *param)
+static int do_set_peace(User * u, ChannelInfo * ci, char *param)
 {
     if (stricmp(param, "ON") == 0) {
         ci->flags |= CI_PEACE;
@@ -876,7 +876,7 @@ int do_set_peace(User * u, ChannelInfo * ci, char *param)
 
 /*************************************************************************/
 
-int do_set_noexpire(User * u, ChannelInfo * ci, char *param)
+static int do_set_noexpire(User * u, ChannelInfo * ci, char *param)
 {
     if (!is_services_admin(u)) {
         notice_lang(s_ChanServ, u, PERMISSION_DENIED);
@@ -898,3 +898,4 @@ int do_set_noexpire(User * u, ChannelInfo * ci, char *param)
     }
     return MOD_CONT;
 }
+