Skip to content
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

Jump to bottom

Fix warnings #938

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix warnings #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4806d55
fix gcc8 incompatible function pointer cast warning
mmomtchev Apr 21, 2022
ca03c93
fix class-memaccess warnings
mmomtchev Apr 21, 2022
cf9807a
use a better name
mmomtchev Apr 21, 2022
c76c229
fix class memaccess warnings
mmomtchev Apr 21, 2022
db7a59d
fix strncat Wrestrict warnings
mmomtchev Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 27 additions & 0 deletions nan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,33 @@ namespace Nan {
#define NAN_MODULE_INIT(name) \
void name(Nan::ADDON_REGISTER_FUNCTION_ARGS_TYPE target)

#if NODE_MODULE_VERSION >= NODE_14_MODULE_VERSION
#undef NODE_MODULE_X
#define NODE_MODULE_X(modname, regfunc, priv, flags) \
extern "C" { \
void nan_mod_init(v8::Local<v8::Object> target, \
v8::Local<v8::Value>, \
void *) { \
regfunc(target); \
} \
static node::node_module _module = \
{ \
NODE_MODULE_VERSION, \
flags, \
NULL, /* NOLINT (readability/null_usage) */ \
__FILE__, \
(node::addon_register_func) (nan_mod_init), \
NULL, /* NOLINT (readability/null_usage) */ \
NODE_STRINGIFY(modname), \
priv, \
NULL /* NOLINT (readability/null_usage) */ \
}; \
NODE_C_CTOR(_register_ ## modname) { \
node_module_register(&_module); \
} \
}
#endif

#if NODE_MAJOR_VERSION >= 10 || \
NODE_MAJOR_VERSION == 9 && NODE_MINOR_VERSION >= 3
#define NAN_MODULE_WORKER_ENABLED(module_name, registration) \
Expand Down
2 changes: 1 addition & 1 deletion nan_weak.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class WeakCallbackInfo {
, void *field1 = 0
, void *field2 = 0) :
callback_(callback), isolate_(0), parameter_(parameter) {
std::memcpy(&persistent_, persistent, sizeof (v8::Persistent<v8::Value>));
std::memcpy((void*)&persistent_, (void*)persistent, sizeof (v8::Persistent<v8::Value>));
internal_fields_[0] = field1;
internal_fields_[1] = field2;
}
Expand Down
12 changes: 6 additions & 6 deletions test/cpp/accessors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ NAN_GETTER(SetterGetter::GetProp1) {
, "Prop1:GETTER("
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
strncat(
settergetter->log
strncpy(
settergetter->log + strlen(settergetter->log)
, settergetter->prop1
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
Expand All @@ -119,8 +119,8 @@ NAN_GETTER(SetterGetter::GetProp2) {
, "Prop2:GETTER("
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
strncat(
settergetter->log
strncpy(
settergetter->log + strlen(settergetter->log)
, settergetter->prop2
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
Expand All @@ -146,8 +146,8 @@ NAN_SETTER(SetterGetter::SetProp2) {
, "Prop2:SETTER("
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
strncat(
settergetter->log
strncpy(
settergetter->log + strlen(settergetter->log)
, settergetter->prop2
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
Expand Down
12 changes: 6 additions & 6 deletions test/cpp/accessors2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ NAN_GETTER(SetterGetter::GetProp1) {
, "Prop1:GETTER("
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
strncat(
settergetter->log
strncpy(
settergetter->log + strlen(settergetter->log)
, settergetter->prop1
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
Expand All @@ -117,8 +117,8 @@ NAN_GETTER(SetterGetter::GetProp2) {
, "Prop2:GETTER("
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
strncat(
settergetter->log
strncpy(
settergetter->log + strlen(settergetter->log)
, settergetter->prop2
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
Expand All @@ -144,8 +144,8 @@ NAN_SETTER(SetterGetter::SetProp2) {
, "Prop2:SETTER("
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
strncat(
settergetter->log
strncpy(
settergetter->log + strlen(settergetter->log)
, settergetter->prop2
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
Expand Down
12 changes: 6 additions & 6 deletions test/cpp/methodswithdata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ NAN_GETTER(SetterGetter::GetProp1) {
, "Prop1:GETTER("
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
strncat(
settergetter->log
strncpy(
settergetter->log + strlen(settergetter->log)
, settergetter->prop1
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
Expand All @@ -106,8 +106,8 @@ NAN_GETTER(SetterGetter::GetProp2) {
, "Prop2:GETTER("
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
strncat(
settergetter->log
strncpy(
settergetter->log + strlen(settergetter->log)
, settergetter->prop2
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
Expand Down Expand Up @@ -136,8 +136,8 @@ NAN_SETTER(SetterGetter::SetProp2) {
, "Prop2:SETTER("
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
strncat(
settergetter->log
strncpy(
settergetter->log + strlen(settergetter->log)
, settergetter->prop2
, sizeof (settergetter->log) - 1 - strlen(settergetter->log));
assert(strlen(settergetter->log) < sizeof (settergetter->log));
Expand Down
2 changes: 1 addition & 1 deletion test/cpp/persistent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ NAN_METHOD(ToPersistentAndBackAgain) {
Persistent<v8::Object> persistent(To<v8::Object>(info[0]).ToLocalChecked());
v8::Local<v8::Object> object = New(persistent);
persistent.Reset();
memset(&persistent, -1, sizeof(persistent)); // Clobber it good.
memset((void*)&persistent, -1, sizeof(persistent)); // Clobber it good.
info.GetReturnValue().Set(object);
}

Expand Down