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

scripts: fix function string_parse_size on 32-bit systems (python and ruby) (issue #1999)

Browse Source
This commit is contained in:
Sébastien Helleu
2023-08-18 16:33:35 +02:00
parent 647d7033cf
commit ab7b51db72
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.adoc
+1
View File
@@ -19,6 +19,7 @@ Bug fixes::
* core: fix increment/decrement of options weechat.notify.*
* irc: add missing tags on multiline messages (issue #1987)
* irc: fix redirection of command `/list` when the reply doesn't start with message 321 (start of /list)
* scripts: fix function string_parse_size on 32-bit systems (python and ruby) (issue #1999)
* xfer: fix conversion of string to IPv4 on 32-bit systems (issue #1999)
Tests::
src/plugins/python/weechat-python-api.c
+5 -3
View File
@@ -80,6 +80,8 @@
return PyLong_FromLong((long)__int)
#define API_RETURN_LONG(__long) \
return PyLong_FromLong(__long)
#define API_RETURN_LONGLONG(__longlong) \
return PyLong_FromLongLong(__longlong)
/*
@@ -374,14 +376,14 @@ API_FUNC(string_parse_size)
char *size;
unsigned long long value;
API_INIT_FUNC(1, "string_parse_size", API_RETURN_LONG(0));
API_INIT_FUNC(1, "string_parse_size", API_RETURN_LONGLONG(0));
size = NULL;
if (!PyArg_ParseTuple (args, "s", &size))
API_WRONG_ARGS(API_RETURN_LONG(0));
API_WRONG_ARGS(API_RETURN_LONGLONG(0));
value = weechat_string_parse_size (size);
API_RETURN_LONG(value);
API_RETURN_LONGLONG(value);
}
API_FUNC(string_color_code_size)
src/plugins/ruby/weechat-ruby-api.c
+5 -3
View File
@@ -77,6 +77,8 @@
return INT2FIX (__int)
#define API_RETURN_LONG(__long) \
return LONG2NUM (__long)
#define API_RETURN_LONGLONG(__longlong) \
return LL2NUM (__longlong)
/*
@@ -454,9 +456,9 @@ weechat_ruby_api_string_parse_size (VALUE class, VALUE size)
char *c_size;
unsigned long long value;
API_INIT_FUNC(1, "string_parse_size", API_RETURN_LONG(0));
API_INIT_FUNC(1, "string_parse_size", API_RETURN_LONGLONG(0));
if (NIL_P (size))
API_WRONG_ARGS(API_RETURN_LONG(0));
API_WRONG_ARGS(API_RETURN_LONGLONG(0));
Check_Type (size, T_STRING);
@@ -464,7 +466,7 @@ weechat_ruby_api_string_parse_size (VALUE class, VALUE size)
value = weechat_string_parse_size (c_size);
API_RETURN_LONG(value);
API_RETURN_LONGLONG(value);
}
static VALUE
tests/scripts/python/testapi.py
+1 -1
View File
@@ -83,7 +83,7 @@ def test_strings():
check(weechat.string_parse_size('123 b') == 123)
check(weechat.string_parse_size('120k') == 120000)
check(weechat.string_parse_size('1500m') == 1500000000)
check(weechat.string_parse_size('3g') == 3000000000)
check(weechat.string_parse_size('2g') == 2000000000)
check(weechat.string_color_code_size('') == 0)
check(weechat.string_color_code_size('test') == 0)
str_color = weechat.color('yellow,red')