Skip to content

Fix some warnings #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 8, 2025
Merged

Fix some warnings #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5aaa8fc
Fix comparison warnings and unused variable warning.
djberg96 Apr 7, 2025
7f4491e
Fix ambiguity warning.
djberg96 Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions ext/gpgme/gpgme_n.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,19 +264,19 @@ rb_s_gpgme_hash_algo_name (VALUE dummy, VALUE valgo)
static VALUE
rb_s_gpgme_err_code (VALUE dummy, VALUE verr)
{
return INT2FIX(gpgme_err_code (NUM2LONG(verr)));
return INT2FIX(gpgme_err_code (NUM2UINT(verr)));
}

static VALUE
rb_s_gpgme_err_source (VALUE dummy, VALUE verr)
{
return INT2FIX(gpgme_err_source (NUM2LONG(verr)));
return INT2FIX(gpgme_err_source (NUM2UINT(verr)));
}

static VALUE
rb_s_gpgme_strerror (VALUE dummy, VALUE verr)
{
return rb_str_new2 (gpgme_strerror (NUM2LONG(verr)));
return rb_str_new2 (gpgme_strerror (NUM2UINT(verr)));
}

static VALUE
Expand All @@ -299,7 +299,7 @@ rb_s_gpgme_data_new_from_mem (VALUE dummy, VALUE rdh, VALUE vbuffer,
size_t size = NUM2UINT(vsize);
gpgme_error_t err;

if (RSTRING_LEN(vbuffer) < size)
if ((size_t)RSTRING_LEN(vbuffer) < size)
rb_raise (rb_eArgError, "argument out of range");

err = gpgme_data_new_from_mem (&dh, StringValuePtr(vbuffer), size, 1);
Expand Down Expand Up @@ -538,7 +538,6 @@ rb_s_gpgme_get_ctx_flag (VALUE dummy, VALUE vctx, VALUE vname)
{
gpgme_ctx_t ctx;
const char* name;
int yes;

name = StringValueCStr(vname);

Expand Down
4 changes: 2 additions & 2 deletions test/data_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
it "creates a data from a file" do
# magic fromfile
data = GPGME::Data.new(File.open(__FILE__))
assert_match /magic fromfile/, data.read
assert_match(/magic fromfile/, data.read)
end

it "creates a data from file descriptor" do
# magic filedescriptor
File.open(__FILE__) do |f|
data = GPGME::Data.new(f.fileno)
assert_match /magic filedescriptor/, data.read
assert_match(/magic filedescriptor/, data.read)
end
end
end
Expand Down