pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-25 12:26:40 +02:00
Code Activity

Use string instead of char for prefixes in nicklist

Browse Source
This commit is contained in:
Sebastien Helleu
2009-02-17 19:23:16 +01:00
parent eaf3319ed3
commit b5f27d3fea
13 changed files with 87 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/scripts/lua/weechat-lua-api.c
+2 -7
View File
@@ -4542,7 +4542,7 @@ static int
weechat_lua_api_nicklist_add_nick (lua_State *L)
{
const char *buffer, *group, *name, *color, *prefix, *prefix_color;
char char_prefix, *result;
char *result;
int n, visible;
/* make C compiler happy */
@@ -4578,16 +4578,11 @@ weechat_lua_api_nicklist_add_nick (lua_State *L)
prefix_color = lua_tostring (lua_current_interpreter, -2);
visible = lua_tonumber (lua_current_interpreter, -1);
if (prefix && prefix[0])
char_prefix = prefix[0];
else
char_prefix = ' ';
result = script_ptr2str (weechat_nicklist_add_nick (script_str2ptr (buffer),
script_str2ptr (group),
name,
color,
char_prefix,
prefix,
prefix_color,
visible));
src/plugins/scripts/perl/weechat-perl-api.c
+3 -9
View File
@@ -3828,8 +3828,7 @@ static XS (XS_weechat_api_nicklist_search_group)
static XS (XS_weechat_api_nicklist_add_nick)
{
char *prefix, char_prefix, *result, *buffer, *group, *name, *color;
char *prefix_color;
char *result, *buffer, *group, *name, *color, *prefix, *prefix_color;
dXSARGS;
/* make C compiler happy */
@@ -3847,22 +3846,17 @@ static XS (XS_weechat_api_nicklist_add_nick)
PERL_RETURN_EMPTY;
}
prefix = SvPV(ST (4), PL_na);
if (prefix && prefix[0])
char_prefix = prefix[0];
else
char_prefix = ' ';
buffer = SvPV (ST (0), PL_na);
group = SvPV (ST (1), PL_na);
name = SvPV (ST (2), PL_na);
color = SvPV (ST (3), PL_na);
prefix = SvPV(ST (4), PL_na);
prefix_color = SvPV (ST (5), PL_na);
result = script_ptr2str (weechat_nicklist_add_nick (script_str2ptr (buffer),
script_str2ptr (group),
name,
color,
char_prefix,
prefix,
prefix_color,
SvIV (ST (6)))); /* visible */
src/plugins/scripts/python/weechat-python-api.c
+1 -7
View File
@@ -4063,7 +4063,6 @@ static PyObject *
weechat_python_api_nicklist_add_nick (PyObject *self, PyObject *args)
{
char *buffer, *group, *name, *color, *prefix, *prefix_color, *result;
char char_prefix;
int visible;
PyObject *object;
@@ -4091,16 +4090,11 @@ weechat_python_api_nicklist_add_nick (PyObject *self, PyObject *args)
PYTHON_RETURN_EMPTY;
}
if (prefix && prefix[0])
char_prefix = prefix[0];
else
char_prefix = ' ';
result = script_ptr2str (weechat_nicklist_add_nick (script_str2ptr (buffer),
script_str2ptr (group),
name,
color,
char_prefix,
prefix,
prefix_color,
visible));
src/plugins/scripts/ruby/weechat-ruby-api.c
+3 -8
View File
@@ -4641,8 +4641,8 @@ weechat_ruby_api_nicklist_add_nick (VALUE class, VALUE buffer, VALUE group,
VALUE name, VALUE color, VALUE prefix,
VALUE prefix_color, VALUE visible)
{
char *c_buffer, *c_group, *c_name, *c_color, *c_prefix, char_prefix;
char *c_prefix_color, *result;
char *c_buffer, *c_group, *c_name, *c_color, *c_prefix, *c_prefix_color;
char *result;
int c_visible;
VALUE return_value;
@@ -4686,16 +4686,11 @@ weechat_ruby_api_nicklist_add_nick (VALUE class, VALUE buffer, VALUE group,
c_prefix_color = STR2CSTR (prefix_color);
c_visible = FIX2INT (visible);
if (c_prefix && c_prefix[0])
char_prefix = c_prefix[0];
else
char_prefix = ' ';
result = script_ptr2str (weechat_nicklist_add_nick (script_str2ptr (c_buffer),
script_str2ptr (c_group),
c_name,
c_color,
char_prefix,
c_prefix,
c_prefix_color,
c_visible));
src/plugins/scripts/tcl/weechat-tcl-api.c
+4 -10
View File
@@ -4336,9 +4336,8 @@ weechat_tcl_api_nicklist_add_nick (ClientData clientData, Tcl_Interp *interp,
int objc, Tcl_Obj *CONST objv[])
{
Tcl_Obj *objp;
char *prefix, char_prefix, *result, *buffer, *group, *name, *color;
char *prefix_color;
int i,visible;
char *prefix, *result, *buffer, *group, *name, *color, *prefix_color;
int i, visible;
/* make C compiler happy */
(void) clientData;
@@ -4355,12 +4354,6 @@ weechat_tcl_api_nicklist_add_nick (ClientData clientData, Tcl_Interp *interp,
TCL_RETURN_EMPTY;
}
prefix = Tcl_GetStringFromObj (objv[5], &i);
if (prefix && prefix[0])
char_prefix = prefix[0];
else
char_prefix = ' ';
if (Tcl_GetIntFromObj (interp, objv[7], &visible) != TCL_OK)
{
WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("nicklist_add_nick");
@@ -4371,12 +4364,13 @@ weechat_tcl_api_nicklist_add_nick (ClientData clientData, Tcl_Interp *interp,
group = Tcl_GetStringFromObj (objv[2], &i);
name = Tcl_GetStringFromObj (objv[3], &i);
color = Tcl_GetStringFromObj (objv[4], &i);
prefix = Tcl_GetStringFromObj (objv[5], &i);
prefix_color = Tcl_GetStringFromObj (objv[6], &i);
result = script_ptr2str (weechat_nicklist_add_nick (script_str2ptr (buffer),
script_str2ptr (group),
name,
color,
char_prefix,
prefix,
prefix_color,
visible)); /* visible */