Style: Remove uses of NULL, substituting nullptr

This commit is contained in:
Matthew L. Curry 2020-10-13 00:00:06 -06:00 committed by Andreas Kling
parent 93f4388e45
commit 5d5c32cec1
7 changed files with 8 additions and 8 deletions

View file

@ -760,7 +760,7 @@ void* bsearch(const void* key, const void* base, size_t nmemb, size_t size, int
nmemb /= 2;
}
return NULL;
return nullptr;
}
div_t div(int numerator, int denominator)

View file

@ -169,7 +169,7 @@ static inline struct cmsghdr* CMSG_NXTHDR(struct msghdr* msg, struct cmsghdr* cm
struct cmsghdr* next = (struct cmsghdr*)((char*)cmsg + CMSG_ALIGN(cmsg->cmsg_len));
unsigned offset = (char*)next - (char*)msg->msg_control;
if (msg->msg_controllen < offset + sizeof(struct cmsghdr))
return NULL;
return nullptr;
return next;
}

View file

@ -132,7 +132,7 @@ CODE prioritynames[] = {
{ "none", INTERNAL_NOPRI },
{ "notice", LOG_NOTICE },
{ "warning", LOG_WARNING },
{ NULL, -1 },
{ nullptr, -1 },
};
CODE facilitynames[] = {
@ -158,7 +158,7 @@ CODE facilitynames[] = {
{ "syslog", LOG_SYSLOG },
{ "user", LOG_USER },
{ "uucp", LOG_UUCP },
{ NULL, -1 },
{ nullptr, -1 },
};
#endif

View file

@ -745,7 +745,7 @@ static bool decode_png_bitmap(PNGLoadingContext& context)
unsigned long srclen = context.compressed_data.size() - 6;
unsigned long destlen = 0;
int ret = puff(NULL, &destlen, context.compressed_data.data() + 2, &srclen);
int ret = puff(nullptr, &destlen, context.compressed_data.data() + 2, &srclen);
if (ret != 0) {
context.state = PNGLoadingContext::State::Error;
return false;

View file

@ -72,7 +72,7 @@ int main(int argc, char** argv)
sigemptyset(&blocked);
sigaddset(&blocked, SIGTTOU);
sigaddset(&blocked, SIGTTIN);
pthread_sigmask(SIG_BLOCK, &blocked, NULL);
pthread_sigmask(SIG_BLOCK, &blocked, nullptr);
#endif
#ifdef __serenity__
if (pledge("stdio rpath wpath cpath proc exec tty accept sigaction unix fattr", nullptr) < 0) {

View file

@ -175,7 +175,7 @@ int main(int argc, char** argv)
highest_fd = max(highest_fd, fd);
}
int ready = select(highest_fd + 1, &readfds, &writefds, &exceptfds, NULL);
int ready = select(highest_fd + 1, &readfds, &writefds, &exceptfds, nullptr);
if (ready == -1) {
if (errno == EINTR)
continue;

View file

@ -65,7 +65,7 @@ static Count get_count(const String& file_name)
file_pointer = stdin;
} else {
count.name = file_name;
if ((file_pointer = fopen(file_name.characters(), "r")) == NULL) {
if ((file_pointer = fopen(file_name.characters(), "r")) == nullptr) {
fprintf(stderr, "wc: unable to open %s\n", file_name.characters());
count.exists = false;
return count;