From d252a2b4e207ffde8ebbfe60c7858a45ab781b12 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sun, 4 Sep 2011 18:04:07 +0700 Subject: [PATCH] Change "znc" to "ZNC". --- Client.cpp | 2 +- Modules.cpp | 2 +- Modules.h | 4 ++-- README.md | 5 +++-- Template.cpp | 6 ++++-- User.cpp | 4 ++-- ZNCString.h | 2 +- configure.ac | 6 +++--- defines.h | 2 +- znc-buildmod.in | 4 ++-- 10 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Client.cpp b/Client.cpp index 607eaca4..64664817 100644 --- a/Client.cpp +++ b/Client.cpp @@ -187,7 +187,7 @@ void CClient::ReadLine(const CString& sData) { } return; } else if (sCommand.Equals("PING")) { - // All PONGs are generated by znc. We will still forward this to + // All PONGs are generated by ZNC. We will still forward this to // the ircd, but all PONGs from irc will be blocked. if (sLine.length() >= 5) PutClient(":irc.znc.in PONG irc.znc.in " + sLine.substr(5)); diff --git a/Modules.cpp b/Modules.cpp index 7d22fb5f..0cec46d5 100644 --- a/Modules.cpp +++ b/Modules.cpp @@ -1100,7 +1100,7 @@ ModHandle CModules::OpenModule(const CString& sModule, const CString& sModPath, // that (despite what the man page says) we must include either of // RTLD_NOW and RTLD_LAZY and either of RTLD_GLOBAL and RTLD_LOCAL. // - // RTLD_NOW vs. RTLD_LAZY: We use RTLD_NOW to avoid znc dying due to + // RTLD_NOW vs. RTLD_LAZY: We use RTLD_NOW to avoid ZNC dying due to // failed symbol lookups later on. Doesn't really seem to have much of a // performance impact. // diff --git a/Modules.h b/Modules.h index 9a330563..4b5e17a3 100644 --- a/Modules.h +++ b/Modules.h @@ -34,7 +34,7 @@ class CModInfo; #ifndef HAVE_LIBSSL #error - #error - -#error This module only works when znc is compiled with OpenSSL support +#error This module only works when ZNC is compiled with OpenSSL support #error - #error - #endif @@ -291,7 +291,7 @@ private: /** The base class for your own ZNC modules. * - * If you want to write a module for znc, you will have to implement a class + * If you want to write a module for ZNC, you will have to implement a class * which inherits from this class. You should override some of the "On*" * functions in this class. These function will then be called by ZNC when the * associated event happens. diff --git a/README.md b/README.md index 8c4e6f57..3f2dde55 100644 --- a/README.md +++ b/README.md @@ -122,13 +122,14 @@ These directories are also in there: This file shouldn't be too hard too understand. An explanation of all the items can be found on the [Configuration](http://wiki.znc.in/Configuration)-Page. +Warning: better not to edit config, while ZNC is running. To rehash the config file, you can send ZNC SIGHUP via pkill -SIGHUP znc -or you can login to znc and use +or you can login to ZNC and use /msg *status rehash -If you changed some settings while znc is running, a simple +If you changed some settings while ZNC is running, a simple pkill -SIGUSR1 znc will make ZNC rewrite its config file. Alternatively you can use this: /msg *status saveconfig diff --git a/Template.cpp b/Template.cpp index 300ed6fe..17521f17 100644 --- a/Template.cpp +++ b/Template.cpp @@ -82,7 +82,8 @@ CTemplate::~CTemplate() { } void CTemplate::Init() { - /* We have no CConfig in znc land + /* We have no CConfig in ZNC land + * Hmm... Actually, we do have it now. CString sPath(CConfig::GetValue("WebFilesPath")); if (!sPath.empty()) { @@ -789,7 +790,8 @@ CString CTemplate::GetValue(const CString& sArgs, bool bFromIf) { msArgs[sArg.Token(0, false, "=").AsUpper()] = sArg.Token(1, true, "="); } - /* We have no CConfig in znc land + /* We have no CConfig in ZNC land + * Hmm... Actually, we do have it now. if (msArgs.find("CONFIG") != msArgs.end()) { sRet = CConfig::GetValue(sName); } else*/ if (msArgs.find("ROWS") != msArgs.end()) { diff --git a/User.cpp b/User.cpp index f3ee3780..24008485 100644 --- a/User.cpp +++ b/User.cpp @@ -351,13 +351,13 @@ bool CUser::ParseConfig(CConfig* pConfig, CString& sError) { sValue = *vit; CString sModName = sValue.Token(0); - // XXX Legacy crap, added in znc 0.089 + // XXX Legacy crap, added in ZNC 0.089 if (sModName == "discon_kick") { CUtils::PrintMessage("NOTICE: [discon_kick] was renamed, loading [disconkick] instead"); sModName = "disconkick"; } - // XXX Legacy crap, added in znc 0.099 + // XXX Legacy crap, added in ZNC 0.099 if (sModName == "fixfreenode") { CUtils::PrintMessage("NOTICE: [fixfreenode] doesn't do anything useful anymore, ignoring it"); continue; diff --git a/ZNCString.h b/ZNCString.h index 85a44b21..266a7bf3 100644 --- a/ZNCString.h +++ b/ZNCString.h @@ -56,7 +56,7 @@ static const unsigned char base64_table[256] = { }; /** - * @brief String class that is used inside znc. + * @brief String class that is used inside ZNC. * * All strings that are used in ZNC and its modules should use instances of this * class. It provides helpful functions for parsing input like Token() and diff --git a/configure.ac b/configure.ac index d4333ced..e02fa9c5 100644 --- a/configure.ac +++ b/configure.ac @@ -132,7 +132,7 @@ AC_ARG_ENABLE( [c-ares], [ARES="$enableval"], [ARES="auto"]) AC_ARG_ENABLE( [run-from-source], - AS_HELP_STRING([--enable-run-from-source], [znc will be runnable without installation]), + AS_HELP_STRING([--enable-run-from-source], [ZNC will be runnable without installation]), [if test "x$enableval" = "xyes" ; then AC_DEFINE([RUN_FROM_SOURCE], [1], [Define if ZNC should be runnable without installation]) @@ -281,7 +281,7 @@ if test -z "$ISCYGWIN" ; then # warning: -fPIC ignored for target (all code is position independent) appendMod -fPIC else - # But cygwin does want most of znc in a shared lib + # But cygwin does want most of ZNC in a shared lib LIBZNC="libznc.dll" LIBZNCDIR="$bindir" fi @@ -526,7 +526,7 @@ AC_CONFIG_FILES([test/Makefile]) AC_OUTPUT echo -echo znc AC_PACKAGE_VERSION configured +echo ZNC AC_PACKAGE_VERSION configured echo echo "prefix: $prefix" echo "debug: $DEBUG" diff --git a/defines.h b/defines.h index 4ffee4f4..a8470eac 100644 --- a/defines.h +++ b/defines.h @@ -23,7 +23,7 @@ #define __DEBUG__ #endif -// Redefine some Csocket debugging mechanisms to use znc's +// Redefine some Csocket debugging mechanisms to use ZNC's #define CS_DEBUG(f) DEBUG(__FILE__ << ":" << __LINE__ << " " << f) #define PERROR(f) DEBUG(__FILE__ << ":" << __LINE__ << " " << f << ": " << strerror(GetSockError())) diff --git a/znc-buildmod.in b/znc-buildmod.in index 3f4102a0..dd97e183 100755 --- a/znc-buildmod.in +++ b/znc-buildmod.in @@ -55,9 +55,9 @@ do MOD="${MOD%.cc}" if test ! -f "${FILE}"; then - echo "${ERROR} Building \"${MOD}.so\" for znc $VERSION... File not found" + echo "${ERROR} Building \"${MOD}.so\" for ZNC $VERSION... File not found" else - printf "Building \"${MOD}.so\" for znc $VERSION... " + printf "Building \"${MOD}.so\" for ZNC $VERSION... " if ${CXX} ${CXXFLAGS} ${INCLUDES} ${LDFLAGS} ${LIBS} ${MODLINK} -o "${MOD}.so" "${FILE}" ; then echo "${OK}" else