mirror of
https://github.com/transmission/transmission.git
synced 2026-02-15 07:26:49 +00:00
C++ modernization: Replace NULLs with typesafe nullptrs (#1799)
Fixing CI errors and build errors Reverted changes: NULL in EV_SET macro; Clang-formatting Reverted changes: MacosX *.m files reverted from master
This commit is contained in:
committed by
GitHub
parent
098c7508e3
commit
43d1ece562
@@ -17,7 +17,7 @@
|
||||
bool tr_sys_file_read_line(tr_sys_file_t handle, char* buffer, size_t buffer_size, tr_error** error)
|
||||
{
|
||||
TR_ASSERT(handle != TR_BAD_SYS_FILE);
|
||||
TR_ASSERT(buffer != NULL);
|
||||
TR_ASSERT(buffer != nullptr);
|
||||
TR_ASSERT(buffer_size > 0);
|
||||
|
||||
bool ret = false;
|
||||
@@ -57,7 +57,7 @@ bool tr_sys_file_read_line(tr_sys_file_t handle, char* buffer, size_t buffer_siz
|
||||
{
|
||||
if (delta != 0)
|
||||
{
|
||||
ret = tr_sys_file_seek(handle, delta, TR_SEEK_CUR, NULL, error);
|
||||
ret = tr_sys_file_seek(handle, delta, TR_SEEK_CUR, nullptr, error);
|
||||
|
||||
if (!ret)
|
||||
{
|
||||
@@ -84,13 +84,13 @@ bool tr_sys_file_read_line(tr_sys_file_t handle, char* buffer, size_t buffer_siz
|
||||
bool tr_sys_file_write_line(tr_sys_file_t handle, char const* buffer, tr_error** error)
|
||||
{
|
||||
TR_ASSERT(handle != TR_BAD_SYS_FILE);
|
||||
TR_ASSERT(buffer != NULL);
|
||||
TR_ASSERT(buffer != nullptr);
|
||||
|
||||
bool ret = tr_sys_file_write(handle, buffer, strlen(buffer), NULL, error);
|
||||
bool ret = tr_sys_file_write(handle, buffer, strlen(buffer), nullptr, error);
|
||||
|
||||
if (ret)
|
||||
{
|
||||
ret = tr_sys_file_write(handle, TR_NATIVE_EOL_STR, TR_NATIVE_EOL_STR_SIZE, NULL, error);
|
||||
ret = tr_sys_file_write(handle, TR_NATIVE_EOL_STR, TR_NATIVE_EOL_STR_SIZE, nullptr, error);
|
||||
}
|
||||
|
||||
return ret;
|
||||
@@ -99,7 +99,7 @@ bool tr_sys_file_write_line(tr_sys_file_t handle, char const* buffer, tr_error**
|
||||
bool tr_sys_file_write_fmt(tr_sys_file_t handle, char const* format, tr_error** error, ...)
|
||||
{
|
||||
TR_ASSERT(handle != TR_BAD_SYS_FILE);
|
||||
TR_ASSERT(format != NULL);
|
||||
TR_ASSERT(format != nullptr);
|
||||
|
||||
bool ret = false;
|
||||
char* buffer;
|
||||
@@ -109,9 +109,9 @@ bool tr_sys_file_write_fmt(tr_sys_file_t handle, char const* format, tr_error**
|
||||
buffer = tr_strdup_vprintf(format, args);
|
||||
va_end(args);
|
||||
|
||||
if (buffer != NULL)
|
||||
if (buffer != nullptr)
|
||||
{
|
||||
ret = tr_sys_file_write(handle, buffer, strlen(buffer), NULL, error);
|
||||
ret = tr_sys_file_write(handle, buffer, strlen(buffer), nullptr, error);
|
||||
tr_free(buffer);
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user