Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Filesystem: use NEW_NOTHROW for new(std::nothrow)

This commit is contained in:
Andrew Tridgell 2024-05-27 11:24:11 +10:00
parent 4da9c245d1
commit a241b13f45
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Filesystem/AP_Filesystem.cpp
View File

@ -208,7 +208,7 @@ AP_Filesystem::DirHandle *AP_Filesystem::opendir(const char *pathname)
} }
const Backend &backend = backend_by_path(pathname); const Backend &backend = backend_by_path(pathname);
DirHandle *h = new DirHandle; DirHandle *h = NEW_NOTHROW DirHandle;
if (!h) { if (!h) {
return nullptr; return nullptr;
} }

2
libraries/AP_Filesystem/AP_Filesystem_FATFS.cpp
View File

@ -706,7 +706,7 @@ void *AP_Filesystem_FATFS::opendir(const char *pathdir)
CHECK_REMOUNT_NULL(); CHECK_REMOUNT_NULL();
debug("Opendir %s", pathdir); debug("Opendir %s", pathdir);
struct DIR_Wrapper *ret = new DIR_Wrapper; struct DIR_Wrapper *ret = NEW_NOTHROW DIR_Wrapper;
if (!ret) { if (!ret) {
return nullptr; return nullptr;
} }

4
libraries/AP_Filesystem/AP_Filesystem_Mission.cpp
View File

@ -70,7 +70,7 @@ int AP_Filesystem_Mission::open(const char *fname, int flags, bool allow_absolut
r.num_items = get_num_items(r.mtype); r.num_items = get_num_items(r.mtype);
if (!readonly) { if (!readonly) {
// setup for upload // setup for upload
r.writebuf = new ExpandingString(); r.writebuf = NEW_NOTHROW ExpandingString();
} else { } else {
r.writebuf = nullptr; r.writebuf = nullptr;
} }
@ -464,7 +464,7 @@ bool AP_Filesystem_Mission::finish_upload_fence(const struct header &hdr, const
// passing nullptr and 0 items through to Polyfence loader is // passing nullptr and 0 items through to Polyfence loader is
// absolutely OK: // absolutely OK:
if (hdr.num_items != 0) { if (hdr.num_items != 0) {
new_items = new AC_PolyFenceItem[hdr.num_items]; new_items = NEW_NOTHROW AC_PolyFenceItem[hdr.num_items];
if (new_items == nullptr) { if (new_items == nullptr) {
GCS_SEND_TEXT(MAV_SEVERITY_WARNING, "Out of memory for upload"); GCS_SEND_TEXT(MAV_SEVERITY_WARNING, "Out of memory for upload");
goto OUT; goto OUT;

4
libraries/AP_Filesystem/AP_Filesystem_Param.cpp
View File

@ -50,7 +50,7 @@ int AP_Filesystem_Param::open(const char *fname, int flags, bool allow_absolute_
} }
struct rfile &r = file[idx]; struct rfile &r = file[idx];
if (read_only) { if (read_only) {
r.cursors = new cursor[num_cursors]; r.cursors = NEW_NOTHROW cursor[num_cursors];
if (r.cursors == nullptr) { if (r.cursors == nullptr) {
errno = ENOMEM; errno = ENOMEM;
return -1; return -1;
@ -66,7 +66,7 @@ int AP_Filesystem_Param::open(const char *fname, int flags, bool allow_absolute_
r.writebuf = nullptr; r.writebuf = nullptr;
if (!read_only) { if (!read_only) {
// setup for upload // setup for upload
r.writebuf = new ExpandingString(); r.writebuf = NEW_NOTHROW ExpandingString();
if (r.writebuf == nullptr) { if (r.writebuf == nullptr) {
close(idx); close(idx);
errno = ENOMEM; errno = ENOMEM;

2
libraries/AP_Filesystem/AP_Filesystem_ROMFS.cpp
View File

@ -245,7 +245,7 @@ bool AP_Filesystem_ROMFS::set_mtime(const char *filename, const uint32_t mtime_s
*/ */
FileData *AP_Filesystem_ROMFS::load_file(const char *filename) FileData *AP_Filesystem_ROMFS::load_file(const char *filename)
{ {
FileData *fd = new FileData(this); FileData *fd = NEW_NOTHROW FileData(this);
if (!fd) { if (!fd) {
return nullptr; return nullptr;
} }

4
libraries/AP_Filesystem/AP_Filesystem_Sys.cpp
View File

@ -83,7 +83,7 @@ int AP_Filesystem_Sys::open(const char *fname, int flags, bool allow_absolute_pa
return -1; return -1;
} }
struct rfile &r = file[idx]; struct rfile &r = file[idx];
r.str = new ExpandingString; r.str = NEW_NOTHROW ExpandingString;
if (r.str == nullptr) { if (r.str == nullptr) {
errno = ENOMEM; errno = ENOMEM;
return -1; return -1;
@ -229,7 +229,7 @@ void *AP_Filesystem_Sys::opendir(const char *pathname)
errno = ENOENT; errno = ENOENT;
return nullptr; return nullptr;
} }
DirReadTracker *dtracker = new DirReadTracker; DirReadTracker *dtracker = NEW_NOTHROW DirReadTracker;
if (dtracker == nullptr) { if (dtracker == nullptr) {
errno = ENOMEM; errno = ENOMEM;
return nullptr; return nullptr;

2
libraries/AP_Filesystem/AP_Filesystem_backend.cpp
View File

@ -29,7 +29,7 @@ FileData *AP_Filesystem_Backend::load_file(const char *filename)
if (stat(filename, &st) != 0) { if (stat(filename, &st) != 0) {
return nullptr; return nullptr;
} }
FileData *fd = new FileData(this); FileData *fd = NEW_NOTHROW FileData(this);
if (fd == nullptr) { if (fd == nullptr) {
return nullptr; return nullptr;
} }

2
libraries/AP_Filesystem/posix_compat.cpp
View File

@ -70,7 +70,7 @@ static int posix_fopen_modes_to_open(const char *mode)
APFS_FILE *apfs_fopen(const char *pathname, const char *mode) APFS_FILE *apfs_fopen(const char *pathname, const char *mode)
{ {
APFS_FILE *f = new APFS_FILE; APFS_FILE *f = NEW_NOTHROW APFS_FILE;
if (!f) { if (!f) {
return nullptr; return nullptr;
} }