summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--cmake/FindAspell.cmake2
-rw-r--r--cmake/FindGcrypt.cmake2
-rw-r--r--cmake/FindGettext.cmake2
-rw-r--r--cmake/FindGnuTLS.cmake2
-rw-r--r--cmake/FindIconv.cmake2
-rw-r--r--cmake/FindLua.cmake2
-rw-r--r--cmake/FindPerl.cmake2
-rw-r--r--cmake/FindPkgConfig.cmake8
-rw-r--r--cmake/FindPython.cmake2
-rw-r--r--cmake/FindRuby.cmake2
-rw-r--r--cmake/FindTCL.cmake38
-rw-r--r--configure.in10
-rwxr-xr-xdebian/rules2
-rw-r--r--doc/de/weechat_faq.de.txt4
-rw-r--r--doc/de/weechat_quickstart.de.txt6
-rw-r--r--doc/de/weechat_tester.de.txt2
-rw-r--r--doc/en/weechat_plugin_api.en.txt6
-rw-r--r--doc/en/weechat_user.en.txt2
-rw-r--r--doc/fr/weechat_plugin_api.fr.txt6
-rw-r--r--doc/fr/weechat_user.fr.txt2
-rw-r--r--doc/it/weechat_quickstart.it.txt2
-rw-r--r--doc/it/weechat_user.it.txt4
-rw-r--r--doc/pl/weechat_faq.pl.txt12
-rw-r--r--doc/pl/weechat_quickstart.pl.txt6
-rw-r--r--doc/pl/weechat_tester.pl.txt6
-rw-r--r--doc/ru/weechat_quickstart.ru.txt20
-rw-r--r--po/Makevars2
-rw-r--r--src/core/wee-command.c10
-rw-r--r--src/core/wee-config-file.c10
-rw-r--r--src/core/wee-config-file.h2
-rw-r--r--src/core/wee-config.c4
-rw-r--r--src/core/wee-hook.c69
-rw-r--r--src/core/wee-input.c12
-rw-r--r--src/core/wee-network.c36
-rw-r--r--src/core/wee-string.c26
-rw-r--r--src/core/wee-upgrade.c6
-rw-r--r--src/core/wee-util.c2
-rw-r--r--src/core/weechat.c14
-rw-r--r--src/gui/curses/CMakeLists.txt4
-rw-r--r--src/gui/curses/gui-curses-bar-window.c25
-rw-r--r--src/gui/curses/gui-curses-chat.c8
-rw-r--r--src/gui/curses/gui-curses-color.c23
-rw-r--r--src/gui/curses/gui-curses-keyboard.c12
-rw-r--r--src/gui/curses/gui-curses-main.c17
-rw-r--r--src/gui/curses/gui-curses-window.c2
-rw-r--r--src/gui/gtk/CMakeLists.txt2
-rw-r--r--src/gui/gtk/gui-gtk-chat.c2
-rw-r--r--src/gui/gtk/gui-gtk-main.c6
-rw-r--r--src/gui/gtk/gui-gtk-window.c2
-rw-r--r--src/gui/gtk/gui-gtk.h6
-rw-r--r--src/gui/gui-bar-item.c8
-rw-r--r--src/gui/gui-bar.c12
-rw-r--r--src/gui/gui-buffer.c26
-rw-r--r--src/gui/gui-buffer.h18
-rw-r--r--src/gui/gui-chat.c6
-rw-r--r--src/gui/gui-completion.c34
-rw-r--r--src/gui/gui-input.c6
-rw-r--r--src/gui/gui-keyboard.c8
-rw-r--r--src/gui/gui-line.c18
-rw-r--r--src/gui/gui-window.c18
-rw-r--r--src/plugins/alias/alias.c15
-rw-r--r--src/plugins/aspell/Makefile.am2
-rw-r--r--src/plugins/aspell/weechat-aspell-speller.c2
-rw-r--r--src/plugins/aspell/weechat-aspell.c20
-rw-r--r--src/plugins/fifo/fifo.c14
-rw-r--r--src/plugins/irc/irc-channel.c2
-rw-r--r--src/plugins/irc/irc-color.h6
-rw-r--r--src/plugins/irc/irc-command.c14
-rw-r--r--src/plugins/irc/irc-config.c4
-rw-r--r--src/plugins/irc/irc-ctcp.c8
-rw-r--r--src/plugins/irc/irc-ignore.c6
-rw-r--r--src/plugins/irc/irc-info.c6
-rw-r--r--src/plugins/irc/irc-input.c6
-rw-r--r--src/plugins/irc/irc-msgbuffer.c3
-rw-r--r--src/plugins/irc/irc-protocol.c481
-rw-r--r--src/plugins/irc/irc-sasl.c13
-rw-r--r--src/plugins/irc/irc-server.c17
-rw-r--r--src/plugins/irc/irc.c14
-rw-r--r--src/plugins/logger/logger-tail.c6
-rw-r--r--src/plugins/logger/logger.c22
-rw-r--r--src/plugins/plugin.c8
-rw-r--r--src/plugins/relay/relay-protocol-irc.c21
-rw-r--r--src/plugins/relay/relay-server.c2
-rw-r--r--src/plugins/scripts/lua/Makefile.am2
-rw-r--r--src/plugins/scripts/lua/weechat-lua.c26
-rw-r--r--src/plugins/scripts/perl/weechat-perl-api.c2
-rw-r--r--src/plugins/scripts/perl/weechat-perl.c26
-rw-r--r--src/plugins/scripts/python/Makefile.am2
-rw-r--r--src/plugins/scripts/python/weechat-python.c34
-rw-r--r--src/plugins/scripts/ruby/Makefile.am2
-rw-r--r--src/plugins/scripts/ruby/weechat-ruby.c32
-rw-r--r--src/plugins/scripts/script.c2
-rw-r--r--src/plugins/scripts/tcl/weechat-tcl-api.c48
-rw-r--r--src/plugins/scripts/tcl/weechat-tcl.c24
-rw-r--r--src/plugins/weechat-plugin.h17
-rw-r--r--src/plugins/xfer/xfer-dcc.c8
-rw-r--r--src/plugins/xfer/xfer.c2
-rw-r--r--weechat.spec4
99 files changed, 887 insertions, 648 deletions
diff --git a/ChangeLog b/ChangeLog
index 8706449b1..d5a47be96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -646,7 +646,7 @@ Version 0.1.6 (2005-11-11)
* add colors for input buffer and current channel of status bar
* add online help for config options (with /set full_option_name)
* enhanced "smart" hotlist, with names (new options:
- look_hotlist_names_{count|level|length})
+ look_hotlist_names_{count|level|length})
Version 0.1.5 (2005-09-24)
--------------------------
diff --git a/cmake/FindAspell.cmake b/cmake/FindAspell.cmake
index 697b96199..4adb2580b 100644
--- a/cmake/FindAspell.cmake
+++ b/cmake/FindAspell.cmake
@@ -15,7 +15,7 @@
#
# - Find Aspell
-# This module finds if libaspell is installed and determines where
+# This module finds if libaspell is installed and determines where
# the include files and libraries are.
#
# This code sets the following variables:
diff --git a/cmake/FindGcrypt.cmake b/cmake/FindGcrypt.cmake
index f4c730100..5a04473c3 100644
--- a/cmake/FindGcrypt.cmake
+++ b/cmake/FindGcrypt.cmake
@@ -15,7 +15,7 @@
#
# - Find Gcrypt
-# This module finds if libgcrypt is installed and determines where
+# This module finds if libgcrypt is installed and determines where
# the include files and libraries are.
#
# This code sets the following variables:
diff --git a/cmake/FindGettext.cmake b/cmake/FindGettext.cmake
index 2742d0072..ba0e7f773 100644
--- a/cmake/FindGettext.cmake
+++ b/cmake/FindGettext.cmake
@@ -15,7 +15,7 @@
#
# - Find Gettext
-# This module finds if gettext is installed and determines where
+# This module finds if gettext is installed and determines where
# the include files and libraries are.
#
# This code sets the following variables:
diff --git a/cmake/FindGnuTLS.cmake b/cmake/FindGnuTLS.cmake
index ae5245755..158f2a316 100644
--- a/cmake/FindGnuTLS.cmake
+++ b/cmake/FindGnuTLS.cmake
@@ -15,7 +15,7 @@
#
# - Find GnuTLS
-# This module finds if libgnutls is installed and determines where
+# This module finds if libgnutls is installed and determines where
# the include files and libraries are.
#
# This code sets the following variables:
diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
index 7645cda6e..6b0b334d7 100644
--- a/cmake/FindIconv.cmake
+++ b/cmake/FindIconv.cmake
@@ -15,7 +15,7 @@
#
# - Find Iconv
-# This module finds if libiconv is installed and determines where
+# This module finds if libiconv is installed and determines where
# the include files and libraries are.
#
# This code sets the following variables:
diff --git a/cmake/FindLua.cmake b/cmake/FindLua.cmake
index e87cbedaa..72fb7f8ed 100644
--- a/cmake/FindLua.cmake
+++ b/cmake/FindLua.cmake
@@ -15,7 +15,7 @@
#
# - Find Lua
-# This module finds if liblua is installed and determines where
+# This module finds if liblua is installed and determines where
# the include files and libraries are.
#
# This code sets the following variables:
diff --git a/cmake/FindPerl.cmake b/cmake/FindPerl.cmake
index 34d7d00d1..dc537f987 100644
--- a/cmake/FindPerl.cmake
+++ b/cmake/FindPerl.cmake
@@ -57,7 +57,7 @@ IF(PERL_EXECUTABLE)
STRING(REPLACE "\n" "" PERL_CFLAGS "${PERL_CFLAGS}")
STRING(REPLACE "\n" "" PERL_LFLAGS "${PERL_LFLAGS}")
- FIND_PATH(PERL_INCLUDE_PATH
+ FIND_PATH(PERL_INCLUDE_PATH
NAMES perl.h
PATHS ${PERL_INTERNAL_DIR}
)
diff --git a/cmake/FindPkgConfig.cmake b/cmake/FindPkgConfig.cmake
index d5985a47e..76e32616d 100644
--- a/cmake/FindPkgConfig.cmake
+++ b/cmake/FindPkgConfig.cmake
@@ -72,13 +72,13 @@
#
# Redistribution and use, with or without modification, are permitted
# provided that the following conditions are met:
-#
+#
# 1. Redistributions must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# 2. The name of the author may not be used to endorse or promote
# products derived from this software without specific prior
# written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -232,7 +232,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
# create the final query which is of the format:
# * --atleast-version <version> <pkg-name>
- # * --exact-version <version> <pkg-name>
+ # * --exact-version <version> <pkg-name>
# * --max-version <version> <pkg-name>
# * --exists <pkg-name>
if (_pkg_check_modules_pkg_op)
@@ -352,7 +352,7 @@ macro(pkg_search_module _prefix _module0)
endif(NOT ${_prefix}_FOUND)
_pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
- endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
+ endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
endmacro(pkg_search_module)
### Local Variables:
diff --git a/cmake/FindPython.cmake b/cmake/FindPython.cmake
index 2aacd4fd1..32d8a4258 100644
--- a/cmake/FindPython.cmake
+++ b/cmake/FindPython.cmake
@@ -29,7 +29,7 @@ IF(PYTHON_FOUND)
SET(PYTHON_FIND_QUIETLY TRUE)
ENDIF(PYTHON_FOUND)
-FIND_PROGRAM(PYTHON_EXECUTABLE
+FIND_PROGRAM(PYTHON_EXECUTABLE
NAMES python python2.6 python2.5 python2.4 python2.3 python2.2
PATHS /usr/bin /usr/local/bin /usr/pkg/bin
)
diff --git a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake
index 9cd9421a7..e8ab55a19 100644
--- a/cmake/FindRuby.cmake
+++ b/cmake/FindRuby.cmake
@@ -28,7 +28,7 @@ IF(RUBY_FOUND)
SET(RUBY_FIND_QUIETLY TRUE)
ENDIF(RUBY_FOUND)
-FIND_PROGRAM(RUBY_EXECUTABLE
+FIND_PROGRAM(RUBY_EXECUTABLE
NAMES ruby ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16
PATHS /usr/bin /usr/local/bin /usr/pkg/bin
)
diff --git a/cmake/FindTCL.cmake b/cmake/FindTCL.cmake
index 1b2601b2f..93da092da 100644
--- a/cmake/FindTCL.cmake
+++ b/cmake/FindTCL.cmake
@@ -18,11 +18,11 @@
# - The stub libraries are now found in FindTclStub.cmake
# => they were only useful for people writing Tcl/Tk extensions.
# - TCL_LIBRARY_DEBUG and TK_LIBRARY_DEBUG were removed.
-# => these libs are not packaged by default with Tcl/Tk distributions.
+# => these libs are not packaged by default with Tcl/Tk distributions.
# Even when Tcl/Tk is built from source, several flavors of debug libs
# are created and there is no real reason to pick a single one
-# specifically (say, amongst tcl84g, tcl84gs, or tcl84sgx).
-# Let's leave that choice to the user by allowing him to assign
+# specifically (say, amongst tcl84g, tcl84gs, or tcl84sgx).
+# Let's leave that choice to the user by allowing him to assign
# TCL_LIBRARY to any Tcl library, debug or not.
# - TK_INTERNAL_PATH was removed.
# => this ended up being only a Win32 variable, and there is a lot of
@@ -40,28 +40,28 @@ INCLUDE(FindTclsh)
GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
-STRING(REGEX REPLACE
+STRING(REGEX REPLACE
"^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")
GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH)
GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
-STRING(REGEX REPLACE
+STRING(REGEX REPLACE
"^.*tcl([0-9]\\.*[0-9]).*$" "\\1" TCL_VERSION "${TCL_LIBRARY}")
SET(TCL_POSSIBLE_LIB_PATHS
"${TCL_INCLUDE_PATH_PARENT}/lib"
"${TCL_LIBRARY_PATH}"
"${TCL_TCLSH_PATH_PARENT}/lib"
- /usr/lib
+ /usr/lib
/usr/local/lib
)
IF(WIN32)
GET_FILENAME_COMPONENT(
- ActiveTcl_CurrentVersion
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
+ ActiveTcl_CurrentVersion
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
NAME)
SET(TCLTK_POSSIBLE_LIB_PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib"
@@ -72,20 +72,20 @@ IF(WIN32)
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/lib"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/lib"
"$ENV{ProgramFiles}/Tcl/Lib"
- "C:/Program Files/Tcl/lib"
- "C:/Tcl/lib"
+ "C:/Program Files/Tcl/lib"
+ "C:/Tcl/lib"
)
ENDIF(WIN32)
FIND_LIBRARY(TCL_LIBRARY
- NAMES
- tcl
+ NAMES
+ tcl
tcl${TCL_VERSION} tcl${TCL_TCLSH_VERSION}
- tcl86 tcl8.6
- tcl85 tcl8.5
- tcl84 tcl8.4
- tcl83 tcl8.3
- tcl82 tcl8.2
+ tcl86 tcl8.6
+ tcl85 tcl8.5
+ tcl84 tcl8.4
+ tcl83 tcl8.3
+ tcl82 tcl8.2
tcl80 tcl8.0
PATHS ${TCL_POSSIBLE_LIB_PATHS}
)
@@ -104,7 +104,7 @@ ENDIF(Tcl_FRAMEWORKS)
SET(TCL_POSSIBLE_INCLUDE_PATHS
"${TCL_LIBRARY_PATH_PARENT}/include"
"${TCL_INCLUDE_PATH}"
- ${TCL_FRAMEWORK_INCLUDES}
+ ${TCL_FRAMEWORK_INCLUDES}
"${TCL_TCLSH_PATH_PARENT}/include"
/usr/include
/usr/local/include
@@ -140,7 +140,7 @@ IF(WIN32)
)
ENDIF(WIN32)
-FIND_PATH(TCL_INCLUDE_PATH
+FIND_PATH(TCL_INCLUDE_PATH
NAMES tcl.h
PATHS ${TCL_POSSIBLE_INCLUDE_PATHS}
)
diff --git a/configure.in b/configure.in
index 2fe02c20f..d78b0727b 100644
--- a/configure.in
+++ b/configure.in
@@ -253,7 +253,7 @@ if test "x$ac_found_iconv_header" = "xyes" ; then
ICONV_LFLAGS="-liconv"
LIBS="$LIBS $ICONV_LFLAGS"
fi
- AC_MSG_CHECKING(for iconv usability in programs)
+ AC_MSG_CHECKING(for iconv usability in programs)
AC_TRY_RUN([
#include <iconv.h>
int main(int argc, char **argv) {
@@ -310,7 +310,7 @@ if test "x$enable_aspell" = "xyes" ; then
AC_CHECK_HEADER(aspell.h,ac_found_aspell_header="yes",ac_found_aspell_header="no")
AC_CHECK_LIB(aspell,new_aspell_speller,ac_found_aspell_lib="yes",ac_found_aspell_lib="no")
- AC_MSG_CHECKING(for aspell headers and librairies)
+ AC_MSG_CHECKING(for aspell headers and librairies)
if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = "xno" ; then
AC_MSG_RESULT(no)
AC_MSG_WARN([
@@ -491,7 +491,7 @@ if test "x$enable_python" = "xyes" ; then
AC_MSG_RESULT(found)
else
AC_MSG_WARN([
-*** Python library couldn't be found on your system.
+*** Python library couldn't be found on your system.
*** Try to install it with your software package manager.
*** WeeChat will be built without Python support.])
enable_python="no"
@@ -610,7 +610,7 @@ if test "x$enable_lua" = "xyes" ; then
fi
done
fi
- fi
+ fi
if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
LUACONFIG=""
@@ -624,7 +624,7 @@ if test "x$enable_lua" = "xyes" ; then
fi
fi
- if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
+ if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
AC_MSG_CHECKING(for Lua headers and librairies)
echo
AC_CHECK_HEADER(lua.h,ac_found_lua_header="yes",ac_found_lua_header="no")
diff --git a/debian/rules b/debian/rules
index b08612ac1..c40e8b5bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ builddir/Makefile:
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
build: build-stamp
-build-stamp: builddir/Makefile
+build-stamp: builddir/Makefile
dh_testdir
$(MAKE) -C builddir
touch $@
diff --git a/doc/de/weechat_faq.de.txt b/doc/de/weechat_faq.de.txt
index f9bcb9687..b81608db2 100644
--- a/doc/de/weechat_faq.de.txt
+++ b/doc/de/weechat_faq.de.txt
@@ -73,7 +73,7 @@ Ich habe WeeChat gestartet, komme aber nicht mehr weiter - was kann ich tun?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Um Hilfe zu erhalten, nutze den `/help` Befehl. Eine Hilfe zu einem Befehl erhältst
-Du durch die Eingabe von: `/help Befehlsname`.
+Du durch die Eingabe von: `/help Befehlsname`.
Befehle sowie die Belegung der jeweiligen Tasten sind in der Dokumentation
aufgeführt.
(Tipp: Mit den Tasten <Bild-hoch>/<Bild-runter> kannst Du die Anzeige scrollen)
@@ -476,7 +476,7 @@ http://www.weechat.org/about
[[donate]]
-Kann ich Geld oder anderes an die WeeChat Entwickler spenden?
+Kann ich Geld oder anderes an die WeeChat Entwickler spenden?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Du kannst uns Geld zur Unterstützung der weiteren Entwicklung spenden.
diff --git a/doc/de/weechat_quickstart.de.txt b/doc/de/weechat_quickstart.de.txt
index 3d4f9edac..62a35926f 100644
--- a/doc/de/weechat_quickstart.de.txt
+++ b/doc/de/weechat_quickstart.de.txt
@@ -89,11 +89,11 @@ Setzen eigener IRC-Server Optionen
WeeChat verwendet Vorgabewerte für alle Server (so genannte "fall backs") falls
Du keine eigenen Werte für entsprechende Server-Optionen bestimmst.
-Diese Vorgabeoptionen sind "irc.server_default.*".
+Diese Vorgabeoptionen sind "irc.server_default.*".
Für jede Server-Option benutzt WeeChat den entsprechend gesetzten Wert - falls
definiert (nicht "null"). Andernfalls verwendet WeeChat Vorgabewerte
-("irc.server_default.xxx").
+("irc.server_default.xxx").
Als Beispiel erwähnt seien die Vorgabe (default) nicks, die auf dem Un*x Login
basieren. Diese können nun für oftc-Server mittels folgendem Befehl
@@ -215,7 +215,7 @@ Belegungen kennen:
- 'alt + A': springe zum Puffer mit Aktivität (aus der Hotlist)
Gemäß Deiner Tastatur und/oder Deinen Bedürfnissen kannst Du jede Taste mittels
-des Befehls `/key` neu mit einem Befehl belegen.
+des Befehls `/key` neu mit einem Befehl belegen.
Eine nützliche Tastenkombination um Tastencodes zu ermitteln ist meta-k (alt-k).
Beispiel, Belegung von meta-y (alt-y) mit dem Befehl `/buffer close`:
diff --git a/doc/de/weechat_tester.de.txt b/doc/de/weechat_tester.de.txt
index 5d517a76c..85e96cd3d 100644
--- a/doc/de/weechat_tester.de.txt
+++ b/doc/de/weechat_tester.de.txt
@@ -54,7 +54,7 @@ Du könntest Dich ja dazu entscheiden es manuell zu bauen (empfohlen):
* die GIT Version kann parallel zur stabilen Version gebaut und installiert
werden.
* Du benötigst keine Root-Rechte, und opfern brauchst Du Deine stabile Version
- von WeeChat auch nicht.
+ von WeeChat auch nicht.
[[get_sources]]
Beschaffe und baue die Quellen
diff --git a/doc/en/weechat_plugin_api.en.txt b/doc/en/weechat_plugin_api.en.txt
index 0c594a14b..d3e888f3b 100644
--- a/doc/en/weechat_plugin_api.en.txt
+++ b/doc/en/weechat_plugin_api.en.txt
@@ -6983,14 +6983,14 @@ Arguments:
| notify | "0", "1", "2", "3" |
set notify level for buffer: "0" = never add to hotlist, "1" = add for
highlights only, "2" = add for highlights and messages, "3" = add for all
- messages
+ messages
| title | any string |
set new title for buffer
| time_for_each_line | "0" or "1" |
"0" to hide time for all lines in buffer, "1" to see time for all lines
- (default for a new buffer)
+ (default for a new buffer)
| nicklist | "0" or "1" |
"0" to remove nicklist for buffer, "1" to add nicklist for buffer
@@ -7004,7 +7004,7 @@ Arguments:
| highlight_words | "-" or comma separated list of words |
"-" is a special value to disable any highlight on this buffer, or comma
separated list of words to highlight in this buffer, for example:
- "abc,def,ghi"
+ "abc,def,ghi"
| highlight_tags | comma separated list of tags |
comma separated list of tags to highlight in this buffer
diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt
index 33614eb65..f1c5d63b4 100644
--- a/doc/en/weechat_user.en.txt
+++ b/doc/en/weechat_user.en.txt
@@ -249,7 +249,7 @@ You will see something like that:
#7 0xb763dd22 in snprintf () from /lib/i686/cmov/libc.so.6
#8 0xb7258674 in irc_protocol_cmd_join (server=0x8165138, command=0xb727c187 "join", argc=3, argv=0x889e840, argv_eol=0x889e858)
at /some_path/src/plugins/irc/irc-protocol.c:520
-#9 0xb7265c6e in irc_protocol_recv_command (server=0x8165138, entire_line=0x889e7e0 ":nick!nick@127.0.0.1 JOIN :#test",
+#9 0xb7265c6e in irc_protocol_recv_command (server=0x8165138, entire_line=0x889e7e0 ":nick!nick@127.0.0.1 JOIN :#test",
command=0x889d080 "JOIN") at /some_path/src/plugins/irc/irc-protocol.c:4077
#10 0xb726a2c6 in irc_server_msgq_flush () at /some_path/src/plugins/irc/irc-server.c:1614
#11 0xb726a4da in irc_server_recv_cb (data=0x8165138, fd=8) at /some_path/src/plugins/irc/irc-server.c:1691
diff --git a/doc/fr/weechat_plugin_api.fr.txt b/doc/fr/weechat_plugin_api.fr.txt
index eb4bf0aa0..2213d75d4 100644
--- a/doc/fr/weechat_plugin_api.fr.txt
+++ b/doc/fr/weechat_plugin_api.fr.txt
@@ -7082,14 +7082,14 @@ Paramètres :
| notify | "0", "1", "2", "3" |
définit le niveau de notification du tampon : "0" = ne jamais ajouter à la
hotlist, "1" = ajouter pour les highlights seulement, "2" = ajouter pour les
- highlights et les messages, "3" = ajouter pour tous les messages
+ highlights et les messages, "3" = ajouter pour tous les messages
| title | toute chaîne |
change le titre du tampon
| time_for_each_line | "0" ou "1" |
"0" pour cacher l'heure sur toutes les lignes du tampon, "1" pour afficher
- l'heure sur toutes les lignes (par défaut pour un nouveau tampon)
+ l'heure sur toutes les lignes (par défaut pour un nouveau tampon)
| nicklist | "0" ou "1" |
"0" pour supprimer la liste des pseudos du tampon, "1" pour ajouter la liste
@@ -7106,7 +7106,7 @@ Paramètres :
| highlight_words | "-" ou une liste de mots séparés par des virgules |
"-" est une valeur spécials pour désactiver tout highlight sur ce tampon, ou
une liste de mots à mettre en valeur dans ce tampon, par exemple :
- "abc,def,ghi"
+ "abc,def,ghi"
| highlight_tags | liste d'étiquettes ("tags") séparées par des virgules |
liste d'étiquettes ("tags") à mettre en valeur pour ce tampon
diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt
index 8a7450121..bc3b6aa77 100644
--- a/doc/fr/weechat_user.fr.txt
+++ b/doc/fr/weechat_user.fr.txt
@@ -254,7 +254,7 @@ Vous verrez quelque chose comme ceci :
#7 0xb763dd22 in snprintf () from /lib/i686/cmov/libc.so.6
#8 0xb7258674 in irc_protocol_cmd_join (server=0x8165138, command=0xb727c187 "join", argc=3, argv=0x889e840, argv_eol=0x889e858)
at /some_path/src/plugins/irc/irc-protocol.c:520
-#9 0xb7265c6e in irc_protocol_recv_command (server=0x8165138, entire_line=0x889e7e0 ":nick!nick@127.0.0.1 JOIN :#test",
+#9 0xb7265c6e in irc_protocol_recv_command (server=0x8165138, entire_line=0x889e7e0 ":nick!nick@127.0.0.1 JOIN :#test",
command=0x889d080 "JOIN") at /some_path/src/plugins/irc/irc-protocol.c:4077
#10 0xb726a2c6 in irc_server_msgq_flush () at /some_path/src/plugins/irc/irc-server.c:1614
#11 0xb726a4da in irc_server_recv_cb (data=0x8165138, fd=8) at /some_path/src/plugins/irc/irc-server.c:1691
diff --git a/doc/it/weechat_quickstart.it.txt b/doc/it/weechat_quickstart.it.txt
index dc7860160..4b5a0d1c0 100644
--- a/doc/it/weechat_quickstart.it.txt
+++ b/doc/it/weechat_quickstart.it.txt
@@ -137,7 +137,7 @@ Connessione al server IRC e ingresso automatico nei canali
[NOTE]
Questo comando può essere usato per creare e connettersi ad un nuovo server
-senza utilizzare il comando `/server` (è necessario ripetere che è possibile
+senza utilizzare il comando `/server` (è necessario ripetere che è possibile
visualizzare l'aiuto per questo comando con `/help connect`?).
I buffer dei server vengono uniti al buffer 'core' di WeeChat in modo
diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt
index b5261b382..0315b7d12 100644
--- a/doc/it/weechat_user.it.txt
+++ b/doc/it/weechat_user.it.txt
@@ -186,7 +186,7 @@ Segnalare gli errori
Nel caso in cui si verifichino errori, o si desideri segnalare qualsiasi errore futuro
di WeeChat, è necessario:
-* compilarlo con informazioni di debug (o installare il pacchetto binario con
+* compilarlo con informazioni di debug (o installare il pacchetto binario con
le informazioni di debug)
* abilitare i file 'core' sul proprio sistema
* installare gdb
@@ -255,7 +255,7 @@ il backtrace. Verrà mostrato qualcosa di simile a questo:
#7 0xb763dd22 in snprintf () from /lib/i686/cmov/libc.so.6
#8 0xb7258674 in irc_protocol_cmd_join (server=0x8165138, command=0xb727c187 "join", argc=3, argv=0x889e840, argv_eol=0x889e858)
at /some_path/src/plugins/irc/irc-protocol.c:520
-#9 0xb7265c6e in irc_protocol_recv_command (server=0x8165138, entire_line=0x889e7e0 ":nick!nick@127.0.0.1 JOIN :#test",
+#9 0xb7265c6e in irc_protocol_recv_command (server=0x8165138, entire_line=0x889e7e0 ":nick!nick@127.0.0.1 JOIN :#test",
command=0x889d080 "JOIN") at /some_path/src/plugins/irc/irc-protocol.c:4077
#10 0xb726a2c6 in irc_server_msgq_flush () at /some_path/src/plugins/irc/irc-server.c:1614
#11 0xb726a4da in irc_server_recv_cb (data=0x8165138, fd=8) at /some_path/src/plugins/irc/irc-server.c:1691
diff --git a/doc/pl/weechat_faq.pl.txt b/doc/pl/weechat_faq.pl.txt
index 5d33181c0..4b2b3f9c4 100644
--- a/doc/pl/weechat_faq.pl.txt
+++ b/doc/pl/weechat_faq.pl.txt
@@ -93,7 +93,7 @@ Dla wersji > = 0.2.3:
* sprawdź czy weechat-curses jest zlinkowany z libncursesw (uwaga: wymagane na
więkrzości dystrybucji ale nie wszystkich): `ldd /path/to/weechat-curses`
-* sprawdź czy wtyczka "Charset" jest załadowana za pomocą komendy `/plugin`
+* sprawdź czy wtyczka "Charset" jest załadowana za pomocą komendy `/plugin`
(jeśli nie jest, to najprawdopodbniej potrzebujesz pakietu "weechat-plugins")
* sprawdź ustawienia kodowania (w buforze serwera). Powinieneś ujrzeć 'ISO-XXXXXX'
lub 'UTF-8' dla kodowania terminala. Jeśli zobaczysz 'ANSI_X3.4-1968' lub inna
@@ -102,7 +102,7 @@ Dla wersji > = 0.2.3:
** w WeeChat < = 0.2.6: `/setp charset.global.decode = ISO-8859-2`
** w WeeChat > = 0.3.x: `/set charset.default.decode "ISO-8859-2"`
* jeśli kożystasz z UTF-8:
-** sprawdź czy twój terminal jest przystosowany dla UTF-8 (zalecanym terminalem
+** sprawdź czy twój terminal jest przystosowany dla UTF-8 (zalecanym terminalem
dla UTF-8 jest rxvt-unicode)
** jeśli kożystasz ze screena, sprawdź czy jest uruchomiony z trybem UTF-8
("`defutf8 on`" w ~/.screenrc lub `screen -U` uruchamiając screena)
@@ -373,14 +373,14 @@ Następnie: `/plugin autoload`.
Jak załadować skrypty Perl/Python/Ruby/Lua/Tcl? Czy skrypty są kompatybilne z innymi klientami IRC?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Możesz użyć komend `/perl`, `/python`, `/ruby`, `/lua` oraz `/tcl`, aby załadować
+Możesz użyć komend `/perl`, `/python`, `/ruby`, `/lua` oraz `/tcl`, aby załadować
skrypt (domyślna lokalizacja skryptów to '~/.weechat/<język>/').
Skrypty nie są kompatybilne z innymi klientami IRC.
Uwagi:
-* skrypty w '~/.weechat/<język>/autoload/' są automatycznie ładowane przy
+* skrypty w '~/.weechat/<język>/autoload/' są automatycznie ładowane przy
uruchomieniu WeeChat.
* wtyczka 'tcl' jest dostępna dla wersji > = 0.3.0.
@@ -398,10 +398,10 @@ W celu zmniejszenia używanej pamięci możesz zastosować się do poniższych r
* używać najnowsze stabilnej wersji (powinna mieć mniej wycieków pamięci
niż starsze wersje)
-* nie ładować nieużywanych pluginów, np: aspell, fifo, logger, perl, python,
+* nie ładować nieużywanych pluginów, np: aspell, fifo, logger, perl, python,
ruby, lua, tcl, xfer (używana do DCC)
* ładować tylko naprawde używane skrypty
-* zmniejszyć wartość opcji 'weechat.history.max_lines' (ilość lini trzymanych
+* zmniejszyć wartość opcji 'weechat.history.max_lines' (ilość lini trzymanych
w pamięci dla każdego bufora)
* zmniejszyć wartość opcji 'weechat.history.max_commands' (ilość komend
użytkownika trzymanych w pamięci)
diff --git a/doc/pl/weechat_quickstart.pl.txt b/doc/pl/weechat_quickstart.pl.txt
index 7ff61ead0..fd2f51197 100644
--- a/doc/pl/weechat_quickstart.pl.txt
+++ b/doc/pl/weechat_quickstart.pl.txt
@@ -66,7 +66,7 @@ na liście "irc" oraz inne wtyczki.
[[create_irc_server]]
-Tworzenie serwera IRC
+Tworzenie serwera IRC
---------------------
Możesz dodać serwer IRC za pomocą komendy `/server`, na przykład:
@@ -164,7 +164,7 @@ Zarządzanie buforami/oknami
Bufor jest to element łączący wtyczkę z numerem, kategorią,
oraz nazwą. Zawiera on dane wyświetlane na ekranie.
-Okno jest widokiem na bufor. Domyślnie jedno okno wyświetla jeden bufor.
+Okno jest widokiem na bufor. Domyślnie jedno okno wyświetla jeden bufor.
Jeśli podzielisz ekran, ujrzysz wiele okien z wieloma buforami jednocześnie.
Komendy do zarządzania buforami i oknami:
@@ -223,7 +223,7 @@ dokumentacji WeeChat, aby się dowiedzieć jak ładowac/wyładowywać wtyczki lu
skrypty).
Niektóre pluginy pozwalają na używanie skryptów w WeeChat (w wielu językach jak Perl,
-Python, Ruby, Lua oraz Tcl). Te wtyczki muszą być załadowane za pomoca komendy
+Python, Ruby, Lua oraz Tcl). Te wtyczki muszą być załadowane za pomoca komendy
`/plugin`, dostarczają one komendy jak `/perl`, używane do ładowania skryptów.
Wiele zewnętrznych wtyczek/skryptów (od społeczności) jest dostępnych dla
diff --git a/doc/pl/weechat_tester.pl.txt b/doc/pl/weechat_tester.pl.txt
index 05a17abdf..c3e7a85b9 100644
--- a/doc/pl/weechat_tester.pl.txt
+++ b/doc/pl/weechat_tester.pl.txt
@@ -15,8 +15,8 @@ niedoceniane. Kiedy nowe funkcje są implementowane, powinny zostać przetestowa
ale dla wielu z nich jest za dużo możliwości użycia lub nie są łątwe do
zasymulowania dlatego programiści nie są wstanie sprawdzić ich wszystkich.
-Na przykład: Powszechnie znana wtyczka od kodowania została wprowadzona w
-WeeChat 0.2.2: żaden z nas (programistów, współpracowników, testerów) nie
+Na przykład: Powszechnie znana wtyczka od kodowania została wprowadzona w
+WeeChat 0.2.2: żaden z nas (programistów, współpracowników, testerów) nie
używał kanałów ze znakami narodowymi w nazwach, kiedy wersja 0.2.2 została
wypuszczona zostaliśmy zalani użytkownikami z Rosji obwiniającymi nas.
Gdy będziemy mieli więcej testrów taka sytuacja nie powinna się już zdarzyć
@@ -123,7 +123,7 @@ Komenda to:
~/weechat-git/bin/weechat-curses --dir ~/.weechat-dev
-Jeśli nadal nie śpisz powinieneś ujrzeć znajomy interfejs i chwalić się
+Jeśli nadal nie śpisz powinieneś ujrzeć znajomy interfejs i chwalić się
z posiadania najnowszej możliwej wersji WeeChat. ;)
Teraz jeśli zaobserwujesz dziwne zachowanie (może sprawiać problemy, ulec awari
diff --git a/doc/ru/weechat_quickstart.ru.txt b/doc/ru/weechat_quickstart.ru.txt
index 510b3e729..b17125340 100644
--- a/doc/ru/weechat_quickstart.ru.txt
+++ b/doc/ru/weechat_quickstart.ru.txt
@@ -13,14 +13,14 @@ FlashCode <flashcode@flashtux.org>
[[help_options]]
-помощь \ настройки
+помощь \ настройки
------------------
В WeeChat есть справка по командам, просто наберите /help
Что бы получить справку по определенной команде, наберите `/help команда`
Для задания настроек используйте `/set config.section.option value`
-(где `config` имя конфигурации (`weechat` или имя плагина для
+(где `config` имя конфигурации (`weechat` или имя плагина для
настройки), `section` группа в которой настройка и `option` как
название настройки)
@@ -43,7 +43,7 @@ WeeChat после изменений в настройках)
Вы можете получить справку по любой опции используя `/help`, на пример
`/help weechat.look.highlight`.
-Все настройки WeeChat сохраняются при выходе (или используя команду `/save`
+Все настройки WeeChat сохраняются при выходе (или используя команду `/save`
для немедленного сохранения)
Вы можете редактировать файлы кофигурации (*.conf) в ручную, и применять параметры
@@ -86,7 +86,7 @@ WeeChat использует стандартные значения для вс
Если определено значение опции(не "null"), WeeChat будет использовать его.
Иначе используется стандартное значение ("irc.server_default.xxx").
-На пример: есть ники по умолчанию (базируются на логине un*x системы), и
+На пример: есть ники по умолчанию (базируются на логине un*x системы), и
вы можете переназначить их для сервера oftc используя команду:
/set irc.server.oftc.nicks "mynick1,mynick2,mynick3,mynick4,mynick5"
@@ -129,11 +129,11 @@ WeeChat использует стандартные значения для вс
/connect oftc
[NOTE]
-Эту команду можно использовать для подключения к серверу без его
-создания (должен ли я напомнить что вы можете посмотреть справку набрав
+Эту команду можно использовать для подключения к серверу без его
+создания (должен ли я напомнить что вы можете посмотреть справку набрав
`/help connect`?)
-По умолчанию, буфер сервера совмещен с буфером WeeChat. Для
+По умолчанию, буфер сервера совмещен с буфером WeeChat. Для
переключения между ними вы можете использовать Ctrl-X,
Можно отключить это совмещение, что бы получить раздельные
@@ -165,7 +165,7 @@ WeeChat использует стандартные значения для вс
Окно выводит содержимое буфера. По умолчанию, создается одно
окно с одним буфером. Если разделить окно, вы можете видеть
-много буферов одновременно.
+много буферов одновременно.
Команды для управления буферами и окнами:
@@ -197,7 +197,7 @@ WeeChat использует стандартные значения для вс
Исходя из ваших нужд, и клавиатуры, вы можете переназначить любые клавиши
исползуя команду `/key`.
-Полезная комбинация для поиска клавшиных кодов meta-k (alt-k)
+Полезная комбинация для поиска клавшиных кодов meta-k (alt-k)
На пример, что бы назначить на meta-y (alt-y) команду `/buffer close`:
@@ -225,7 +225,7 @@ WeeChat использует стандартные значения для вс
(Perl, Python, Lua, Ruby, Tcl). Эти плагины должны быть загружены командой
`/plugin`. Они добавляют такие команды как `/perl` для загрузки скриптов.
-Много пользовательских скриптов/плагинов доступно для
+Много пользовательских скриптов/плагинов доступно для
WeeChat: http://www.weechat.org/scripts
Простейший путь для установки скриптов - исползовать скрипт 'weeget.py':
diff --git a/po/Makevars b/po/Makevars
index ee19668d2..cb6f87695 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -2,6 +2,6 @@ DOMAIN = $(PACKAGE)
subdir = po
top_builddir = ..
XGETTEXT_OPTIONS = --keyword=_ --keyword=weechat_gettext --keyword=N_ --keyword=NG_:1,2 --keyword=weechat_ngettext:1,2 --no-location
-COPYRIGHT_HOLDER =
+COPYRIGHT_HOLDER =
EXTRA_LOCALE_CATEGORIES =
MSGID_BUGS_ADDRESS = flashcode@flashtux.org
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index 974a2e4b4..395f9c263 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -3395,9 +3395,11 @@ command_upgrade (void *data, struct t_gui_buffer *buffer,
(void) data;
(void) buffer;
(void) argv;
-
- /* it's forbidden to upgrade while there are some background process
- (hook type "process" or "connect") */
+
+ /*
+ * it is forbidden to upgrade while there are some background process
+ * (hook type "process" or "connect")
+ */
if (weechat_hooks[HOOK_TYPE_PROCESS] || weechat_hooks[HOOK_TYPE_CONNECT])
{
gui_chat_printf (NULL,
@@ -3821,7 +3823,7 @@ command_window (void *data, struct t_gui_buffer *buffer,
if ((argc == 1)
|| ((argc == 2) && (string_strcasecmp (argv[1], "list") == 0)))
{
- /* list all windows */
+ /* list all windows */
gui_chat_printf (NULL, "");
gui_chat_printf (NULL, _("Windows list:"));
diff --git a/src/core/wee-config-file.c b/src/core/wee-config-file.c
index 7d87b8a2e..cd146bfb7 100644
--- a/src/core/wee-config-file.c
+++ b/src/core/wee-config-file.c
@@ -1294,7 +1294,7 @@ config_file_option_set (struct t_config_option *option, const char *value,
rc = WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE;
}
- /* run callback if asked and value was changed */
+ /* run callback if asked and value was changed */
if ((rc == WEECHAT_CONFIG_OPTION_SET_OK_CHANGED)
&& run_callback && option->callback_change)
{
@@ -1344,7 +1344,7 @@ config_file_option_set_null (struct t_config_option *option, int run_callback)
}
}
- /* run callback if asked and value was changed */
+ /* run callback if asked and value was changed */
if ((rc == WEECHAT_CONFIG_OPTION_SET_OK_CHANGED)
&& run_callback && option->callback_change)
{
@@ -1892,8 +1892,10 @@ config_file_write_internal (struct t_config_file *config_file,
snprintf (filename, filename_length, "%s%s%s",
weechat_home, DIR_SEPARATOR, config_file->filename);
- /* build temporary filename, this temp file will be renamed to filename
- after write */
+ /*
+ * build temporary filename, this temp file will be renamed to filename
+ * after write
+ */
filename2 = malloc (filename_length + 32);
if (!filename2)
{
diff --git a/src/core/wee-config-file.h b/src/core/wee-config-file.h
index 7abb14ad0..ff0326219 100644
--- a/src/core/wee-config-file.h
+++ b/src/core/wee-config-file.h
@@ -124,7 +124,7 @@ struct t_config_option
int (*callback_check_value) /* called to check value before */
(void *data, /* assiging new value */
struct t_config_option *option,
- const char *value);
+ const char *value);
void *callback_check_value_data; /* data sent to check callback */
void (*callback_change) /* called when value is changed */
(void *data,
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index bccc339a0..02fbe1a33 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -872,7 +872,7 @@ config_weechat_notify_change_cb (void *data, struct t_config_option *option)
gui_buffer_notify_set_all ();
}
-/*
+/*
* config_weechat_notify_create_option_cb: callback to create option in "notify"
* section
*/
@@ -1989,7 +1989,7 @@ config_weechat_init_options ()
".dll",
#else
".so",
-#endif
+#endif
NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
config_plugin_path = config_file_new_option (
weechat_config_file, ptr_section,
diff --git a/src/core/wee-hook.c b/src/core/wee-hook.c
index 275213a0b..937f32400 100644
--- a/src/core/wee-hook.c
+++ b/src/core/wee-hook.c
@@ -394,8 +394,10 @@ hook_command_build_completion (struct t_hook_command *hook_command)
hook_command->cplt_template_num_args_concat = 0;
for (i = 0; i < hook_command->cplt_num_templates; i++)
{
- /* build static part of template: it's first argument(s) which does not
- contain "%" or "|" */
+ /*
+ * build static part of template: it's first argument(s) which does not
+ * contain "%" or "|"
+ */
last_space = NULL;
ptr_template = hook_command->cplt_templates[i];
while (ptr_template && ptr_template[0])
@@ -433,10 +435,11 @@ hook_command_build_completion (struct t_hook_command *hook_command)
hook_command->cplt_template_num_args_concat = hook_command->cplt_template_num_args[i];
}
- /* build strings with concatentaion of items from different templates
- for each argument: these strings will be used when completing argument
- if we can't find which template to use (for example for first argument)
- */
+ /*
+ * build strings with concatentaion of items from different templates
+ * for each argument: these strings will be used when completing argument
+ * if we can't find which template to use (for example for first argument)
+ */
if (hook_command->cplt_template_num_args_concat == 0)
hook_command->cplt_template_args_concat = NULL;
else
@@ -636,9 +639,11 @@ hook_command_exec (struct t_gui_buffer *buffer, int any_plugin,
{
if (!hook_for_plugin && (number_for_other_plugin > 1))
{
- /* ambiguous: no command for current plugin, but more than one
- command was found for other plugins, we don't know which one to
- run! */
+ /*
+ * ambiguous: no command for current plugin, but more than one
+ * command was found for other plugins, we don't know which one to
+ * run!
+ */
rc = -2;
}
else
@@ -813,9 +818,11 @@ hook_timer_init (struct t_hook *hook)
if ((HOOK_TIMER(hook, interval) >= 1000)
&& (HOOK_TIMER(hook, align_second) > 0))
{
- /* here we should use 0, but with this value timer is sometimes called
- before second has changed, so for displaying time, it may display
- 2 times the same second, that's why we use 1000 micro seconds */
+ /*
+ * here we should use 0, but with this value timer is sometimes called
+ * before second has changed, so for displaying time, it may display
+ * 2 times the same second, that's why we use 1000 micro seconds
+ */
HOOK_TIMER(hook, last_exec).tv_usec = 1000;
HOOK_TIMER(hook, last_exec).tv_sec =
HOOK_TIMER(hook, last_exec).tv_sec -
@@ -887,8 +894,10 @@ hook_timer_check_system_clock ()
now = time (NULL);
- /* check if difference with previous time is more than 10 seconds
- If it is, then consider it's clock skew and reinitialize all timers */
+ /*
+ * check if difference with previous time is more than 10 seconds:
+ * if it is, then consider it's clock skew and reinitialize all timers
+ */
diff_time = now - hook_last_system_time;
if ((diff_time <= -10) || (diff_time >= 10))
{
@@ -973,8 +982,10 @@ hook_timer_time_to_next (struct timeval *tv_timeout)
tv_timeout->tv_usec = 1000000 + diff_usec;
}
- /* to detect clock skew, we ensure there's a call to timers every
- 2 seconds max */
+ /*
+ * to detect clock skew, we ensure there's a call to timers every
+ * 2 seconds max
+ */
if (tv_timeout->tv_sec > 2)
{
tv_timeout->tv_sec = 2;
@@ -1235,8 +1246,10 @@ hook_process_child (struct t_hook *hook_process)
{
char *exec_args[4] = { "sh", "-c", NULL, NULL };
- /* close stdin, so that process will fail to read stdin (process reading
- stdin should not be run inside WeeChat!) */
+ /*
+ * close stdin, so that process will fail to read stdin (process reading
+ * stdin should not be run inside WeeChat!)
+ */
close (STDIN_FILENO);
/* redirect stdout/stderr to pipe (so that father process can read them) */
@@ -2371,13 +2384,15 @@ unhook (struct t_hook *hook)
free (HOOK_INFOLIST(hook, args_description));
break;
case HOOK_NUM_TYPES:
- /* this constant is used to count types only,
- it is never used as type */
+ /*
+ * this constant is used to count types only,
+ * it is never used as type
+ */
break;
}
free (hook->hook_data);
hook->hook_data = NULL;
- }
+ }
/* remove hook from list (if there's no hook exec pending) */
if (hook_exec_recursion == 0)
@@ -2724,8 +2739,10 @@ hook_add_to_infolist_type (struct t_infolist *infolist,
}
break;
case HOOK_NUM_TYPES:
- /* this constant is used to count types only,
- it is never used as type */
+ /*
+ * this constant is used to count types only,
+ * it is never used as type
+ */
break;
}
}
@@ -2966,8 +2983,10 @@ hook_print_log ()
}
break;
case HOOK_NUM_TYPES:
- /* this constant is used to count types only,
- it is never used as type */
+ /*
+ * this constant is used to count types only,
+ * it is never used as type
+ */
break;
}
log_printf (" prev_hook . . . . . . . : 0x%lx", ptr_hook->prev_hook);
diff --git a/src/core/wee-input.c b/src/core/wee-input.c
index c47ce6b7f..3ff09c4f6 100644
--- a/src/core/wee-input.c
+++ b/src/core/wee-input.c
@@ -128,8 +128,10 @@ input_exec_command (struct t_gui_buffer *buffer,
command + 1);
break;
default: /* no command hooked */
- /* if unknown commands are accepted by this buffer, just send
- input text as data to buffer, otherwise display error */
+ /*
+ * if unknown commands are accepted by this buffer, just send
+ * input text as data to buffer, otherwise display error
+ */
if (buffer->input_get_unknown_commands)
{
input_exec_data (buffer, string);
@@ -172,8 +174,10 @@ input_data (struct t_gui_buffer *buffer, const char *data)
ptr_data_for_buffer = string_input_for_buffer (ptr_data);
if (ptr_data_for_buffer)
{
- /* input string is NOT a command, send it to buffer input
- callback */
+ /*
+ * input string is NOT a command, send it to buffer input
+ * callback
+ */
if (string_is_command_char (ptr_data_for_buffer))
{
char_size = utf8_char_size (ptr_data_for_buffer);
diff --git a/src/core/wee-network.c b/src/core/wee-network.c
index 13d38c233..8ec41e36f 100644
--- a/src/core/wee-network.c
+++ b/src/core/wee-network.c
@@ -135,7 +135,7 @@ network_pass_httpproxy (struct t_proxy *proxy, int sock, const char *address,
"CONNECT %s:%d HTTP/1.0\r\nProxy-Authorization: Basic %s\r\n\r\n",
address, port, authbuf_base64);
}
- else
+ else
{
/* no authentification */
n = snprintf (buffer, sizeof (buffer),
@@ -250,7 +250,7 @@ int
network_pass_socks5proxy (struct t_proxy *proxy, int sock, const char *address,
int port)
{
- /*
+ /*
* socks5 protocol is explained in RFC 1928
* socks5 authentication with username/pass is explained in RFC 1929
*/
@@ -277,8 +277,9 @@ network_pass_socks5proxy (struct t_proxy *proxy, int sock, const char *address,
if (CONFIG_STRING(proxy->options[PROXY_OPTION_USERNAME])
&& CONFIG_STRING(proxy->options[PROXY_OPTION_USERNAME])[0])
{
- /* with authentication */
- /* -> socks server must respond with :
+ /*
+ * with authentication
+ * -> socks server must respond with :
* - socks version (buffer[0]) = 5 => socks5
* - socks method (buffer[1]) = 2 => authentication
*/
@@ -310,8 +311,9 @@ network_pass_socks5proxy (struct t_proxy *proxy, int sock, const char *address,
}
else
{
- /* without authentication */
- /* -> socks server must respond with :
+ /*
+ * without authentication
+ * -> socks server must respond with :
* - socks version (buffer[0]) = 5 => socks5
* - socks method (buffer[1]) = 0 => no authentication
*/
@@ -347,7 +349,8 @@ network_pass_socks5proxy (struct t_proxy *proxy, int sock, const char *address,
switch (buffer[3])
{
case 1:
- /* ipv4
+ /*
+ * ipv4
* server socks return server bound address and port
* address of 4 bytes and port of 2 bytes (= 6 bytes)
*/
@@ -355,19 +358,21 @@ network_pass_socks5proxy (struct t_proxy *proxy, int sock, const char *address,
return 0;
break;
case 3:
- /* domainname
+ /*
+ * domainname
* server socks return server bound address and port
*/
- /* reading address length */
+ /* read address length */
if (recv (sock, buffer, 1, 0) != 1)
- return 0;
+ return 0;
addr_len = buffer[0];
- /* reading address + port = addr_len + 2 */
+ /* read address + port = addr_len + 2 */
if (recv (sock, buffer, addr_len + 2, 0) != (addr_len + 2))
return 0;
break;
case 4:
- /* ipv6
+ /*
+ * ipv6
* server socks return server bound address and port
* address of 16 bytes and port of 2 bytes (= 18 bytes)
*/
@@ -856,9 +861,10 @@ network_connect_with_fork (struct t_hook *hook_connect)
HOOK_CONNECT(hook_connect, child_write) = child_pipe[1];
#ifdef __CYGWIN__
- /* connection may block under Cygwin, there's no other known way
- to do better today, since connect() in child process seems not to work
- any suggestion is welcome to improve that!
+ /*
+ * connection may block under Cygwin, there's no other known way
+ * to do better today, since connect() in child process seems not to work
+ * any suggestion is welcome to improve that!
*/
network_connect_child (hook_connect);
network_connect_child_read_cb (hook_connect, 0);
diff --git a/src/core/wee-string.c b/src/core/wee-string.c
index a0ee93505..8747d9ee5 100644
--- a/src/core/wee-string.c
+++ b/src/core/wee-string.c
@@ -653,7 +653,7 @@ string_has_highlight (const char *string, const char *highlight_words)
startswith = ((match == msg) || (!string_is_word_char (match_pre)));
endswith = ((!match_post[0]) || (!string_is_word_char (match_post)));
if ((wildcard_start && wildcard_end) ||
- (!wildcard_start && !wildcard_end &&
+ (!wildcard_start && !wildcard_end &&
startswith && endswith) ||
(wildcard_start && endswith) ||
(wildcard_end && startswith))
@@ -1156,8 +1156,10 @@ string_iconv_to_internal (const char *charset, const char *string)
if (!input)
return NULL;
- /* optimize for UTF-8: if charset is NULL => we use term charset =>
- if ths charset is already UTF-8, then no iconv needed */
+ /*
+ * optimized for UTF-8: if charset is NULL => we use term charset => if
+ * this charset is already UTF-8, then no iconv is needed
+ */
if (local_utf8 && (!charset || !charset[0]))
return input;
@@ -1194,8 +1196,10 @@ string_iconv_from_internal (const char *charset, const char *string)
if (!input)
return NULL;
- /* optimize for UTF-8: if charset is NULL => we use term charset =>
- if ths charset is already UTF-8, then no iconv needed */
+ /*
+ * optimized for UTF-8: if charset is NULL => we use term charset => if
+ * this charset is already UTF-8, then no iconv needed
+ */
if (local_utf8 && (!charset || !charset[0]))
return input;
@@ -1458,15 +1462,19 @@ string_input_for_buffer (const char *string)
if (strncmp (string, "/*", 2) == 0)
return string;
- /* special case if string starts with '/': to allow to paste a path line
- "/path/to/file.txt", we check if next '/' is after a space or not */
+ /*
+ * special case if string starts with '/': to allow to paste a path line
+ * "/path/to/file.txt", we check if next '/' is after a space or not
+ */
if (string[0] == '/')
{
pos_slash = strchr (string + 1, '/');
pos_space = strchr (string + 1, ' ');
- /* if there's no other '/' of if '/' is after first space,
- then it is a command, and return NULL */
+ /*
+ * if there's no other '/' of if '/' is after first space,
+ * then it is a command, and return NULL
+ */
if (!pos_slash || (pos_space && pos_slash > pos_space))
return NULL;
diff --git a/src/core/wee-upgrade.c b/src/core/wee-upgrade.c
index c468763cd..46f98e2e9 100644
--- a/src/core/wee-upgrade.c
+++ b/src/core/wee-upgrade.c
@@ -332,8 +332,10 @@ upgrade_weechat_read_cb (void *data,
}
else
{
- /* create buffer if it was created by a plugin (ie not
- WeeChat main buffer) */
+ /*
+ * create buffer if it was created by a plugin (ie not
+ * WeeChat main buffer)
+ */
ptr_buffer_for_merge = last_gui_buffer;
upgrade_current_buffer = gui_buffer_new (
NULL,
diff --git a/src/core/wee-util.c b/src/core/wee-util.c
index e1bdc453d..ec7a6784a 100644
--- a/src/core/wee-util.c
+++ b/src/core/wee-util.c
@@ -84,7 +84,7 @@ util_timeval_diff (struct timeval *tv1, struct timeval *tv2)
}
/*
- * util_timeval_add: add interval (in milliseconds) to a timeval struct
+ * util_timeval_add: add interval (in milliseconds) to a timeval struct
*/
void
diff --git a/src/core/weechat.c b/src/core/weechat.c
index a1f603be5..c1d47f28f 100644
--- a/src/core/weechat.c
+++ b/src/core/weechat.c
@@ -203,10 +203,12 @@ weechat_parse_args (int argc, char *argv[])
}
else if (strcmp (argv[i], "--no-dlclose") == 0)
{
- /* tools like valgrind work better when dlclose() is not done
- after plugins are unloaded, they can display stack for plugins,
- otherwise you'll see "???" in stack for functions of unloaded
- plugins -- this option should not be used for other purposes! */
+ /*
+ * tools like valgrind work better when dlclose() is not done
+ * after plugins are unloaded, they can display stack for plugins,
+ * otherwise you'll see "???" in stack for functions of unloaded
+ * plugins -- this option should not be used for other purposes!
+ */
weechat_plugin_no_dlclose = 1;
}
else if ((strcmp (argv[i], "-p") == 0)
@@ -386,7 +388,7 @@ main (int argc, char *argv[])
util_catch_signal (SIGSEGV,
&debug_sigsegv); /* crash dump for SIGSEGV signal */
hook_init (); /* initialize hooks */
- debug_init (); /* hook signals for debug */
+ debug_init (); /* hook signals for debug */
gui_main_pre_init (&argc, &argv); /* pre-initiliaze interface */
weechat_init_vars (); /* initialize some variables */
command_init (); /* initialize WeeChat commands */
@@ -409,7 +411,7 @@ main (int argc, char *argv[])
weechat_welcome_message (); /* display WeeChat welcome message */
command_startup (0); /* command executed before plugins */
plugin_init (weechat_auto_load_plugins, /* init plugin interface(s) */
- argc, argv);
+ argc, argv);
command_startup (1); /* command executed after plugins */
gui_layout_window_apply (gui_layout_windows, -1); /* apply saved layout */
if (weechat_upgrading)
diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
index e6d454610..923013e46 100644
--- a/src/gui/curses/CMakeLists.txt
+++ b/src/gui/curses/CMakeLists.txt
@@ -49,9 +49,9 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
- IF(HAVE_BACKTRACE)
+ IF(HAVE_BACKTRACE)
LIST(APPEND EXTRA_LIBS "execinfo")
- ENDIF(HAVE_BACKTRACE)
+ ENDIF(HAVE_BACKTRACE)
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
IF(ICONV_LIBRARY)
diff --git a/src/gui/curses/gui-curses-bar-window.c b/src/gui/curses/gui-curses-bar-window.c
index 177a4d72d..a0565d6c7 100644
--- a/src/gui/curses/gui-curses-bar-window.c
+++ b/src/gui/curses/gui-curses-bar-window.c
@@ -444,8 +444,10 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window,
GUI_COLOR_BAR_MOVE_CURSOR_CHAR);
}
- /* these values will be overwritten later (by gui_bar_window_print_string)
- if cursor has to move somewhere in bar window */
+ /*
+ * these values will be overwritten later (by gui_bar_window_print_string)
+ * if cursor has to move somewhere in bar window
+ */
bar_window->cursor_x = -1;
bar_window->cursor_y = -1;
@@ -562,12 +564,13 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window,
diff = length_screen_before_cursor - chars_available;
if (diff > 0)
{
- /* TODO: keep some spaces after end of input
- for example by adding something to diff, like:
- diff += (9 - (diff % 10));
- but then scroll position has to be saved
- (in bar window ?)
- */
+ /*
+ * TODO: keep some spaces after end of input
+ * for example by adding something to diff, like:
+ * diff += (9 - (diff % 10));
+ * but then scroll position has to be saved
+ * (in bar window ?)
+ */
/* compute new start for displaying input */
new_start_input = pos_after_start_input + gui_chat_string_real_pos (pos_after_start_input, diff);
@@ -676,8 +679,10 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window,
CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]));
}
- /* move cursor if it was asked in an item content (input_text does that
- to move cursor in user input text) */
+ /*
+ * move cursor if it was asked in an item content (input_text does that
+ * to move cursor in user input text)
+ */
if ((!window || (gui_current_window == window))
&& (bar_window->cursor_x >= 0) && (bar_window->cursor_y >= 0))
{
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index 69d677924..64d905ee3 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -701,7 +701,7 @@ gui_chat_display_time_and_prefix (struct t_gui_window *window,
gui_window_set_weechat_color (GUI_WINDOW_OBJECTS(window)->win_chat,
GUI_COLOR_CHAT_HIGHLIGHT);
}
- }
+ }
/* not enough space to display full prefix? => truncate it! */
if ((CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
@@ -1293,8 +1293,10 @@ gui_chat_draw (struct t_gui_buffer *buffer, int erase)
void
gui_chat_draw_line (struct t_gui_buffer *buffer, struct t_gui_line *line)
{
- /* This function does nothing in Curses GUI,
- line will be displayed by gui_buffer_draw_chat() */
+ /*
+ * This function does nothing in Curses GUI,
+ * line will be displayed by gui_buffer_draw_chat()
+ */
(void) buffer;
(void) line;
}
diff --git a/src/gui/curses/gui-curses-color.c b/src/gui/curses/gui-curses-color.c
index 887279da0..fdd5993b1 100644
--- a/src/gui/curses/gui-curses-color.c
+++ b/src/gui/curses/gui-curses-color.c
@@ -187,13 +187,16 @@ void
gui_color_init_pairs ()
{
int i, fg, bg, num_colors;
-
- /* depending on terminal and $TERM value, we can have for example:
- terminal $TERM colors pairs
- urxvt rxvt-unicode 88 256
- urxvt xterm-256color 256 32767
- screen screen 8 64
- screen screen-256color 256 32767
+
+ /*
+ * depending on terminal and $TERM value, we can have for example:
+ *
+ * terminal | $TERM | colors | pairs
+ * ---------+-----------------+--------+------
+ * urxvt | rxvt-unicode | 88 | 256
+ * urxvt | xterm-256color | 256 | 32767
+ * screen | screen | 8 | 64
+ * screen | screen-256color | 256 | 32767
*/
if (has_colors ())
@@ -211,8 +214,10 @@ gui_color_init_pairs ()
/* disable white on white, replaced by black on white */
init_pair (gui_color_last_pair, -1, -1);
- /* white on default bg is default (-1) (for terminals with white/light
- background) */
+ /*
+ * white on default bg is default (-1) (for terminals with white/light
+ * background)
+ */
if (!CONFIG_BOOLEAN(config_look_color_real_white))
init_pair (COLOR_WHITE + 1, -1, -1);
}
diff --git a/src/gui/curses/gui-curses-keyboard.c b/src/gui/curses/gui-curses-keyboard.c
index 4b77bca54..38ee9a999 100644
--- a/src/gui/curses/gui-curses-keyboard.c
+++ b/src/gui/curses/gui-curses-keyboard.c
@@ -204,8 +204,10 @@ gui_keyboard_flush ()
int i, key, insert_ok;
char key_str[32], *key_utf, *input_old;
- /* if there's no paste pending, then we use buffer and do actions
- according to keys */
+ /*
+ * if there's no paste pending, then we use buffer and do actions
+ * according to keys
+ */
if (!gui_keyboard_paste_pending)
{
if (gui_keyboard_buffer_size > 0)
@@ -434,8 +436,10 @@ gui_keyboard_read_cb (void *data, int fd)
}
else
{
- /* detect user paste or large amount of text
- if so, ask user what to do */
+ /*
+ * detect user paste or large amount of text
+ * if so, ask user what to do
+ */
if (CONFIG_INTEGER(config_look_paste_max_lines) > 0)
{
paste_lines = gui_keyboard_get_paste_lines ();
diff --git a/src/gui/curses/gui-curses-main.c b/src/gui/curses/gui-curses-main.c
index 70dddcdf1..44ba81ec5 100644
--- a/src/gui/curses/gui-curses-main.c
+++ b/src/gui/curses/gui-curses-main.c
@@ -138,8 +138,10 @@ gui_main_init ()
gui_window_set_title (PACKAGE_NAME " " PACKAGE_VERSION);
}
- /* create bar windows for root bars (they were read from config,
- but no window was created (GUI was not initialized) */
+ /*
+ * create bar windows for root bars (they were read from config,
+ * but no window was created (GUI was not initialized)
+ */
for (ptr_bar = gui_bars; ptr_bar; ptr_bar = ptr_bar->next_bar)
{
if ((CONFIG_INTEGER(ptr_bar->options[GUI_BAR_OPTION_TYPE]) == GUI_BAR_TYPE_ROOT)
@@ -190,11 +192,12 @@ gui_main_signal_sigterm ()
void
gui_main_signal_sighup ()
{
- /* SIGHUP signal is received when terminal is closed (exit of WeeChat
- without using /quit command), that's why we set only flag to reload
- config files later (when terminal is closed, config files are NOT
- reloaded, but they are if signal SIGHUP is sent to WeeChat by user)
- */
+ /*
+ * SIGHUP signal is received when terminal is closed (exit of WeeChat
+ * without using /quit command), that's why we set only flag to reload
+ * config files later (when terminal is closed, config files are NOT
+ * reloaded, but they are if signal SIGHUP is sent to WeeChat by user)
+ */
gui_reload_config = 1;
}
diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c
index b5030362e..9489cfe60 100644
--- a/src/gui/curses/gui-curses-window.c
+++ b/src/gui/curses/gui-curses-window.c
@@ -771,7 +771,7 @@ gui_window_scroll_up (struct t_gui_window *window)
break;
case GUI_BUFFER_NUM_TYPES:
break;
- }
+ }
}
/*
diff --git a/src/gui/gtk/CMakeLists.txt b/src/gui/gtk/CMakeLists.txt
index 348ef2e16..d64ce1e1a 100644
--- a/src/gui/gtk/CMakeLists.txt
+++ b/src/gui/gtk/CMakeLists.txt
@@ -29,7 +29,7 @@ FIND_PACKAGE(PkgConfig)
IF(PKG_CONFIG_FOUND)
pkg_check_modules(GTK2 gtk+-x11-2.0)
IF(GTK2_FOUND)
- INCLUDE_DIRECTORIES( ${GTK2_INCLUDE_DIRS} )
+ INCLUDE_DIRECTORIES( ${GTK2_INCLUDE_DIRS} )
LIST(APPEND EXTRA_LIBS ${GTK2_LIBRARIES})
# ELSE(GTK2_FOUND)
# MESSAGE(FATAL_ERROR "Missing dependency, aborting configuration phase")
diff --git a/src/gui/gtk/gui-gtk-chat.c b/src/gui/gtk/gui-gtk-chat.c
index 363fecede..86d7a8e21 100644
--- a/src/gui/gtk/gui-gtk-chat.c
+++ b/src/gui/gtk/gui-gtk-chat.c
@@ -144,7 +144,7 @@ gui_chat_reset_color_style (struct t_gui_window *window)
void
gui_chat_set_color (struct t_gui_window *window, int fg, int bg)
{
- /* TODO: write this function for Gtk */
+ /* TODO: write this function for Gtk */
/*if (((fg == -1) || (fg == 99))
&& ((bg == -1) || (bg == 99)))
wattron (window->win_chat, COLOR_PAIR(63));
diff --git a/src/gui/gtk/gui-gtk-main.c b/src/gui/gtk/gui-gtk-main.c
index b064b3d0b..acffeea95 100644
--- a/src/gui/gtk/gui-gtk-main.c
+++ b/src/gui/gtk/gui-gtk-main.c
@@ -195,8 +195,10 @@ gui_main_init ()
gui_window_set_title (PACKAGE_NAME " " PACKAGE_VERSION);
}
- /* create bar windows for root bars (they were read from config,
- but no window was created (GUI was not initialized) */
+ /*
+ * create bar windows for root bars (they were read from config,
+ * but no window was created (GUI was not initialized)
+ */
for (ptr_bar = gui_bars; ptr_bar; ptr_bar = ptr_bar->next_bar)
{
if ((CONFIG_INTEGER(ptr_bar->options[GUI_BAR_OPTION_TYPE]) == GUI_BAR_TYPE_ROOT)
diff --git a/src/gui/gtk/gui-gtk-window.c b/src/gui/gtk/gui-gtk-window.c
index c329b1c9f..5c1cf0854 100644
--- a/src/gui/gtk/gui-gtk-window.c
+++ b/src/gui/gtk/gui-gtk-window.c
@@ -490,7 +490,7 @@ gui_window_split_horizontal (struct t_gui_window *window, int percentage)
if ((percentage > 0) && (percentage <= 100))
{
- new_window = gui_window_new (window, window->buffer,
+ new_window = gui_window_new (window, window->buffer,
window->win_x, window->win_y,
window->win_width, height1,
100, percentage);
diff --git a/src/gui/gtk/gui-gtk.h b/src/gui/gtk/gui-gtk.h
index 954b74c77..bf92d2502 100644
--- a/src/gui/gtk/gui-gtk.h
+++ b/src/gui/gtk/gui-gtk.h
@@ -41,8 +41,10 @@ struct t_gui_line;
#define COLOR_YELLOW 6
#define COLOR_WHITE 7
-/* shift ncurses colors for compatibility with colors
- in IRC messages (same as other IRC clients) */
+/*
+ * shift ncurses colors for compatibility with colors
+ * in IRC messages (same as other IRC clients)
+ */
#define WEECHAT_COLOR_BLACK COLOR_BLACK
#define WEECHAT_COLOR_RED COLOR_BLUE
diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c
index 20ae9fc5e..afee0d9a6 100644
--- a/src/gui/gui-bar-item.c
+++ b/src/gui/gui-bar-item.c
@@ -1257,9 +1257,11 @@ gui_bar_item_timer_cb (void *data, int remaining_calls)
local_time) == 0)
return WEECHAT_RC_OK;
- /* we update item only if it changed since last time
- for example if time is only hours:minutes, we'll update
- only when minute changed */
+ /*
+ * we update item only if it changed since last time
+ * for example if time is only hours:minutes, we'll update
+ * only when minute changed
+ */
if (strcmp (new_item_time_text, item_time_text) != 0)
{
snprintf (item_time_text, sizeof (item_time_text),
diff --git a/src/gui/gui-bar.c b/src/gui/gui-bar.c
index 0b04700a8..536678bf7 100644
--- a/src/gui/gui-bar.c
+++ b/src/gui/gui-bar.c
@@ -430,10 +430,12 @@ gui_bar_check_conditions_for_window (struct t_gui_bar *bar,
}
}
- /* call a modifier that will tell us if bar is displayed or not,
- for example it can be used to display nicklist on some buffers
- only, using a script that implements this modifier and return "1"
- to display bar, "0" to hide it */
+ /*
+ * call a modifier that will tell us if bar is displayed or not,
+ * for example it can be used to display nicklist on some buffers
+ * only, using a script that implements this modifier and return "1"
+ * to display bar, "0" to hide it
+ */
snprintf (str_modifier, sizeof (str_modifier),
"bar_condition_%s", bar->name);
snprintf (str_window, sizeof (str_window),
@@ -609,7 +611,7 @@ gui_bar_draw (struct t_gui_bar *bar)
struct t_gui_bar_window *ptr_bar_win;
if (!CONFIG_BOOLEAN(bar->options[GUI_BAR_OPTION_HIDDEN]))
- {
+ {
if (bar->bar_window)
{
/* root bar */
diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index f2df9dbf2..3da7322bc 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -488,8 +488,10 @@ gui_buffer_new (struct t_weechat_plugin *plugin,
/* set notify level */
new_buffer->notify = gui_buffer_notify_get (new_buffer);
- /* check if this buffer should be assigned to a window,
- according to windows layout saved */
+ /*
+ * check if this buffer should be assigned to a window,
+ * according to windows layout saved
+ */
gui_layout_window_check_buffer (new_buffer);
if (first_buffer_creation)
@@ -1003,9 +1005,11 @@ gui_buffer_set (struct t_gui_buffer *buffer, const char *property,
}
else if (string_strcasecmp (property, "display") == 0)
{
- /* if it is auto-switch to a buffer, then we don't set read marker,
- otherwise we reset it (if current buffer is not displayed) after
- switch */
+ /*
+ * if it is auto-switch to a buffer, then we don't set read marker,
+ * otherwise we reset it (if current buffer is not displayed) after
+ * switch
+ */
gui_window_switch_to_buffer (gui_current_window, buffer,
(string_strcasecmp (value, "auto") == 0) ?
0 : 1);
@@ -1376,8 +1380,10 @@ gui_buffer_search_by_partial_name (const char *plugin, const char *name)
if (buffer_partial_match[0])
return buffer_partial_match[0];
- /* return buffer partially matching in name
- (may be NULL if no buffer was found) */
+ /*
+ * return buffer partially matching in name
+ * (may be NULL if no buffer was found)
+ */
return buffer_partial_match[1];
}
@@ -1538,8 +1544,10 @@ gui_buffer_close (struct t_gui_buffer *buffer)
if (!weechat_quit)
{
- /* find other buffer to display: previously visited buffer if current
- window is displaying buffer, or buffer # - 1 */
+ /*
+ * find other buffer to display: previously visited buffer if current
+ * window is displaying buffer, or buffer # - 1
+ */
ptr_buffer_visited = NULL;
if (CONFIG_BOOLEAN(config_look_jump_previous_buffer_when_closing)
&& gui_current_window && (gui_current_window->buffer == buffer))
diff --git a/src/gui/gui-buffer.h b/src/gui/gui-buffer.h
index 77ded8b52..4ff35726d 100644
--- a/src/gui/gui-buffer.h
+++ b/src/gui/gui-buffer.h
@@ -61,13 +61,17 @@ struct t_gui_buffer
{
struct t_weechat_plugin *plugin; /* plugin which created this buffer */
/* (NULL for a WeeChat buffer) */
- /* when upgrading, plugins are not loaded, so we use next variable
- to store plugin name, then restore plugin pointer when plugin is
- loaded */
+ /*
+ * when upgrading, plugins are not loaded, so we use next variable
+ * to store plugin name, then restore plugin pointer when plugin is
+ * loaded
+ */
char *plugin_name_for_upgrade; /* plugin name when upgrading */
- /* when upgrading, we use this pointer to remember that this buffer
- must merge with another buffer (it's done when all buffers are
- restored) */
+ /*
+ * when upgrading, we use this pointer to remember that this buffer
+ * must merge with another buffer (it's done when all buffers are
+ * restored)
+ */
struct t_gui_buffer *merge_for_upgrade;
int number; /* buffer number (for jump/switch) */
@@ -103,7 +107,7 @@ struct t_gui_buffer
int chat_refresh_needed; /* refresh for chat is needed ? */
/* (1=refresh, 2=erase+refresh) */
- /* nicklist */
+ /* nicklist */
int nicklist; /* = 1 if nicklist is enabled */
int nicklist_case_sensitive; /* nicks are case sensitive ? */
struct t_gui_nick_group *nicklist_root; /* pointer to groups root */
diff --git a/src/gui/gui-chat.c b/src/gui/gui-chat.c
index 8bafd0458..3a346a52e 100644
--- a/src/gui/gui-chat.c
+++ b/src/gui/gui-chat.c
@@ -508,8 +508,10 @@ gui_chat_printf_date_tags (struct t_gui_buffer *buffer, time_t date,
{
if (!new_msg[0] && pos[0])
{
- /* modifier returned empty message, then we'll not
- print anything */
+ /*
+ * modifier returned empty message, then we'll not
+ * print anything
+ */
free (new_msg);
return;
}
diff --git a/src/gui/gui-completion.c b/src/gui/gui-completion.c
index ef29cabc7..dd23cd0f7 100644
--- a/src/gui/gui-completion.c
+++ b/src/gui/gui-completion.c
@@ -65,7 +65,7 @@ gui_completion_buffer_init (struct t_gui_completion *completion,
completion->base_command_arg_index = 0;
completion->base_word = NULL;
completion->base_word_pos = 0;
- completion->position = -1;
+ completion->position = -1;
completion->args = NULL;
completion->direction = 0;
completion->add_space = 1;
@@ -603,7 +603,7 @@ gui_completion_list_add_filename_cb (void *data,
if (strcmp (entry->d_name, ".") == 0 || strcmp (entry->d_name, "..") == 0)
continue;
- snprintf (buf, buf_len, "%s%s%s",
+ snprintf (buf, buf_len, "%s%s%s",
d_name, DIR_SEPARATOR, entry->d_name);
if (stat (buf, &statbuf) == -1)
continue;
@@ -916,8 +916,10 @@ gui_completion_list_add_plugins_commands_cb (void *data,
ptr_plugin = NULL;
if (string_strcasecmp (plugin_name, PLUGIN_CORE) != 0)
{
- /* plugin name is different from "core", then search it in
- plugin list */
+ /*
+ * plugin name is different from "core", then search it in
+ * plugin list
+ */
ptr_plugin = plugin_search (plugin_name);
if (!ptr_plugin)
return WEECHAT_RC_OK;
@@ -1425,8 +1427,10 @@ gui_completion_get_template_for_args (struct t_gui_completion *completion,
{
int matching_template;
- /* if template refers to another command, search this command and use its
- template */
+ /*
+ * if template refers to another command, search this command and use its
+ * template
+ */
if ((HOOK_COMMAND(hook_command, cplt_templates)[0][0] == '%')
&& (HOOK_COMMAND(hook_command, cplt_templates)[0][1] == '%')
&& (HOOK_COMMAND(hook_command, cplt_templates)[0][1]))
@@ -1679,8 +1683,10 @@ gui_completion_find_context (struct t_gui_completion *completion,
}
}
- /* auto completion with nothing as base word is disabled,
- in order to prevent completion when pasting messages with [tab] inside */
+ /*
+ * auto completion with nothing as base word is disabled,
+ * in order to prevent completion when pasting messages with [tab] inside
+ */
if ((completion->context == GUI_COMPLETION_AUTO)
&& ((!completion->base_word) || (!completion->base_word[0])))
{
@@ -1931,8 +1937,10 @@ gui_completion_complete (struct t_gui_completion *completion)
if (CONFIG_BOOLEAN(config_completion_partial_completion_alert))
printf ("\a");
- /* send "partial_completion" signal, to display possible
- completions in bar item */
+ /*
+ * send "partial_completion" signal, to display possible
+ * completions in bar item
+ */
gui_completion_partial_build_list (completion,
common_prefix_size);
hook_signal_send ("partial_completion",
@@ -1956,8 +1964,10 @@ gui_completion_complete (struct t_gui_completion *completion)
ptr_item = ptr_item->next_item;
}
- /* if we was on last completion in list, then recomplete, starting from
- first matching item */
+ /*
+ * if we was on last completion in list, then recomplete, starting from
+ * first matching item
+ */
if (completion->word_found && (completion->position >= 0))
{
free (completion->word_found);
diff --git a/src/gui/gui-input.c b/src/gui/gui-input.c
index dce6be51b..73f933bb4 100644
--- a/src/gui/gui-input.c
+++ b/src/gui/gui-input.c
@@ -368,8 +368,10 @@ gui_input_complete (struct t_gui_buffer *buffer)
buffer->completion->position_replace) +
utf8_strlen (buffer->completion->word_found);
- /* position is < 0 this means only one word was found to complete,
- so reinit to stop completion */
+ /*
+ * position is < 0 this means only one word was found to complete,
+ * so reinit to stop completion
+ */
if (buffer->completion->position >= 0)
buffer->completion->position = utf8_real_pos (buffer->input_buffer,
buffer->input_buffer_pos);
diff --git a/src/gui/gui-keyboard.c b/src/gui/gui-keyboard.c
index 1bc5c245e..a6f12f4ee 100644
--- a/src/gui/gui-keyboard.c
+++ b/src/gui/gui-keyboard.c
@@ -540,8 +540,10 @@ gui_keyboard_pressed (const char *key_str)
gui_key_combo_buffer[0] = '\0';
- /* if this is first key and not found (even partial) => return 1
- else return 0 (= silently discard sequence of bad keys) */
+ /*
+ * if this is first key and not found (even partial) => return 1
+ * else return 0 (= silently discard sequence of bad keys)
+ */
return first_key;
}
@@ -701,7 +703,7 @@ gui_keyboard_paste_cancel ()
}
/*
- * gui_keyboard_end: end keyboard (free some data)
+ * gui_keyboard_end: end keyboard (free some data)
*/
void
diff --git a/src/gui/gui-line.c b/src/gui/gui-line.c
index ea25cc358..29404fecb 100644
--- a/src/gui/gui-line.c
+++ b/src/gui/gui-line.c
@@ -363,8 +363,10 @@ gui_line_has_highlight (struct t_gui_line *line)
int rc, i;
char *msg_no_color;
- /* highlights are disabled on this buffer? (special value "-" means that
- buffer does not want any highlight) */
+ /*
+ * highlights are disabled on this buffer? (special value "-" means that
+ * buffer does not want any highlight)
+ */
if (line->data->buffer->highlight_words
&& (strcmp (line->data->buffer->highlight_words, "-") == 0))
return 0;
@@ -376,8 +378,10 @@ gui_line_has_highlight (struct t_gui_line *line)
return 0;
}
- /* check that line matches highlight tags, if any (if no tag is specified,
- then any tag is allowed) */
+ /*
+ * check that line matches highlight tags, if any (if no tag is specified,
+ * then any tag is allowed)
+ */
if (line->data->buffer->highlight_tags_count > 0)
{
if (!gui_line_match_tags (line,
@@ -391,8 +395,10 @@ gui_line_has_highlight (struct t_gui_line *line)
if (!msg_no_color)
return 0;
- /* there is highlight on line if one of global highlight words matches line
- or one of buffer highlight words matches line */
+ /*
+ * there is highlight on line if one of global highlight words matches line
+ * or one of buffer highlight words matches line
+ */
rc = (string_has_highlight (msg_no_color,
CONFIG_STRING(config_look_highlight)) ||
string_has_highlight (msg_no_color,
diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c
index 88b490d64..1c84d9418 100644
--- a/src/gui/gui-window.c
+++ b/src/gui/gui-window.c
@@ -178,8 +178,10 @@ gui_window_new (struct t_gui_window *parent_window, struct t_gui_buffer *buffer,
ptr_tree->split_pct = width_pct;
}
- /* parent window leaf becomes node and we add 2 leafs below
- (#1 is parent win, #2 is new win) */
+ /*
+ * parent window leaf becomes node and we add 2 leafs below
+ * (#1 is parent win, #2 is new win)
+ */
parent_window->ptr_tree = child1;
child1->parent_node = ptr_tree;
@@ -685,8 +687,10 @@ gui_window_scroll (struct t_gui_window *window, char *scroll)
|| (line_date.tm_year != old_line_date.tm_year))
stop = 1;
}
- /* we consider month is 30 days, who will find I'm too
- lazy to code exact date diff ? ;) */
+ /*
+ * we consider month is 30 days, who will notice
+ * I'm too lazy to code exact date diff ? ;)
+ */
else if (diff_date >= number * 60 * 60 * 24 * 30)
stop = 1;
break;
@@ -697,8 +701,10 @@ gui_window_scroll (struct t_gui_window *window, char *scroll)
if (line_date.tm_year != old_line_date.tm_year)
stop = 1;
}
- /* we consider year is 365 days, who will find I'm too
- lazy to code exact date diff ? ;) */
+ /*
+ * we consider year is 365 days, who will notice
+ * I'm too lazy to code exact date diff ? ;)
+ */
else if (diff_date >= number * 60 * 60 * 24 * 365)
stop = 1;
break;
diff --git a/src/plugins/alias/alias.c b/src/plugins/alias/alias.c
index d93a51b66..b59af9f83 100644
--- a/src/plugins/alias/alias.c
+++ b/src/plugins/alias/alias.c
@@ -309,8 +309,10 @@ alias_run_command (struct t_gui_buffer **buffer, const char *command)
/* get new current buffer */
new_current_buffer = weechat_current_buffer();
- /* if current buffer was changed by command, then we'll use this one for
- next commands in alias */
+ /*
+ * if current buffer was changed by command, then we'll use this one for
+ * next commands in alias
+ */
if (old_current_buffer != new_current_buffer)
*buffer = new_current_buffer;
}
@@ -361,8 +363,11 @@ alias_cb (void *data, struct t_gui_buffer *buffer, int argc, char **argv,
if (args_replaced && (strcmp (args_replaced, *ptr_cmd) != 0))
some_args_replaced = 1;
- /* if alias has arguments, they are now
- arguments of the last command in the list (if no $1,$2,..$*) was found */
+ /*
+ * if alias has arguments, they are now
+ * arguments of the last command in the list (if no $1,$2,..$*)
+ * was found
+ */
if ((*ptr_next_cmd == NULL) && argv_eol[1] && (!some_args_replaced))
{
length1 = strlen (*ptr_cmd);
@@ -1079,7 +1084,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
(void) plugin;
alias_config_write ();
- alias_free_all ();
+ alias_free_all ();
weechat_config_free (alias_config_file);
return WEECHAT_RC_OK;
diff --git a/src/plugins/aspell/Makefile.am b/src/plugins/aspell/Makefile.am
index 27e3356f5..b1bde9d42 100644
--- a/src/plugins/aspell/Makefile.am
+++ b/src/plugins/aspell/Makefile.am
@@ -14,7 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(ASPELL_CFLAGS)
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(ASPELL_CFLAGS)
libdir = ${weechat_libdir}/plugins
diff --git a/src/plugins/aspell/weechat-aspell-speller.c b/src/plugins/aspell/weechat-aspell-speller.c
index a399b1432..9a45ee6e6 100644
--- a/src/plugins/aspell/weechat-aspell-speller.c
+++ b/src/plugins/aspell/weechat-aspell-speller.c
@@ -141,7 +141,7 @@ weechat_aspell_speller_new (const char *lang)
/* create a speller instance for the newly created cell */
config = new_aspell_config();
- aspell_config_replace (config, "lang", lang);
+ aspell_config_replace (config, "lang", lang);
ret = new_aspell_speller (config);
diff --git a/src/plugins/aspell/weechat-aspell.c b/src/plugins/aspell/weechat-aspell.c
index dcb8f0547..41f264319 100644
--- a/src/plugins/aspell/weechat-aspell.c
+++ b/src/plugins/aspell/weechat-aspell.c
@@ -134,7 +134,7 @@ struct t_aspell_code langs_avail[] =
{ NULL, NULL}
};
-struct t_aspell_code countries_avail[] =
+struct t_aspell_code countries_avail[] =
{
{ "AT", "Austria" },
{ "BR", "Brazil" },
@@ -406,7 +406,7 @@ weechat_aspell_speller_list_dicts ()
struct AspellConfig *config;
AspellDictInfoList *list;
AspellDictInfoEnumeration *el;
- const AspellDictInfo *dict;
+ const AspellDictInfo *dict;
config = new_aspell_config();
list = get_aspell_dict_info_list (config);
@@ -692,9 +692,11 @@ weechat_aspell_modifier_cb (void *data, const char *modifier,
&& !weechat_config_boolean (weechat_aspell_config_check_during_search))
return NULL;
- /* for performance: return last stirng built if input string is the
- same (for example user just change cursor position, or input text is
- refreshed with same content) */
+ /*
+ * for performance: return last stirng built if input string is the
+ * same (for example user just change cursor position, or input text is
+ * refreshed with same content)
+ */
if (aspell_last_modifier_string
&& (strcmp (string, aspell_last_modifier_string) == 0))
{
@@ -855,11 +857,11 @@ weechat_aspell_command_cb (void *data, struct t_gui_buffer *buffer,
if (argc > 1)
{
if (weechat_strcasecmp (argv[1], "dictlist") == 0)
- {
+ {
weechat_aspell_speller_list_dicts ();
return WEECHAT_RC_OK;
}
- if (weechat_strcasecmp (argv[1], "addword") == 0)
+ if (weechat_strcasecmp (argv[1], "addword") == 0)
{
if (argc > 3)
weechat_aspell_add_word (argv[2], argv_eol[3]);
@@ -934,7 +936,7 @@ weechat_aspell_completion_langs_cb (void *data, const char *completion_item,
return WEECHAT_RC_OK;
}
-/*
+/*
* weechat_plugin_init : init aspell plugin
*/
@@ -988,7 +990,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
return WEECHAT_RC_OK;
}
-/*
+/*
* weechat_plugin_end : end aspell plugin
*/
diff --git a/src/plugins/fifo/fifo.c b/src/plugins/fifo/fifo.c
index 93d12ec49..476c0b006 100644
--- a/src/plugins/fifo/fifo.c
+++ b/src/plugins/fifo/fifo.c
@@ -83,7 +83,7 @@ fifo_remove_old_pipes ()
dp = opendir (weechat_home);
if (dp != NULL)
{
- while ((entry = readdir (dp)) != NULL)
+ while ((entry = readdir (dp)) != NULL)
{
if (strcmp (entry->d_name, ".") == 0 || strcmp (entry->d_name, "..") == 0)
continue;
@@ -136,8 +136,10 @@ fifo_create ()
if (weechat_strcasecmp (fifo_option, "on") == 0)
{
- /* build FIFO filename: "<weechat_home>/weechat_fifo_" + process
- PID */
+ /*
+ * build FIFO filename:
+ * "<weechat_home>/weechat_fifo_" + process PID
+ */
if (!fifo_filename)
{
filename_length = strlen (weechat_home) + 64;
@@ -244,8 +246,10 @@ fifo_exec (const char *text)
pos = NULL;
ptr_buffer = NULL;
- /* look for plugin + buffer name at beginning of text
- text may be: "plugin.buffer *text" or "*text" */
+ /*
+ * look for plugin + buffer name at beginning of text
+ * text may be: "plugin.buffer *text" or "*text"
+ */
if (text2[0] == '*')
{
pos_msg = text2 + 1;
diff --git a/src/plugins/irc/irc-channel.c b/src/plugins/irc/irc-channel.c
index cbd8bc4e4..77272952b 100644
--- a/src/plugins/irc/irc-channel.c
+++ b/src/plugins/irc/irc-channel.c
@@ -329,7 +329,7 @@ irc_channel_is_channel (const char *string)
first_char[0] = string[0];
first_char[1] = '\0';
- return (strpbrk (first_char, IRC_CHANNEL_PREFIX)) ? 1 : 0;
+ return (strpbrk (first_char, IRC_CHANNEL_PREFIX)) ? 1 : 0;
}
/*
diff --git a/src/plugins/irc/irc-color.h b/src/plugins/irc/irc-color.h
index 5d4105153..bf81f820a 100644
--- a/src/plugins/irc/irc-color.h
+++ b/src/plugins/irc/irc-color.h
@@ -22,8 +22,10 @@
#define IRC_NUM_COLORS 16
-/* shift ncurses colors for compatibility with colors
- in IRC messages (same as other IRC clients) */
+/*
+ * shift ncurses colors for compatibility with colors
+ * in IRC messages (same as other IRC clients)
+ */
#define WEECHAT_COLOR_BLACK COLOR_BLACK
#define WEECHAT_COLOR_RED COLOR_BLUE
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index f1ff4225d..40594f014 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -436,8 +436,10 @@ irc_command_away_server (struct t_irc_server *server, const char *arguments,
}
else
{
- /* server not connected, store away for future usage
- (when connecting to server) */
+ /*
+ * server not connected, store away for future usage
+ * (when connecting to server)
+ */
string = irc_color_decode (arguments,
weechat_config_boolean (irc_config_network_colors_receive));
weechat_printf (server->buffer,
@@ -496,8 +498,10 @@ irc_command_away_server (struct t_irc_server *server, const char *arguments,
}
else
{
- /* server not connected, remove away message but do not send
- anything */
+ /*
+ * server not connected, remove away message but do not send
+ * anything
+ */
weechat_printf (server->buffer,
_("%s: future away removed"),
IRC_PLUGIN_NAME);
@@ -2908,7 +2912,7 @@ irc_command_reconnect_one_server (struct t_irc_server *server, int no_join)
if (irc_server_connect (server))
{
server->reconnect_start = 0;
- server->reconnect_join = (server->channels) ? 1 : 0;
+ server->reconnect_join = (server->channels) ? 1 : 0;
}
/* reconnect ok */
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index c3db51202..5665ec60a 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -199,7 +199,7 @@ irc_config_change_look_server_buffer (void *data,
IRC_CONFIG_LOOK_SERVER_BUFFER_MERGE_WITH_CORE)
|| (weechat_config_integer (irc_config_look_server_buffer) ==
IRC_CONFIG_LOOK_SERVER_BUFFER_MERGE_WITHOUT_CORE))
- {
+ {
ptr_buffer =
(weechat_config_integer (irc_config_look_server_buffer) ==
IRC_CONFIG_LOOK_SERVER_BUFFER_MERGE_WITH_CORE) ?
@@ -234,7 +234,7 @@ irc_config_change_look_item_channel_modes (void *data,
}
/*
- * irc_config_change_look_item_channel_modes_hide_key: called when the
+ * irc_config_change_look_item_channel_modes_hide_key: called when the
* "display channel modes
* hide key" option is
* changed
diff --git a/src/plugins/irc/irc-ctcp.c b/src/plugins/irc/irc-ctcp.c
index 85b1919e7..a6d9773c4 100644
--- a/src/plugins/irc/irc-ctcp.c
+++ b/src/plugins/irc/irc-ctcp.c
@@ -94,8 +94,10 @@ irc_ctcp_get_reply (struct t_irc_server *server, const char *ctcp)
if (ptr_option)
return weechat_config_string (ptr_option);
- /* no CTCP reply found in config, then return default reply, or NULL
- for unknown CTCP */
+ /*
+ * no CTCP reply found in config, then return default reply, or NULL
+ * for unknown CTCP
+ */
return irc_ctcp_get_default_reply (ctcp);
}
@@ -843,7 +845,7 @@ irc_ctcp_recv (struct t_irc_server *server, const char *command,
irc_channel_nick_speaking_add (channel,
nick,
- (pos_args) ?
+ (pos_args) ?
weechat_string_has_highlight (pos_args,
server->nick) : 0);
irc_channel_nick_speaking_time_remove_old (channel);
diff --git a/src/plugins/irc/irc-ignore.c b/src/plugins/irc/irc-ignore.c
index 8292bef2a..d30032826 100644
--- a/src/plugins/irc/irc-ignore.c
+++ b/src/plugins/irc/irc-ignore.c
@@ -191,8 +191,10 @@ irc_ignore_check (struct t_irc_server *server, struct t_irc_channel *channel,
if (!server)
return 0;
- /* if nick is the same as server, then we will not ignore
- (it is possible when connected to an irc proxy) */
+ /*
+ * if nick is the same as server, then we will not ignore
+ * (it is possible when connected to an irc proxy)
+ */
if (nick && (strcmp (server->nick, nick) == 0))
return 0;
diff --git a/src/plugins/irc/irc-info.c b/src/plugins/irc/irc-info.c
index 60c9b6eae..0ae8ca560 100644
--- a/src/plugins/irc/irc-info.c
+++ b/src/plugins/irc/irc-info.c
@@ -126,8 +126,10 @@ irc_info_get_info_cb (void *data, const char *info_name,
server = strdup (arguments);
}
- /* replace channel by nick in host if channel is not a channel
- (private ?) */
+ /*
+ * replace channel by nick in host if channel is not a channel
+ * (private ?)
+ */
if (channel && host)
{
if (!irc_channel_is_channel (channel))
diff --git a/src/plugins/irc/irc-input.c b/src/plugins/irc/irc-input.c
index 185730939..69375c030 100644
--- a/src/plugins/irc/irc-input.c
+++ b/src/plugins/irc/irc-input.c
@@ -159,8 +159,10 @@ irc_input_data_cb (void *data, struct t_gui_buffer *buffer,
}
else
{
- /* if send unknown commands is enabled and that input data is a command,
- then send this command to IRC server */
+ /*
+ * if send unknown commands is enabled and that input data is a
+ * command, then send this command to IRC server
+ */
if (weechat_config_boolean (irc_config_network_send_unknown_commands)
&& !weechat_string_input_for_buffer (input_data))
{
diff --git a/src/plugins/irc/irc-msgbuffer.c b/src/plugins/irc/irc-msgbuffer.c
index 20a2bc146..ebddbae5b 100644
--- a/src/plugins/irc/irc-msgbuffer.c
+++ b/src/plugins/irc/irc-msgbuffer.c
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/* irc-msgbuffer.c: target buffer for IRC messages
- (weechat, current, private) */
+/* irc-msgbuffer.c: target buffer for IRC messages (weechat, current, private) */
#include <stdlib.h>
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index c5c1f49aa..d14b8c593 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/* irc-protocol.c: implementation of IRC protocol, according to
- RFC 1459, 2810, 2811 2812 */
+/* irc-protocol.c: implementation of IRC protocol, according to RFC 1459, 2810, 2811 2812 */
#ifndef __USE_XOPEN
@@ -229,7 +228,7 @@ irc_protocol_tags (const char *command, const char *tags)
* irc_protocol_replace_vars: replace special IRC vars ($nick, $channel,
* $server) in a string
* Note: result has to be free() after use
- */
+ */
char *
irc_protocol_replace_vars (struct t_irc_server *server,
@@ -276,10 +275,11 @@ IRC_PROTOCOL_CALLBACK(authenticate)
const char *sasl_username, *sasl_password;
char *answer;
- /* AUTHENTICATE message looks like:
- AUTHENTICATE +
- AUTHENTICATE QQDaUzXAmVffxuzFy77XWBGwABBQAgdinelBrKZaR3wE7nsIETuTVY=
- */
+ /*
+ * AUTHENTICATE message looks like:
+ * AUTHENTICATE +
+ * AUTHENTICATE QQDaUzXAmVffxuzFy77XWBGwABBQAgdinelBrKZaR3wE7nsIETuTVY=
+ */
IRC_PROTOCOL_MIN_ARGS(2);
@@ -332,11 +332,12 @@ IRC_PROTOCOL_CALLBACK(cap)
char *ptr_caps, **items;
int num_items, sasl, i, timeout;
- /* CAP message looks like:
- :server CAP * LS :identify-msg multi-prefix sasl
- :server CAP * ACK :sasl
- :server CAP * NAK :sasl
- */
+ /*
+ * CAP message looks like:
+ * :server CAP * LS :identify-msg multi-prefix sasl
+ * :server CAP * ACK :sasl
+ * :server CAP * NAK :sasl
+ */
IRC_PROTOCOL_MIN_ARGS(4);
@@ -498,9 +499,10 @@ IRC_PROTOCOL_CALLBACK(error)
IRC_PROTOCOL_CALLBACK(invite)
{
- /* INVITE message looks like:
- :nick!user@host INVITE mynick :#channel
- */
+ /*
+ * INVITE message looks like:
+ * :nick!user@host INVITE mynick :#channel
+ */
IRC_PROTOCOL_MIN_ARGS(4);
IRC_PROTOCOL_CHECK_HOST;
@@ -536,9 +538,10 @@ IRC_PROTOCOL_CALLBACK(join)
char *pos_channel;
int local_join;
- /* JOIN message looks like:
- :nick!user@host JOIN :#channel
- */
+ /*
+ * JOIN message looks like:
+ * :nick!user@host JOIN :#channel
+ */
IRC_PROTOCOL_MIN_ARGS(3);
IRC_PROTOCOL_CHECK_HOST;
@@ -612,9 +615,10 @@ IRC_PROTOCOL_CALLBACK(kick)
struct t_irc_channel *ptr_channel;
struct t_irc_nick *ptr_nick, *ptr_nick_kicked;
- /* KICK message looks like:
- :nick1!user@host KICK #channel nick2 :kick reason
- */
+ /*
+ * KICK message looks like:
+ * :nick1!user@host KICK #channel nick2 :kick reason
+ */
IRC_PROTOCOL_MIN_ARGS(4);
IRC_PROTOCOL_CHECK_HOST;
@@ -672,8 +676,10 @@ IRC_PROTOCOL_CALLBACK(kick)
if (strcmp (argv[3], server->nick) == 0)
{
- /* my nick was kicked => free all nicks, channel is not active any
- more */
+ /*
+ * my nick was kicked => free all nicks, channel is not active any
+ * more
+ */
irc_nick_free_all (ptr_channel);
if (IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AUTOREJOIN))
{
@@ -695,8 +701,10 @@ IRC_PROTOCOL_CALLBACK(kick)
}
else
{
- /* someone was kicked from channel (but not me) => remove only this
- nick */
+ /*
+ * someone was kicked from channel (but not me) => remove only this
+ * nick
+ */
if (ptr_nick_kicked)
irc_nick_free (ptr_channel, ptr_nick_kicked);
}
@@ -714,9 +722,10 @@ IRC_PROTOCOL_CALLBACK(kill)
struct t_irc_channel *ptr_channel;
struct t_irc_nick *ptr_nick, *ptr_nick_killed;
- /* KILL message looks like:
- :nick1!user@host KILL mynick :kill reason
- */
+ /*
+ * KILL message looks like:
+ * :nick1!user@host KILL mynick :kill reason
+ */
IRC_PROTOCOL_MIN_ARGS(3);
IRC_PROTOCOL_CHECK_HOST;
@@ -762,14 +771,18 @@ IRC_PROTOCOL_CALLBACK(kill)
if (strcmp (argv[2], server->nick) == 0)
{
- /* my nick was killed => free all nicks, channel is not active any
- more */
+ /*
+ * my nick was killed => free all nicks, channel is not active any
+ * more
+ */
irc_nick_free_all (ptr_channel);
}
else
{
- /* someone was killed on channel (but not me) => remove only this
- nick */
+ /*
+ * someone was killed on channel (but not me) => remove only this
+ * nick
+ */
if (ptr_nick_killed)
irc_nick_free (ptr_channel, ptr_nick_killed);
}
@@ -788,9 +801,10 @@ IRC_PROTOCOL_CALLBACK(mode)
struct t_irc_channel *ptr_channel;
struct t_irc_nick *ptr_nick;
- /* MODE message looks like:
- :nick!user@host MODE #test +o nick
- */
+ /*
+ * MODE message looks like:
+ * :nick!user@host MODE #test +o nick
+ */
IRC_PROTOCOL_MIN_ARGS(4);
IRC_PROTOCOL_CHECK_HOST;
@@ -860,9 +874,10 @@ IRC_PROTOCOL_CALLBACK(nick)
char *new_nick, *old_color, *buffer_name;
int local_nick;
- /* NICK message looks like:
- :oldnick!user@host NICK :newnick
- */
+ /*
+ * NICK message looks like:
+ * :oldnick!user@host NICK :newnick
+ */
IRC_PROTOCOL_MIN_ARGS(3);
IRC_PROTOCOL_CHECK_HOST;
@@ -968,11 +983,12 @@ IRC_PROTOCOL_CALLBACK(notice)
int notify_private;
struct t_gui_buffer *ptr_buffer;
- /* NOTICE message looks like:
- NOTICE AUTH :*** Looking up your hostname...
- :nick!user@host NOTICE mynick :notice text
- :nick!user@host NOTICE #channel :notice text
- */
+ /*
+ * NOTICE message looks like:
+ * NOTICE AUTH :*** Looking up your hostname...
+ * :nick!user@host NOTICE mynick :notice text
+ * :nick!user@host NOTICE #channel :notice text
+ */
IRC_PROTOCOL_MIN_ARGS(3);
@@ -1124,12 +1140,13 @@ IRC_PROTOCOL_CALLBACK(part)
struct t_irc_nick *ptr_nick;
struct t_irc_channel_speaking *ptr_nick_speaking;
- /* PART message looks like:
- :nick!user@host PART #channel :part message
- On undernet server, it can be:
- :nick!user@host PART :#channel
- :nick!user@host PART #channel :part message
- */
+ /*
+ * PART message looks like:
+ * :nick!user@host PART #channel :part message
+ * On undernet server, it can be:
+ * :nick!user@host PART :#channel
+ * :nick!user@host PART #channel :part message
+ */
IRC_PROTOCOL_MIN_ARGS(3);
IRC_PROTOCOL_CHECK_HOST;
@@ -1253,9 +1270,10 @@ IRC_PROTOCOL_CALLBACK(part)
IRC_PROTOCOL_CALLBACK(ping)
{
- /* PING message looks like:
- PING :server
- */
+ /*
+ * PING message looks like:
+ * PING :server
+ */
IRC_PROTOCOL_MIN_ARGS(2);
@@ -1308,15 +1326,16 @@ IRC_PROTOCOL_CALLBACK(privmsg)
struct t_irc_channel *ptr_channel;
struct t_irc_nick *ptr_nick;
- /* PRIVMSG message looks like:
- :nick!user@host PRIVMSG #channel :message for channel here
- :nick!user@host PRIVMSG mynick :message for private here
- :nick!user@host PRIVMSG #channel :\01ACTION is testing action\01
- :nick!user@host PRIVMSG mynick :\01ACTION is testing action\01
- :nick!user@host PRIVMSG #channel :\01VERSION\01
- :nick!user@host PRIVMSG mynick :\01VERSION\01
- :nick!user@host PRIVMSG mynick :\01DCC SEND file.txt 1488915698 50612 128\01
- */
+ /*
+ * PRIVMSG message looks like:
+ * :nick!user@host PRIVMSG #channel :message for channel here
+ * :nick!user@host PRIVMSG mynick :message for private here
+ * :nick!user@host PRIVMSG #channel :\01ACTION is testing action\01
+ * :nick!user@host PRIVMSG mynick :\01ACTION is testing action\01
+ * :nick!user@host PRIVMSG #channel :\01VERSION\01
+ * :nick!user@host PRIVMSG mynick :\01VERSION\01
+ * :nick!user@host PRIVMSG mynick :\01DCC SEND file.txt 1488915698 50612 128\01
+ */
IRC_PROTOCOL_MIN_ARGS(4);
IRC_PROTOCOL_CHECK_HOST;
@@ -1443,9 +1462,10 @@ IRC_PROTOCOL_CALLBACK(quit)
struct t_irc_channel_speaking *ptr_nick_speaking;
int local_quit;
- /* QUIT message looks like:
- :nick!user@host QUIT :quit message
- */
+ /*
+ * QUIT message looks like:
+ * :nick!user@host QUIT :quit message
+ */
IRC_PROTOCOL_MIN_ARGS(2);
IRC_PROTOCOL_CHECK_HOST;
@@ -1604,9 +1624,10 @@ IRC_PROTOCOL_CALLBACK(topic)
struct t_irc_nick *ptr_nick;
struct t_gui_buffer *ptr_buffer;
- /* TOPIC message looks like:
- :nick!user@host TOPIC #channel :new topic for channel
- */
+ /*
+ * TOPIC message looks like:
+ * :nick!user@host TOPIC #channel :new topic for channel
+ */
IRC_PROTOCOL_MIN_ARGS(3);
@@ -1700,9 +1721,10 @@ IRC_PROTOCOL_CALLBACK(topic)
IRC_PROTOCOL_CALLBACK(wallops)
{
- /* WALLOPS message looks like:
- :nick!user@host WALLOPS :message from admin
- */
+ /*
+ * WALLOPS message looks like:
+ * :nick!user@host WALLOPS :message from admin
+ */
IRC_PROTOCOL_MIN_ARGS(3);
@@ -1737,9 +1759,10 @@ IRC_PROTOCOL_CALLBACK(001)
char *away_msg;
const char *ptr_command;
- /* 001 message looks like:
- :server 001 mynick :Welcome to the dancer-ircd Network
- */
+ /*
+ * 001 message looks like:
+ * :server 001 mynick :Welcome to the dancer-ircd Network
+ */
IRC_PROTOCOL_MIN_ARGS(3);
@@ -1815,12 +1838,13 @@ IRC_PROTOCOL_CALLBACK(005)
{
char *pos, *pos2;
- /* 005 message looks like:
- :server 005 mynick MODES=4 CHANLIMIT=#:20 NICKLEN=16 USERLEN=10
- HOSTLEN=63 TOPICLEN=450 KICKLEN=450 CHANNELLEN=30 KEYLEN=23
- CHANTYPES=# PREFIX=(ov)@+ CASEMAPPING=ascii CAPAB IRCD=dancer
- :are available on this server
- */
+ /*
+ * 005 message looks like:
+ * :server 005 mynick MODES=4 CHANLIMIT=#:20 NICKLEN=16 USERLEN=10
+ * HOSTLEN=63 TOPICLEN=450 KICKLEN=450 CHANNELLEN=30 KEYLEN=23
+ * CHANTYPES=# PREFIX=(ov)@+ CASEMAPPING=ascii CAPAB IRCD=dancer
+ * :are available on this server
+ */
IRC_PROTOCOL_MIN_ARGS(4);
@@ -1851,9 +1875,10 @@ IRC_PROTOCOL_CALLBACK(005)
IRC_PROTOCOL_CALLBACK(221)
{
- /* 221 message looks like:
- :server 221 nick :+s
- */
+ /*
+ * 221 message looks like:
+ * :server 221 nick :+s
+ */
IRC_PROTOCOL_MIN_ARGS(4);
@@ -1885,9 +1910,10 @@ IRC_PROTOCOL_CALLBACK(301)
struct t_irc_channel *ptr_channel;
struct t_gui_buffer *ptr_buffer;
- /* 301 message looks like:
- :server 301 mynick nick :away message for nick
- */
+ /*
+ * 301 message looks like:
+ * :server 301 mynick nick :away message for nick
+ */
IRC_PROTOCOL_MIN_ARGS(3);
@@ -1933,9 +1959,10 @@ IRC_PROTOCOL_CALLBACK(301)
IRC_PROTOCOL_CALLBACK(303)
{
- /* 303 message looks like:
- :server 303 mynick :nick1 nick2
- */
+ /*
+ * 303 message looks like:
+ * :server 303 mynick :nick1 nick2
+ */
IRC_PROTOCOL_MIN_ARGS(4);
@@ -1956,9 +1983,10 @@ IRC_PROTOCOL_CALLBACK(303)
IRC_PROTOCOL_CALLBACK(305)
{
- /* 305 message looks like:
- :server 305 mynick :Does this mean you're really back?
- */
+ /*
+ * 305 message looks like:
+ * :server 305 mynick :Does this mean you're really back?
+ */
IRC_PROTOCOL_MIN_ARGS(3);
@@ -1987,9 +2015,10 @@ IRC_PROTOCOL_CALLBACK(305)
IRC_PROTOCOL_CALLBACK(306)
{
- /* 306 message looks like:
- :server 306 mynick :We'll miss you
- */
+ /*
+ * 306 message looks like:
+ * :server 306 mynick :We'll miss you
+ */
IRC_PROTOCOL_MIN_ARGS(3);
@@ -2018,9 +2047,10 @@ IRC_PROTOCOL_CALLBACK(306)
IRC_PROTOCOL_CALLBACK(whois_nick_msg)
{
- /* messages look like:
- :server 319 flashy FlashCode :some text here
- */
+ /*
+ * messages look like:
+ * :server 319 flashy FlashCode :some text here
+ */
IRC_PROTOCOL_MIN_ARGS(5);
@@ -2046,9 +2076,10 @@ IRC_PROTOCOL_CALLBACK(whois_nick_msg)
IRC_PROTOCOL_CALLBACK(whowas_nick_msg)
{
- /* messages look like:
- :server 369 flashy FlashCode :some text here
- */
+ /*
+ * messages look like:
+ * :server 369 flashy FlashCode :some text here
+ */
IRC_PROTOCOL_MIN_ARGS(5);
@@ -2074,9 +2105,10 @@ IRC_PROTOCOL_CALLBACK(whowas_nick_msg)
IRC_PROTOCOL_CALLBACK(311)
{
- /* 311 message looks like:
- :server 311 mynick nick user host * :realname here
- */
+ /*
+ * 311 message looks like:
+ * :server 311 mynick nick user host * :realname here
+ */
IRC_PROTOCOL_MIN_ARGS(8);
@@ -2106,9 +2138,10 @@ IRC_PROTOCOL_CALLBACK(311)
IRC_PROTOCOL_CALLBACK(312)
{
- /* 312 message looks like:
- :server 312 mynick nick irc.freenode.net :http://freenode.net/
- */
+ /*
+ * 312 message looks like:
+ * :server 312 mynick nick irc.freenode.net :http://freenode.net/
+ */
IRC_PROTOCOL_MIN_ARGS(6);
@@ -2138,9 +2171,10 @@ IRC_PROTOCOL_CALLBACK(312)
IRC_PROTOCOL_CALLBACK(314)
{
- /* 314 message looks like:
- :server 314 mynick nick user host * :realname here
- */
+ /*
+ * 314 message looks like:
+ * :server 314 mynick nick user host * :realname here
+ */
IRC_PROTOCOL_MIN_ARGS(8);
@@ -2172,9 +2206,10 @@ IRC_PROTOCOL_CALLBACK(315)
{
struct t_irc_channel *ptr_channel;
- /* 315 message looks like:
- :server 315 mynick #channel :End of /WHO list.
- */
+ /*
+ * 315 message looks like:
+ * :server 315 mynick #channel :End of /WHO list.
+ */
IRC_PROTOCOL_MIN_ARGS(5);
@@ -2212,9 +2247,10 @@ IRC_PROTOCOL_CALLBACK(317)
time_t datetime;
struct t_gui_buffer *ptr_buffer;
- /* 317 message looks like:
- :server 317 mynick nick 122877 1205327880 :seconds idle, signon time
- */
+ /*
+ * 317 message looks like:
+ * :server 317 mynick nick 122877 1205327880 :seconds idle, signon time
+ */
IRC_PROTOCOL_MIN_ARGS(6);
@@ -2301,9 +2337,10 @@ IRC_PROTOCOL_CALLBACK(321)
{
char *pos_args;
- /* 321 message looks like:
- :server 321 mynick Channel :Users Name
- */
+ /*
+ * 321 message looks like:
+ * :server 321 mynick Channel :Users Name
+ */
IRC_PROTOCOL_MIN_ARGS(4);
@@ -2331,9 +2368,10 @@ IRC_PROTOCOL_CALLBACK(322)
{
char *pos_topic;
- /* 322 message looks like:
- :server 322 mynick #channel 3 :topic of channel
- */
+ /*
+ * 322 message looks like:
+ * :server 322 mynick #channel 3 :topic of channel
+ */
IRC_PROTOCOL_MIN_ARGS(5);
@@ -2371,9 +2409,10 @@ IRC_PROTOCOL_CALLBACK(323)
{
char *pos_args;
- /* 323 message looks like:
- :server 323 mynick :End of /LIST
- */
+ /*
+ * 323 message looks like:
+ * :server 323 mynick :End of /LIST
+ */
IRC_PROTOCOL_MIN_ARGS(3);
@@ -2399,9 +2438,10 @@ IRC_PROTOCOL_CALLBACK(324)
{
struct t_irc_channel *ptr_channel;
- /* 324 message looks like:
- :server 324 mynick #channel +nt
- */
+ /*
+ * 324 message looks like:
+ * :server 324 mynick #channel +nt
+ */
IRC_PROTOCOL_MIN_ARGS(4);
@@ -2453,9 +2493,10 @@ IRC_PROTOCOL_CALLBACK(327)
char *pos_realname;
struct t_gui_buffer *ptr_buffer;
- /* 327 message looks like:
- :server 327 mynick nick host ip :real hostname/ip
- */
+ /*
+ * 327 message looks like:
+ * :server 327 mynick nick host ip :real hostname/ip
+ */
IRC_PROTOCOL_MIN_ARGS(6);
@@ -2509,9 +2550,10 @@ IRC_PROTOCOL_CALLBACK(328)
{
struct t_irc_channel *ptr_channel;
- /* 328 message looks like:
- :server 328 mynick #channel :http://sample.url.com/
- */
+ /*
+ * 328 message looks like:
+ * :server 328 mynick #channel :http://sample.url.com/
+ */
IRC_PROTOCOL_MIN_ARGS(5);
@@ -2541,9 +2583,10 @@ IRC_PROTOCOL_CALLBACK(329)
struct t_irc_channel *ptr_channel;
time_t datetime;
- /* 329 message looks like:
- :server 329 mynick #channel 1205327894
- */
+ /*
+ * 329 message looks like:
+ * :server 329 mynick #channel 1205327894
+ */
IRC_PROTOCOL_MIN_ARGS(5);
@@ -2586,11 +2629,12 @@ IRC_PROTOCOL_CALLBACK(329)
IRC_PROTOCOL_CALLBACK(330_343)
{
- /* 330 message looks like:
- :server 330 mynick nick1 nick2 :is logged in as
- 343 message looks like:
- :server 343 mynick nick1 nick2 :is opered as
- */
+ /*
+ * 330 message looks like:
+ * :server 330 mynick nick1 nick2 :is logged in as
+ * 343 message looks like:
+ * :server 343 mynick nick1 nick2 :is opered as
+ */
IRC_PROTOCOL_MIN_ARGS(6);
@@ -2621,9 +2665,10 @@ IRC_PROTOCOL_CALLBACK(331)
struct t_irc_channel *ptr_channel;
struct t_gui_buffer *ptr_buffer;
- /* 331 message looks like:
- :server 331 mynick #channel :There isn't a topic.
- */
+ /*
+ * 331 message looks like:
+ * :server 331 mynick #channel :There isn't a topic.
+ */
IRC_PROTOCOL_MIN_ARGS(4);
@@ -2649,9 +2694,10 @@ IRC_PROTOCOL_CALLBACK(332)
struct t_irc_channel *ptr_channel;
struct t_gui_buffer *ptr_buffer;
- /* 332 message looks like:
- :server 332 mynick #channel :topic of channel
- */
+ /*
+ * 332 message looks like:
+ * :server 332 mynick #channel :topic of channel
+ */
IRC_PROTOCOL_MIN_ARGS(5);
@@ -2700,9 +2746,10 @@ IRC_PROTOCOL_CALLBACK(333)
time_t datetime;
const char *topic_nick, *topic_address;
- /* 333 message looks like:
- :server 333 mynick #channel nick!user@host 1205428096
- */
+ /*
+ * 333 message looks like:
+ * :server 333 mynick #channel nick!user@host 1205428096
+ */
IRC_PROTOCOL_MIN_ARGS(6);
@@ -2760,9 +2807,10 @@ IRC_PROTOCOL_CALLBACK(333)
IRC_PROTOCOL_CALLBACK(338)
{
- /* 338 message looks like:
- :server 338 mynick nick host :actually using host
- */
+ /*
+ * 338 message looks like:
+ * :server 338 mynick nick host :actually using host
+ */
IRC_PROTOCOL_MIN_ARGS(6);
@@ -2790,9 +2838,10 @@ IRC_PROTOCOL_CALLBACK(338)
IRC_PROTOCOL_CALLBACK(341)
{
- /* 341 message looks like:
- :server 341 mynick nick #channel
- */
+ /*
+ * 341 message looks like:
+ * :server 341 mynick nick #channel
+ */
IRC_PROTOCOL_MIN_ARGS(5);
@@ -2820,9 +2869,10 @@ IRC_PROTOCOL_CALLBACK(341)
IRC_PROTOCOL_CALLBACK(344)
{
- /* 344 message looks like:
- :server 344 mynick #channel nick!user@host
- */
+ /*
+ * 344 message looks like:
+ * :server 344 mynick #channel nick!user@host
+ */
IRC_PROTOCOL_MIN_ARGS(5);
@@ -2847,9 +2897,10 @@ IRC_PROTOCOL_CALLBACK(344)
IRC_PROTOCOL_CALLBACK(345)
{
- /* 345 message looks like:
- :server 345 mynick #channel :End of Channel Reop List
- */
+ /*
+ * 345 message looks like:
+ * :server 345 mynick #channel :End of Channel Reop List
+ */
IRC_PROTOCOL_MIN_ARGS(5);
@@ -2877,10 +2928,11 @@ IRC_PROTOCOL_CALLBACK(348)
struct t_gui_buffer *ptr_buffer;
time_t datetime;
- /* 348 message looks like:
- :server 348 mynick #channel nick1!user1@host1 nick2!user2@host2 1205585109
- (nick2 is nick who set exception on nick1)
- */
+ /*
+ * 348 message looks like:
+ * :server 348 mynick #channel nick1!user1@host1 nick2!user2@host2 1205585109
+ * (nick2 is nick who set exception on nick1)
+ */
IRC_PROTOCOL_MIN_ARGS(5);
@@ -2940,9 +2992,10 @@ IRC_PROTOCOL_CALLBACK(349)
struct t_irc_channel *ptr_channel;
struct t_gui_buffer *ptr_buffer;
- /* 349 message looks like:
- :server 349 mynick #channel :End of Channel Exception List
- */
+ /*
+ * 349 message looks like:
+ * :server 349 mynick #channel :End of Channel Exception List
+ */
IRC_PROTOCOL_MIN_ARGS(4);
@@ -2975,9 +3028,10 @@ IRC_PROTOCOL_CALLBACK(351)
{
struct t_gui_buffer *ptr_buffer;
- /* 351 message looks like:
- :server 351 mynick dancer-ircd-1.0.36(2006/07/23_13:11:50). server :iMZ dncrTS/v4
- */
+ /*
+ * 351 message looks like:
+ * :server 351 mynick dancer-ircd-1.0.36(2006/07/23_13:11:50). server :iMZ dncrTS/v4
+ */
IRC_PROTOCOL_MIN_ARGS(5);
@@ -3018,9 +3072,10 @@ IRC_PROTOCOL_CALLBACK(352)
struct t_irc_channel *ptr_channel;
struct t_irc_nick *ptr_nick;
- /* 352 message looks like:
- :server 352 mynick #channel user host server nick (*) (H/G) :0 flashcode
- */
+ /*
+ * 352 message looks like:
+ * :server 352 mynick #channel user host server nick (*) (H/G) :0 flashcode
+ */
IRC_PROTOCOL_MIN_ARGS(9);
@@ -3100,9 +3155,10 @@ IRC_PROTOCOL_CALLBACK(353)
struct t_irc_channel *ptr_channel;
struct t_irc_nick *ptr_nick;
- /* 353 message looks like:
- :server 353 mynick = #channel :mynick nick1 @nick2 +nick3
- */
+ /*
+ * 353 message looks like:
+ * :server 353 mynick = #channel :mynick nick1 @nick2 +nick3
+ */
IRC_PROTOCOL_MIN_ARGS(5);
@@ -3239,9 +3295,10 @@ IRC_PROTOCOL_CALLBACK(366)
char *string;
const char *prefix;
- /* 366 message looks like:
- :server 366 mynick #channel :End of /NAMES list.
- */
+ /*
+ * 366 message looks like:
+ * :server 366 mynick #channel :End of /NAMES list.
+ */
IRC_PROTOCOL_MIN_ARGS(5);
@@ -3374,9 +3431,10 @@ IRC_PROTOCOL_CALLBACK(367)
struct t_gui_buffer *ptr_buffer;
time_t datetime;
- /* 367 message looks like:
- :server 367 mynick #channel banmask nick!user@host 1205590879
- */
+ /*
+ * 367 message looks like:
+ * :server 367 mynick #channel banmask nick!user@host 1205590879
+ */
IRC_PROTOCOL_MIN_ARGS(5);
@@ -3442,9 +3500,10 @@ IRC_PROTOCOL_CALLBACK(368)
struct t_irc_channel *ptr_channel;
struct t_gui_buffer *ptr_buffer;
- /* 368 message looks like:
- :server 368 mynick #channel :End of Channel Ban List
- */
+ /*
+ * 368 message looks like:
+ * :server 368 mynick #channel :End of Channel Ban List
+ */
IRC_PROTOCOL_MIN_ARGS(4);
@@ -3478,9 +3537,10 @@ IRC_PROTOCOL_CALLBACK(432)
int i, nick_found, nick_to_use;
struct t_gui_buffer *ptr_buffer;
- /* 432 message looks like:
- :server 432 * mynick :Erroneous Nickname
- */
+ /*
+ * 432 message looks like:
+ * :server 432 * mynick :Erroneous Nickname
+ */
irc_protocol_cb_error (server,
nick, address, host, command,
@@ -3544,9 +3604,10 @@ IRC_PROTOCOL_CALLBACK(433)
int i, nick_found, nick_to_use;
struct t_gui_buffer *ptr_buffer;
- /* 433 message looks like:
- :server 433 * mynick :Nickname is already in use.
- */
+ /*
+ * 433 message looks like:
+ * :server 433 * mynick :Nickname is already in use.
+ */
if (!server->is_connected)
{
@@ -3611,9 +3672,10 @@ IRC_PROTOCOL_CALLBACK(438)
{
struct t_gui_buffer *ptr_buffer;
- /* 438 message looks like:
- :server 438 mynick newnick :Nick change too fast. Please wait 30 seconds.
- */
+ /*
+ * 438 message looks like:
+ * :server 438 mynick newnick :Nick change too fast. Please wait 30 seconds.
+ */
IRC_PROTOCOL_MIN_ARGS(4);
@@ -3649,9 +3711,10 @@ IRC_PROTOCOL_CALLBACK(438)
IRC_PROTOCOL_CALLBACK(900)
{
- /* 900 message looks like:
- :server 900 mynick nick!user@host mynick :You are now logged in as mynick
- */
+ /*
+ * 900 message looks like:
+ * :server 900 mynick nick!user@host mynick :You are now logged in as mynick
+ */
IRC_PROTOCOL_MIN_ARGS(6);
@@ -3676,9 +3739,10 @@ IRC_PROTOCOL_CALLBACK(900)
IRC_PROTOCOL_CALLBACK(901)
{
- /* 901 message looks like:
- :server 901 mynick nick user host :You are now logged in. (id nick, username user, hostname host)
- */
+ /*
+ * 901 message looks like:
+ * :server 901 mynick nick user host :You are now logged in. (id nick, username user, hostname host)
+ */
IRC_PROTOCOL_MIN_ARGS(6);
@@ -3708,11 +3772,12 @@ IRC_PROTOCOL_CALLBACK(901)
IRC_PROTOCOL_CALLBACK(sasl_end)
{
- /* 903 message looks like:
- :server 903 nick :SASL authentication successful
- 904 message looks like:
- :server 904 nick :SASL authentication failed
- */
+ /*
+ * 903 message looks like:
+ * :server 903 nick :SASL authentication successful
+ * 904 message looks like:
+ * :server 904 nick :SASL authentication failed
+ */
irc_protocol_cb_numeric (server,
nick, address, host, command,
@@ -3786,7 +3851,7 @@ irc_protocol_recv_command (struct t_irc_server *server,
{ "318", /* whois (end) */ 1, &irc_protocol_cb_whois_nick_msg },
{ "319", /* whois (channels) */ 1, &irc_protocol_cb_whois_nick_msg },
{ "320", /* whois (identified user) */ 1, &irc_protocol_cb_whois_nick_msg },
- { "321", /* /list start */ 1, &irc_protocol_cb_321 },
+ { "321", /* /list start */ 1, &irc_protocol_cb_321 },
{ "322", /* channel (for /list) */ 1, &irc_protocol_cb_322 },
{ "323", /* end of /list */ 1, &irc_protocol_cb_323 },
{ "324", /* channel mode */ 1, &irc_protocol_cb_324 },
diff --git a/src/plugins/irc/irc-sasl.c b/src/plugins/irc/irc-sasl.c
index b583ac250..125931030 100644
--- a/src/plugins/irc/irc-sasl.c
+++ b/src/plugins/irc/irc-sasl.c
@@ -187,12 +187,13 @@ irc_sasl_mechanism_dh_blowfish (const char *data_base64,
password_clear, length_password) != 0)
goto end;
- /* build answer for server, it is concatenation of:
- 1. key length (2 bytes)
- 2. public key ('length_key' bytes)
- 3. sasl_username ('length_username'+1 bytes)
- 4. encrypted password ('length_password' bytes)
- */
+ /*
+ * build answer for server, it is concatenation of:
+ * 1. key length (2 bytes)
+ * 2. public key ('length_key' bytes)
+ * 3. sasl_username ('length_username'+1 bytes)
+ * 4. encrypted password ('length_password' bytes)
+ */
length_username = strlen (sasl_username);
length_answer = 2 + length_key + length_username + 1 + length_password;
answer = malloc (length_answer);
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index 61f3aa1d2..8a1730c27 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -1094,10 +1094,11 @@ irc_server_parse_message (const char *message, char **nick, char **host,
*channel = NULL;
if (arguments)
*arguments = NULL;
-
- /* we'll use this message as example:
- :FlashCode!n=FlashCod@host.com PRIVMSG #channel :hello!
- */
+
+ /*
+ * we will use this message as example:
+ * :FlashCode!n=FlashCod@host.com PRIVMSG #channel :hello!
+ */
if (message[0] == ':')
{
pos2 = strchr (message, '!');
@@ -1366,7 +1367,7 @@ irc_server_sendf (struct t_irc_server *server, int queue_msg,
va_start (args, format);
vsnprintf (buffer, sizeof (buffer) - 1, format, args);
- va_end (args);
+ va_end (args);
items = weechat_string_split (buffer, "\n", 0, 0, &items_count);
for (i = 0; i < items_count; i++)
@@ -2857,8 +2858,10 @@ irc_server_disconnect (struct t_irc_server *server, int reconnect)
if (server->is_connected)
{
- /* remove all nicks and write disconnection message on each
- channel/private buffer */
+ /*
+ * remove all nicks and write disconnection message on each
+ * channel/private buffer
+ */
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
diff --git a/src/plugins/irc/irc.c b/src/plugins/irc/irc.c
index b2d7f0283..99f7f9acc 100644
--- a/src/plugins/irc/irc.c
+++ b/src/plugins/irc/irc.c
@@ -100,9 +100,11 @@ irc_signal_upgrade_cb (void *data, const char *signal, const char *type_data,
irc_signal_upgrade_received = 1;
- /* FIXME: it's not possible to upgrade with SSL servers connected (GnuTLS
- lib can't reload data after upgrade), so we close connection for
- all SSL servers currently connected */
+ /*
+ * FIXME: it's not possible to upgrade with SSL servers connected (GnuTLS
+ * lib can't reload data after upgrade), so we close connection for
+ * all SSL servers currently connected
+ */
disconnected = 0;
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
@@ -116,8 +118,10 @@ irc_signal_upgrade_cb (void *data, const char *signal, const char *type_data,
weechat_prefix ("error"),
IRC_PLUGIN_NAME);
irc_server_disconnect (ptr_server, 0);
- /* schedule reconnection: WeeChat will reconnect to this server
- after restart */
+ /*
+ * schedule reconnection: WeeChat will reconnect to this server
+ * after restart
+ */
ptr_server->index_current_address = 0;
ptr_server->reconnect_start = time (NULL) -
IRC_SERVER_OPTION_INTEGER(ptr_server, IRC_SERVER_OPTION_AUTORECONNECT_DELAY) - 1;
diff --git a/src/plugins/logger/logger-tail.c b/src/plugins/logger/logger-tail.c
index 12e66fc64..08ead6a1b 100644
--- a/src/plugins/logger/logger-tail.c
+++ b/src/plugins/logger/logger-tail.c
@@ -160,8 +160,10 @@ logger_tail_file (const char *filename, int n_lines)
}
else if (!pos_eol)
{
- /* beginning of read buffer reached without EOL, then we
- add string to part_of_line, we'll use that later */
+ /*
+ * beginning of read buffer reached without EOL, then we
+ * add string to part_of_line, we'll use that later
+ */
if (part_of_line)
{
new_part_of_line = malloc (strlen (buf) + strlen (part_of_line) + 1);
diff --git a/src/plugins/logger/logger.c b/src/plugins/logger/logger.c
index 246f37b4d..0e227d5e9 100644
--- a/src/plugins/logger/logger.c
+++ b/src/plugins/logger/logger.c
@@ -318,9 +318,11 @@ logger_get_mask_expanded (struct t_gui_buffer *buffer, const char *mask)
if (!dir_separator)
return NULL;
- /* we first replace directory separator (commonly '/') by \01 because
- buffer mask can contain this char, and will be replaced by replacement
- char ('_' by default) */
+ /*
+ * we first replace directory separator (commonly '/') by \01 because
+ * buffer mask can contain this char, and will be replaced by replacement
+ * char ('_' by default)
+ */
mask2 = weechat_string_replace (mask, dir_separator, "\01");
if (!mask2)
goto end;
@@ -922,9 +924,11 @@ logger_backlog (struct t_gui_buffer *buffer, const char *filename, int lines)
{
/* initialize structure, because strptime does not do it */
memset (&tm_line, 0, sizeof (struct tm));
- /* we get current time to initialize daylight saving time in
- structure tm_line, otherwise printed time will be shifted
- and will not use DST used on machine */
+ /*
+ * we get current time to initialize daylight saving time in
+ * structure tm_line, otherwise printed time will be shifted
+ * and will not use DST used on machine
+ */
time_now = time (NULL);
localtime_r (&time_now, &tm_line);
pos_message[0] = '\0';
@@ -1068,8 +1072,10 @@ logger_adjust_log_filenames ()
{
if (strcmp (log_filename, ptr_logger_buffer->log_filename) != 0)
{
- /* log filename has changed (probably due to day change),
- then we'll use new filename */
+ /*
+ * log filename has changed (probably due to day
+ * change),then we'll use new filename
+ */
logger_stop (ptr_logger_buffer, 1);
logger_start_buffer (ptr_buffer, 1);
}
diff --git a/src/plugins/plugin.c b/src/plugins/plugin.c
index 91c12e8e3..5abf0eb88 100644
--- a/src/plugins/plugin.c
+++ b/src/plugins/plugin.c
@@ -128,7 +128,7 @@ plugin_get_name (struct t_weechat_plugin *plugin)
}
/*
- * plugin_find_pos: find position for a plugin (for sorting plugins list)
+ * plugin_find_pos: find position for a plugin (for sorting plugins list)
*/
struct t_weechat_plugin *
@@ -573,8 +573,10 @@ plugin_load (const char *filename)
weechat_plugins = new_plugin;
last_weechat_plugin = new_plugin;
- /* associate orphan buffers with this plugin (if asked during upgrade
- process) */
+ /*
+ * associate orphan buffers with this plugin (if asked during upgrade
+ * process)
+ */
gui_buffer_set_plugin_for_upgrade (name, new_plugin);
/* build arguments for plugin */
diff --git a/src/plugins/relay/relay-protocol-irc.c b/src/plugins/relay/relay-protocol-irc.c
index 36826109d..cbe83d196 100644
--- a/src/plugins/relay/relay-protocol-irc.c
+++ b/src/plugins/relay/relay-protocol-irc.c
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/* relay-protocol-irc.c: IRC protocol for client
- (relay acting as an IRC proxy/bouncer) */
+/* relay-protocol-irc.c: IRC protocol for client (relay acting as an IRC proxy/bouncer) */
#include <stdlib.h>
@@ -330,8 +329,10 @@ relay_protocol_irc_recv_one_msg (struct t_relay_client *client, char *data)
{
RELAY_IRC_DATA(client, connected) = 1;
- /* send nick to client if server nick is different of nick asked
- by client with command NICK */
+ /*
+ * send nick to client if server nick is different of nick asked
+ * by client with command NICK
+ */
nick = weechat_info_get ("irc_nick", client->protocol_string);
if (nick && (strcmp (nick, RELAY_IRC_DATA(client, nick)) != 0))
{
@@ -389,8 +390,10 @@ relay_protocol_irc_recv_one_msg (struct t_relay_client *client, char *data)
RELAY_IRC_DATA(client, address),
RELAY_IRC_DATA(client, nick));
- /* hook signal "xxx,irc_in2_*" to catch IRC data received from
- this server */
+ /*
+ * hook signal "xxx,irc_in2_*" to catch IRC data received from
+ * this server
+ */
snprintf (str_signal_name, sizeof (str_signal_name),
"%s,irc_in2_*",
client->protocol_string);
@@ -399,8 +402,10 @@ relay_protocol_irc_recv_one_msg (struct t_relay_client *client, char *data)
&relay_protocol_irc_signal_irc_in2_cb,
client);
- /* hook signal "xxx,irc_out_*" to catch IRC data sent to
- this server */
+ /*
+ * hook signal "xxx,irc_out_*" to catch IRC data sent to
+ * this server
+ */
snprintf (str_signal_name, sizeof (str_signal_name),
"%s,irc_out_*",
client->protocol_string);
diff --git a/src/plugins/relay/relay-server.c b/src/plugins/relay/relay-server.c
index ea5f0f425..a9fbe8763 100644
--- a/src/plugins/relay/relay-server.c
+++ b/src/plugins/relay/relay-server.c
@@ -382,7 +382,7 @@ relay_server_free (struct t_relay_server *server)
free (server);
- relay_servers = new_relay_servers;
+ relay_servers = new_relay_servers;
}
/*
diff --git a/src/plugins/scripts/lua/Makefile.am b/src/plugins/scripts/lua/Makefile.am
index f902d0bb3..8223bb55e 100644
--- a/src/plugins/scripts/lua/Makefile.am
+++ b/src/plugins/scripts/lua/Makefile.am
@@ -14,7 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(LUA_CFLAGS)
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(LUA_CFLAGS)
libdir = ${weechat_libdir}/plugins
diff --git a/src/plugins/scripts/lua/weechat-lua.c b/src/plugins/scripts/lua/weechat-lua.c
index 12ac19a85..f8c6469cf 100644
--- a/src/plugins/scripts/lua/weechat-lua.c
+++ b/src/plugins/scripts/lua/weechat-lua.c
@@ -48,18 +48,20 @@ struct t_plugin_script *lua_current_script = NULL;
const char *lua_current_script_filename = NULL;
lua_State *lua_current_interpreter = NULL;
-/* string used to execute action "install":
- when signal "lua_install_script" is received, name of string
- is added to this string, to be installed later by a timer (when nothing is
- running in script)
-*/
+/*
+ * string used to execute action "install":
+ * when signal "lua_install_script" is received, name of string
+ * is added to this string, to be installed later by a timer (when nothing is
+ * running in script)
+ */
char *lua_action_install_list = NULL;
-/* string used to execute action "remove":
- when signal "lua_remove_script" is received, name of string
- is added to this string, to be removed later by a timer (when nothing is
- running in script)
-*/
+/*
+ * string used to execute action "remove":
+ * when signal "lua_remove_script" is received, name of string
+ * is added to this string, to be removed later by a timer (when nothing is
+ * running in script)
+ */
char *lua_action_remove_list = NULL;
@@ -157,7 +159,7 @@ weechat_lua_exec (struct t_plugin_script *script,
lua_current_script = old_lua_current_script;
- return ret_value;
+ return ret_value;
}
int
@@ -218,7 +220,7 @@ weechat_lua_load (const char *filename)
#ifdef LUA_VERSION_NUM
if (luaL_dostring (lua_current_interpreter, weechat_lua_code) != 0)
-#else
+#else
if (lua_dostring (lua_current_interpreter, weechat_lua_code) != 0)
#endif
{
diff --git a/src/plugins/scripts/perl/weechat-perl-api.c b/src/plugins/scripts/perl/weechat-perl-api.c
index 08b84d8e7..bd674b9cb 100644
--- a/src/plugins/scripts/perl/weechat-perl-api.c
+++ b/src/plugins/scripts/perl/weechat-perl-api.c
@@ -4693,7 +4693,7 @@ XS (XS_weechat_api_nicklist_remove_group)
buffer = SvPV (ST (0), PL_na);
group = SvPV (ST (1), PL_na);
- weechat_nicklist_remove_group (script_str2ptr (buffer),
+ weechat_nicklist_remove_group (script_str2ptr (buffer),
script_str2ptr (group));
PERL_RETURN_OK;
diff --git a/src/plugins/scripts/perl/weechat-perl.c b/src/plugins/scripts/perl/weechat-perl.c
index 15a741545..212b07cee 100644
--- a/src/plugins/scripts/perl/weechat-perl.c
+++ b/src/plugins/scripts/perl/weechat-perl.c
@@ -46,18 +46,20 @@ struct t_plugin_script *perl_current_script = NULL;
const char *perl_current_script_filename = NULL;
int perl_quit_or_upgrade = 0;
-/* string used to execute action "install":
- when signal "perl_install_script" is received, name of string
- is added to this string, to be installed later by a timer (when nothing is
- running in script)
-*/
+/*
+ * string used to execute action "install":
+ * when signal "perl_install_script" is received, name of string
+ * is added to this string, to be installed later by a timer (when nothing is
+ * running in script)
+ */
char *perl_action_install_list = NULL;
-/* string used to execute action "remove":
- when signal "perl_remove_script" is received, name of string
- is added to this string, to be removed later by a timer (when nothing is
- running in script)
-*/
+/*
+ * string used to execute action "remove":
+ * when signal "perl_remove_script" is received, name of string
+ * is added to this string, to be removed later by a timer (when nothing is
+ * running in script)
+ */
char *perl_action_remove_list = NULL;
#ifdef NO_PERL_MULTIPLICITY
@@ -329,7 +331,7 @@ weechat_perl_load (const char *filename)
return 0;
}
- if (*eval != 0)
+ if (*eval != 0)
{
if (*eval == 2)
{
@@ -439,7 +441,7 @@ weechat_perl_unload (struct t_plugin_script *script)
PERL_SET_CONTEXT (script->interpreter);
#else
eval_pv (script->interpreter, TRUE);
-#endif
+#endif
if (script->shutdown_func && script->shutdown_func[0])
{
diff --git a/src/plugins/scripts/python/Makefile.am b/src/plugins/scripts/python/Makefile.am
index a7e1dcc1a..9e8b96ba9 100644
--- a/src/plugins/scripts/python/Makefile.am
+++ b/src/plugins/scripts/python/Makefile.am
@@ -14,7 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(PYTHON_CFLAGS)
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(PYTHON_CFLAGS)
libdir = ${weechat_libdir}/plugins
diff --git a/src/plugins/scripts/python/weechat-python.c b/src/plugins/scripts/python/weechat-python.c
index a2dc8312a..e406de6b7 100644
--- a/src/plugins/scripts/python/weechat-python.c
+++ b/src/plugins/scripts/python/weechat-python.c
@@ -44,18 +44,20 @@ struct t_plugin_script *python_current_script = NULL;
const char *python_current_script_filename = NULL;
PyThreadState *python_mainThreadState = NULL;
-/* string used to execute action "install":
- when signal "python_install_script" is received, name of string
- is added to this string, to be installed later by a timer (when nothing is
- running in script)
-*/
+/*
+ * string used to execute action "install":
+ * when signal "python_install_script" is received, name of string
+ * is added to this string, to be installed later by a timer (when nothing is
+ * running in script)
+ */
char *python_action_install_list = NULL;
-/* string used to execute action "remove":
- when signal "python_remove_script" is received, name of string
- is added to this string, to be removed later by a timer (when nothing is
- running in script)
-*/
+/*
+ * string used to execute action "remove":
+ * when signal "python_remove_script" is received, name of string
+ * is added to this string, to be removed later by a timer (when nothing is
+ * running in script)
+ */
char *python_action_remove_list = NULL;
char python_buffer_output[128];
@@ -179,10 +181,10 @@ weechat_python_exec (struct t_plugin_script *script,
ret_value = NULL;
- /*
- ugly hack : rc = NULL while 'return weechat.WEECHAT_RC_OK ....
- because of '#define WEECHAT_RC_OK 0'
- */
+ /*
+ * ugly hack : rc = NULL while 'return weechat.WEECHAT_RC_OK ....
+ * because of '#define WEECHAT_RC_OK 0'
+ */
if (rc == NULL)
rc = PyInt_FromLong (0);
@@ -259,7 +261,7 @@ weechat_python_output (PyObject *self, PyObject *args)
python_buffer_output[0] = '\0';
}
}
- else
+ else
{
m = msg;
while ((p = strchr (m, '\n')) != NULL)
@@ -367,7 +369,7 @@ weechat_python_load (const char *filename)
return 0;
}
- /* adding $weechat_dir/python in $PYTHONPATH */
+ /* adding $weechat_dir/python in $PYTHONPATH */
python_path = PySys_GetObject ("path");
weechat_home = weechat_info_get ("weechat_dir", "");
if (weechat_home)
diff --git a/src/plugins/scripts/ruby/Makefile.am b/src/plugins/scripts/ruby/Makefile.am
index 79009c948..5b56e8612 100644
--- a/src/plugins/scripts/ruby/Makefile.am
+++ b/src/plugins/scripts/ruby/Makefile.am
@@ -14,7 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(RUBY_CFLAGS)
+INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(RUBY_CFLAGS)
libdir = ${weechat_libdir}/plugins
diff --git a/src/plugins/scripts/ruby/weechat-ruby.c b/src/plugins/scripts/ruby/weechat-ruby.c
index 8179d758d..fe4a1181a 100644
--- a/src/plugins/scripts/ruby/weechat-ruby.c
+++ b/src/plugins/scripts/ruby/weechat-ruby.c
@@ -66,18 +66,20 @@ struct t_plugin_script *last_ruby_script = NULL;
struct t_plugin_script *ruby_current_script = NULL;
const char *ruby_current_script_filename = NULL;
-/* string used to execute action "install":
- when signal "ruby_install_script" is received, name of string
- is added to this string, to be installed later by a timer (when nothing is
- running in script)
-*/
+/*
+ * string used to execute action "install":
+ * when signal "ruby_install_script" is received, name of string
+ * is added to this string, to be installed later by a timer (when nothing is
+ * running in script)
+ */
char *ruby_action_install_list = NULL;
-/* string used to execute action "remove":
- when signal "ruby_remove_script" is received, name of string
- is added to this string, to be removed later by a timer (when nothing is
- running in script)
-*/
+/*
+ * string used to execute action "remove":
+ * when signal "ruby_remove_script" is received, name of string
+ * is added to this string, to be removed later by a timer (when nothing is
+ * running in script)
+ */
char *ruby_action_remove_list = NULL;
VALUE ruby_mWeechat, ruby_mWeechatOutputs;
@@ -95,11 +97,11 @@ typedef struct protect_call_arg {
} protect_call_arg_t;
-/*
+/*
* protect_funcall0 : used to protect a function call
*/
-static VALUE
+static VALUE
protect_funcall0 (VALUE arg)
{
return rb_funcall2 (((protect_call_arg_t *)arg)->recv,
@@ -108,7 +110,7 @@ protect_funcall0 (VALUE arg)
((protect_call_arg_t *)arg)->argv);
}
-/*
+/*
* rb_protect_funcall : function call in protect mode
*/
@@ -389,7 +391,7 @@ weechat_ruby_exec (struct t_plugin_script *script,
* weechat_ruby_output: redirection for stdout and stderr
*/
-static VALUE
+static VALUE
weechat_ruby_output (VALUE self, VALUE str)
{
char *msg, *p, *m;
@@ -436,7 +438,7 @@ weechat_ruby_output (VALUE self, VALUE str)
* weechat_ruby_output_flush: just for compatibility
*/
-static VALUE
+static VALUE
weechat_ruby_output_flush (VALUE self)
{
/* make C compiler happy */
diff --git a/src/plugins/scripts/script.c b/src/plugins/scripts/script.c
index 20b8712fe..1afaa40b7 100644
--- a/src/plugins/scripts/script.c
+++ b/src/plugins/scripts/script.c
@@ -558,7 +558,7 @@ script_search_path (struct t_weechat_plugin *weechat_plugin,
}
/*
- * script_find_pos: find position for a script (for sorting scripts list)
+ * script_find_pos: find position for a script (for sorting scripts list)
*/
struct t_plugin_script *
diff --git a/src/plugins/scripts/tcl/weechat-tcl-api.c b/src/plugins/scripts/tcl/weechat-tcl-api.c
index 84f75aa7d..d239b9983 100644
--- a/src/plugins/scripts/tcl/weechat-tcl-api.c
+++ b/src/plugins/scripts/tcl/weechat-tcl-api.c
@@ -19,7 +19,7 @@
/* weechat-tcl-api.c: Tcl API functions */
-#undef _
+#undef _
#include <tcl.h>
#include <stdlib.h>
@@ -234,7 +234,7 @@ weechat_tcl_api_plugin_get_name (ClientData clientData, Tcl_Interp *interp,
Tcl_Obj* objp;
char *plugin;
const char *result;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -267,7 +267,7 @@ weechat_tcl_api_charset_set (ClientData clientData, Tcl_Interp *interp,
int objc, Tcl_Obj *CONST objv[])
{
Tcl_Obj* objp;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -301,7 +301,7 @@ weechat_tcl_api_iconv_to_internal (ClientData clientData, Tcl_Interp *interp,
{
Tcl_Obj* objp;
char *result, *charset, *string;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -337,7 +337,7 @@ weechat_tcl_api_iconv_from_internal (ClientData clientData, Tcl_Interp *interp,
{
Tcl_Obj* objp;
char *result, *charset, *string;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -372,7 +372,7 @@ weechat_tcl_api_gettext (ClientData clientData, Tcl_Interp *interp,
{
Tcl_Obj* objp;
const char *result;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -692,7 +692,7 @@ weechat_tcl_api_list_add (ClientData clientData, Tcl_Interp *interp,
{
Tcl_Obj* objp;
char *result, *weelist, *data, *where, *user_data;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -733,7 +733,7 @@ weechat_tcl_api_list_search (ClientData clientData, Tcl_Interp *interp,
{
Tcl_Obj* objp;
char *result, *weelist, *data;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -769,7 +769,7 @@ weechat_tcl_api_list_casesearch (ClientData clientData, Tcl_Interp *interp,
{
Tcl_Obj* objp;
char *result, *weelist, *data;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -844,7 +844,7 @@ weechat_tcl_api_list_set (ClientData clientData, Tcl_Interp *interp,
{
Tcl_Obj* objp;
char *item, *new_value;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -879,7 +879,7 @@ weechat_tcl_api_list_next (ClientData clientData, Tcl_Interp *interp,
{
Tcl_Obj* objp;
char *result;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -911,7 +911,7 @@ weechat_tcl_api_list_prev (ClientData clientData, Tcl_Interp *interp,
{
Tcl_Obj* objp;
char *result;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -943,7 +943,7 @@ weechat_tcl_api_list_string (ClientData clientData, Tcl_Interp *interp,
{
Tcl_Obj* objp;
const char *result;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -975,7 +975,7 @@ weechat_tcl_api_list_size (ClientData clientData, Tcl_Interp *interp,
{
Tcl_Obj* objp;
int size;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -1007,7 +1007,7 @@ weechat_tcl_api_list_remove (ClientData clientData, Tcl_Interp *interp,
{
Tcl_Obj* objp;
char *weelist, *item;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -1071,7 +1071,7 @@ weechat_tcl_api_list_free (ClientData clientData, Tcl_Interp *interp,
int objc, Tcl_Obj *CONST objv[])
{
Tcl_Obj* objp;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -1145,7 +1145,7 @@ weechat_tcl_api_config_new (ClientData clientData, Tcl_Interp *interp,
{
Tcl_Obj* objp;
char *result, *name, *function, *data;
- int i;
+ int i;
/* make C compiler happy */
(void) clientData;
@@ -1411,7 +1411,7 @@ weechat_tcl_api_config_new_section (ClientData clientData, Tcl_Interp *interp,
int i, can_add, can_delete;
/* make C compiler happy */
- (void) clientData;
+ (void) clientData;
if (!tcl_current_script)
{
@@ -1744,7 +1744,7 @@ weechat_tcl_api_config_string_to_boolean (ClientData clientData, Tcl_Interp *int
int objc, Tcl_Obj *CONST objv[])
{
Tcl_Obj* objp;
- int result, i;
+ int result, i;
/* make C compiler happy */
(void) clientData;
@@ -2893,7 +2893,7 @@ weechat_tcl_api_print_date_tags (ClientData clientData, Tcl_Interp *interp,
{
WEECHAT_SCRIPT_MSG_WRONG_ARGS(TCL_CURRENT_SCRIPT_NAME, "print_date_tags");
TCL_RETURN_EMPTY;
- }
+ }
buffer = Tcl_GetStringFromObj (objv[1], &i);
tags = Tcl_GetStringFromObj (objv[3], &i);
@@ -5259,7 +5259,7 @@ weechat_tcl_api_nicklist_remove_group (ClientData clientData, Tcl_Interp *interp
buffer = Tcl_GetStringFromObj (objv[1], &i);
group = Tcl_GetStringFromObj (objv[2], &i);
- weechat_nicklist_remove_group (script_str2ptr (buffer),
+ weechat_nicklist_remove_group (script_str2ptr (buffer),
script_str2ptr (group));
TCL_RETURN_OK;
@@ -6435,7 +6435,7 @@ weechat_tcl_api_upgrade_read (ClientData clientData, Tcl_Interp *interp,
int i, rc;
/* make C compiler happy */
- (void) clientData;
+ (void) clientData;
if (!tcl_current_script)
{
@@ -6506,10 +6506,10 @@ void weechat_tcl_api_init (Tcl_Interp *interp)
int i;
Tcl_Obj *objp;
- /* standard initializer */
+ /* standard initializer */
Tcl_Init (interp);
- Tcl_Eval (interp,"namespace eval weechat {}");
+ Tcl_Eval (interp,"namespace eval weechat {}");
/* interface constants */
/* set variables, TODO: make them unmodifiable (thru Tcl_TraceVar) ? */
diff --git a/src/plugins/scripts/tcl/weechat-tcl.c b/src/plugins/scripts/tcl/weechat-tcl.c
index 89c7e40c4..4a5a05666 100644
--- a/src/plugins/scripts/tcl/weechat-tcl.c
+++ b/src/plugins/scripts/tcl/weechat-tcl.c
@@ -48,18 +48,20 @@ struct t_plugin_script *last_tcl_script = NULL;
struct t_plugin_script *tcl_current_script = NULL;
const char *tcl_current_script_filename = NULL;
-/* string used to execute action "install":
- when signal "tcl_install_script" is received, name of string
- is added to this string, to be installed later by a timer (when nothing is
- running in script)
-*/
+/*
+ * string used to execute action "install":
+ * when signal "tcl_install_script" is received, name of string
+ * is added to this string, to be installed later by a timer (when nothing is
+ * running in script)
+ */
char *tcl_action_install_list = NULL;
-/* string used to execute action "remove":
- when signal "tcl_remove_script" is received, name of string
- is added to this string, to be removed later by a timer (when nothing is
- running in script)
-*/
+/*
+ * string used to execute action "remove":
+ * when signal "tcl_remove_script" is received, name of string
+ * is added to this string, to be removed later by a timer (when nothing is
+ * running in script)
+ */
char *tcl_action_remove_list = NULL;
Tcl_Interp* cinterp;
@@ -85,7 +87,7 @@ weechat_tcl_exec (struct t_plugin_script *script,
tcl_current_script = script;
interp = (Tcl_Interp*)script->interpreter;
- if (function && function[0])
+ if (function && function[0])
{
cmdlist = Tcl_NewListObj(0,NULL);
Tcl_IncrRefCount(cmdlist); /* +1 */
diff --git a/src/plugins/weechat-plugin.h b/src/plugins/weechat-plugin.h
index 3e68a6dff..92be4a9ec 100644
--- a/src/plugins/weechat-plugin.h
+++ b/src/plugins/weechat-plugin.h
@@ -90,10 +90,11 @@ struct timeval;
#define WEECHAT_HOTLIST_PRIVATE "2"
#define WEECHAT_HOTLIST_HIGHLIGHT "3"
-/* process return code (for callback):
- if >= 0, then process ended and it's return code of command
- if < 0, then it's running or error
-*/
+/*
+ * process return code (for callback):
+ * if >= 0, then process ended and it's return code of command
+ * if < 0, then it's running or error
+ */
#define WEECHAT_HOOK_PROCESS_RUNNING -1
#define WEECHAT_HOOK_PROCESS_ERROR -2
@@ -130,9 +131,11 @@ struct t_weechat_plugin
/* plugin functions (API) */
- /* IMPORTANT NOTE for WeeChat developers: always add new API functions
- at the END of functions, for keeping backward compatibility with
- existing plugins */
+ /*
+ * IMPORTANT NOTE for WeeChat developers: always add new API functions
+ * at the END of functions, for keeping backward compatibility with
+ * existing plugins
+ */
/* plugins */
const char *(*plugin_get_name) (struct t_weechat_plugin *plugin);
diff --git a/src/plugins/xfer/xfer-dcc.c b/src/plugins/xfer/xfer-dcc.c
index 4cf18fda8..21889600e 100644
--- a/src/plugins/xfer/xfer-dcc.c
+++ b/src/plugins/xfer/xfer-dcc.c
@@ -118,8 +118,10 @@ xfer_dcc_send_file_child (struct t_xfer *xfer)
num_sent = send (xfer->sock, buffer, num_read, 0);
if (num_sent < 0)
{
- /* socket is temporarily not available (receiver can't receive
- amount of data we sent ?!) */
+ /*
+ * socket is temporarily not available (receiver can't
+ * receive amount of data we sent ?!)
+ */
if (errno == EAGAIN)
usleep (1000);
else
@@ -181,7 +183,7 @@ xfer_dcc_recv_file_child (struct t_xfer *xfer)
last_sent = time (NULL);
while (1)
- {
+ {
num_read = recv (xfer->sock, buffer, sizeof (buffer), 0);
if (num_read == -1)
{
diff --git a/src/plugins/xfer/xfer.c b/src/plugins/xfer/xfer.c
index 553381232..06979c70a 100644
--- a/src/plugins/xfer/xfer.c
+++ b/src/plugins/xfer/xfer.c
@@ -901,7 +901,7 @@ xfer_add_cb (void *data, const char *signal, const char *type_data,
if (sock > 0)
{
memset (&addr, 0, sizeof (struct sockaddr_in));
- length = sizeof (addr);
+ length = sizeof (addr);
getsockname (sock, (struct sockaddr *) &addr, &length);
addr.sin_family = AF_INET;
}
diff --git a/weechat.spec b/weechat.spec
index f3d93af19..65b8de44d 100644
--- a/weechat.spec
+++ b/weechat.spec
@@ -54,10 +54,10 @@ mv $RPM_BUILD_ROOT%{_libdir}/*.* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/
%find_lang %name
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
-%defattr(-,root,root,0755)
+%defattr(-,root,root,0755)
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README UPGRADE_0.3
%doc %{_docdir}/%{name}/*.html
%{_mandir}/man1/%{name}-curses.1*