Skip to content

Use nullptr instead of NULL #2487

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
jwillemsen merged 1 commit into from
Nov 25, 2025
Merged

Use nullptr instead of NULL #2487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions ACE/ace/Activation_Queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ ACE_Activation_Queue::dump () const
if (this->queue_)
this->queue_->dump();
else
//FUZZ: disable check_for_NULL
ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(NULL)\n")));
//FUZZ: enable check_for_NULL
ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(nullptr)\n")));

ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
#endif /* ACE_HAS_DUMP */
Expand Down
6 changes: 2 additions & 4 deletions ACE/ace/Future.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,9 @@ ACE_Future_Rep<T>::dump () const
(int) this->ref_count_));
ACELIB_DEBUG ((LM_INFO,"value_:\n"));
if (this->value_)
ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (NON-NULL)\n")));
ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (non-nullptr)\n")));
else
//FUZZ: disable check_for_NULL
ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (NULL)\n")));
//FUZZ: enable check_for_NULL
ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (nullptr)\n")));

ACELIB_DEBUG ((LM_INFO,"value_ready_:\n"));
this->value_ready_.dump ();
Expand Down
4 changes: 1 addition & 3 deletions ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/http.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,11 @@ int http_start_response(Session *sn, Request *rq);

char **http_hdrs2env(pblock *pb);

//FUZZ: disable check_for_NULL
/*
* http_status sets status to the code n, with reason string r. If r is
* NULL, the server will attempt to find one for the given status code.
* nullptr, the server will attempt to find one for the given status code.
* If it finds none, it will give "Because I felt like it."
*/
//FUZZ: enable check_for_NULL

#define protocol_status http_status
void http_status(Session *sn, Request *rq, int n, char *r);
Expand Down
7 changes: 0 additions & 7 deletions ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,6 @@
#define MAXHOSTNAMELEN 64
#endif

//FUZZ: disable check_for_NULL
/* SunOS doesn't define NULL */
#ifndef NULL
#define NULL 0
#endif
//FUZZ: enable check_for_NULL

/* encapsulation of minor UNIX/WIN NT differences */
#ifdef WIN32
#define NETREAD(sock, buf, len) recv(sock, buf, len, 0)
Expand Down
4 changes: 1 addition & 3 deletions ACE/tests/Network_Adapters_Test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,13 +210,11 @@ Echo_Handler::open (ACE_Reactor * const reactor,
ACE_TEXT ("reactor is already set.\n")),
-1);

//FUZZ: disable check_for_NULL
if (!reactor)
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("(%P|%t) Echo_Handler::open - failed: NULL ")
ACE_TEXT ("(%P|%t) Echo_Handler::open - failed: nullptr ")
ACE_TEXT ("pointer to reactor provided.\n")),
-1);
//FUZZ: enable check_for_NULL

this->reactor (reactor);
this->reply_wait_ = reply_wait;
Expand Down
16 changes: 4 additions & 12 deletions TAO/tests/Bug_2234_Regression/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,7 @@ class FooImpl : public POA_Test::Foo
ACE_DEBUG( (LM_INFO, ". in TestString\n"));
if (0 == a)
{
//FUZZ: disable check_for_NULL
ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter a\n"));
//FUZZ: enable check_for_NULL
ACE_DEBUG( (LM_INFO, "* Incorrect nullptr string given for parameter a\n"));
throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
}
if (1 != ACE_OS::strlen( a ))
Expand All @@ -117,9 +115,7 @@ class FooImpl : public POA_Test::Foo
}
if (0 == c)
{
//FUZZ: disable check_for_NULL
ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter c\n"));
//FUZZ: enable check_for_NULL
ACE_DEBUG( (LM_INFO, "* Incorrect nullptr string given for parameter c\n"));
throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
}
if (1 != ACE_OS::strlen( c ))
Expand Down Expand Up @@ -187,9 +183,7 @@ class FooImpl : public POA_Test::Foo
ACE_DEBUG( (LM_INFO, ". in TestVarStruct\n"));
if (0 == a.val.in())
{
//FUZZ: disable check_for_NULL
ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter a\n"));
//FUZZ: enable check_for_NULL
ACE_DEBUG( (LM_INFO, "* Incorrect nullptr string given for parameter a\n"));
throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
}
if (1 != ACE_OS::strlen( a.val.in() ))
Expand All @@ -204,9 +198,7 @@ class FooImpl : public POA_Test::Foo
}
if (0 == c.val.in())
{
//FUZZ: disable check_for_NULL
ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter c\n"));
//FUZZ: enable check_for_NULL
ACE_DEBUG( (LM_INFO, "* Incorrect nullptr string given for parameter c\n"));
throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
}
if (1 != ACE_OS::strlen( c.val.in() ))
Expand Down
4 changes: 1 addition & 3 deletions TAO/tests/MProfile_Forwarding/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])

if (objref.in () == 0)
{
//FUZZ: disable check_for_NULL
ACE_ERROR_RETURN ((LM_ERROR,
"The received objref is NULL\n"),
"The received objref is nullptr\n"),
-1);
//FUZZ: enable check_for_NULL
}

Simple_Server_var server =
Expand Down
Loading