From 170d0efe26ae2606a88fab2fb7a5f2ac8427d967 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:48:36 -0300 Subject: Replace NULL pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- kernel/kls_dds/dds.cpp | 6 +++--- kernel/kls_dicom/fmt_codec_png.cpp | 4 ++-- kernel/kls_gif/fmt_codec_gif.cpp | 8 ++++---- kernel/kls_mng/fmt_codec_mng.cpp | 4 ++-- kernel/kls_msp/fmt_codec_msp.cpp | 4 ++-- kernel/kls_openexr/fmt_codec_openexr.cpp | 2 +- kernel/kls_png/fmt_codec_png.cpp | 4 ++-- kernel/kls_ras/fmt_codec_ras.cpp | 4 ++-- kernel/kls_sgi/fmt_codec_sgi.cpp | 12 ++++++------ kernel/kls_svg/fmt_codec_png.cpp | 4 ++-- kernel/kls_tiff/fmt_codec_tiff.cpp | 6 +++--- kernel/kls_wal/fmt_codec_wal.cpp | 2 +- kernel/kls_wbmp/fmt_codec_wbmp.cpp | 4 ++-- kernel/kls_wmf/fmt_codec_wmf.cpp | 4 ++-- kernel/kls_xbm/fmt_codec_xbm.cpp | 6 +++--- kernel/kls_xcur/fmt_codec_xcur.cpp | 2 +- kernel/kls_xpm/xpm_utils.h | 6 +++--- kernel/kls_xwd/fmt_codec_xwd.cpp | 4 ++-- kernel/ksquirrel-libs/fileio.cpp | 2 +- 19 files changed, 44 insertions(+), 44 deletions(-) diff --git a/kernel/kls_dds/dds.cpp b/kernel/kls_dds/dds.cpp index 4205816..ef07bdd 100644 --- a/kernel/kls_dds/dds.cpp +++ b/kernel/kls_dds/dds.cpp @@ -889,7 +889,7 @@ static void FREE_ROWS(RGBAP **A, const int H) case DDS_ATI2: return LoadATI2; default: - return NULL; + return nullptr; }; } @@ -904,7 +904,7 @@ static void FREE_ROWS(RGBAP **A, const int H) DDSType type = GetType( header ); TextureLoader loader = GetTextureLoader( type ); - if( loader == NULL ) { + if(!loader) { return false; } @@ -978,7 +978,7 @@ static void FREE_ROWS(RGBAP **A, const int H) // Select texture loader. TextureLoader loader = GetTextureLoader( type ); - if( loader == NULL ) { + if(!loader) { return false; } diff --git a/kernel/kls_dicom/fmt_codec_png.cpp b/kernel/kls_dicom/fmt_codec_png.cpp index 66c43ee..eed37a7 100644 --- a/kernel/kls_dicom/fmt_codec_png.cpp +++ b/kernel/kls_dicom/fmt_codec_png.cpp @@ -242,13 +242,13 @@ s32 fmt_codec::read_init(const std::string &file) currentImage = -1; - if((png_ptr = my_png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0)) == NULL) + if((png_ptr = my_png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0)) == nullptr) { zerror = true; return SQE_R_NOMEMORY; } - if((info_ptr = my_png_create_info_struct(png_ptr)) == NULL) + if((info_ptr = my_png_create_info_struct(png_ptr)) == nullptr) { zerror = true; return SQE_R_NOMEMORY; diff --git a/kernel/kls_gif/fmt_codec_gif.cpp b/kernel/kls_gif/fmt_codec_gif.cpp index ad21d94..93ed98a 100644 --- a/kernel/kls_gif/fmt_codec_gif.cpp +++ b/kernel/kls_gif/fmt_codec_gif.cpp @@ -55,7 +55,7 @@ static void PrintGifError(void) const char *Err = GifErrorString(); #endif - if (Err != NULL) { + if (Err) { fprintf(stderr, "\nGIF-LIB error: %s.\n", Err); } else { #if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR > 4 @@ -132,10 +132,10 @@ s32 fmt_codec::read_init(const std::string &file) linesz = gif->SWidth * sizeof(GifPixelType); - if((buf = (u8*)malloc(linesz)) == NULL) + if((buf = (u8*)malloc(linesz)) == nullptr) return SQE_R_NOMEMORY; - if((saved = (RGBA *)calloc(linesz, sizeof(RGBA))) == NULL) + if((saved = (RGBA *)calloc(linesz, sizeof(RGBA))) == nullptr) return SQE_R_NOMEMORY; if(gif->SColorMap) @@ -569,7 +569,7 @@ void fmt_codec::read_close() if(gif) { #if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)) - DGifCloseFile(gif, NULL); + DGifCloseFile(gif, nullptr); #else DGifCloseFile(gif); #endif diff --git a/kernel/kls_mng/fmt_codec_mng.cpp b/kernel/kls_mng/fmt_codec_mng.cpp index 3d72f76..e25a18a 100644 --- a/kernel/kls_mng/fmt_codec_mng.cpp +++ b/kernel/kls_mng/fmt_codec_mng.cpp @@ -90,7 +90,7 @@ mng_bool mymngopenstream(mng_handle mng) /* open the file */ mymng->file = fopen(mymng->filename.c_str(), "rb"); - if(mymng->file == NULL) + if(!mymng->file) return MNG_FALSE; return MNG_TRUE; @@ -126,7 +126,7 @@ mng_bool mymngclosestream(mng_handle mng) /* close the file */ fclose(mymng->file); - mymng->file = NULL;/* for safety */ + mymng->file = nullptr;/* for safety */ mymng->filename.clear(); diff --git a/kernel/kls_msp/fmt_codec_msp.cpp b/kernel/kls_msp/fmt_codec_msp.cpp index 30b09ca..3b34ec8 100644 --- a/kernel/kls_msp/fmt_codec_msp.cpp +++ b/kernel/kls_msp/fmt_codec_msp.cpp @@ -84,7 +84,7 @@ s32 fmt_codec::read_init(const std::string &file) read_error = false; finfo.animated = false; - bytes = NULL; + bytes = nullptr; return SQE_OK; } @@ -222,7 +222,7 @@ void fmt_codec::read_close() scanmap.clear(); delete [] bytes; - bytes = NULL; + bytes = nullptr; } #include "fmt_codec_cd_func.h" diff --git a/kernel/kls_openexr/fmt_codec_openexr.cpp b/kernel/kls_openexr/fmt_codec_openexr.cpp index 2d87160..86f7a13 100644 --- a/kernel/kls_openexr/fmt_codec_openexr.cpp +++ b/kernel/kls_openexr/fmt_codec_openexr.cpp @@ -111,7 +111,7 @@ s32 fmt_codec::read_next() s32 width, height; - RgbaInputFile *in = NULL; + RgbaInputFile *in = nullptr; pixels = new Array2D; diff --git a/kernel/kls_png/fmt_codec_png.cpp b/kernel/kls_png/fmt_codec_png.cpp index 66c43ee..eed37a7 100644 --- a/kernel/kls_png/fmt_codec_png.cpp +++ b/kernel/kls_png/fmt_codec_png.cpp @@ -242,13 +242,13 @@ s32 fmt_codec::read_init(const std::string &file) currentImage = -1; - if((png_ptr = my_png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0)) == NULL) + if((png_ptr = my_png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0)) == nullptr) { zerror = true; return SQE_R_NOMEMORY; } - if((info_ptr = my_png_create_info_struct(png_ptr)) == NULL) + if((info_ptr = my_png_create_info_struct(png_ptr)) == nullptr) { zerror = true; return SQE_R_NOMEMORY; diff --git a/kernel/kls_ras/fmt_codec_ras.cpp b/kernel/kls_ras/fmt_codec_ras.cpp index c932d9b..8e22afb 100644 --- a/kernel/kls_ras/fmt_codec_ras.cpp +++ b/kernel/kls_ras/fmt_codec_ras.cpp @@ -79,7 +79,7 @@ s32 fmt_codec::read_init(const std::string &file) currentImage = -1; rle = false; isRGB = false; - buf = NULL; + buf = nullptr; finfo.animated = false; @@ -309,7 +309,7 @@ void fmt_codec::read_close() frs.close(); delete [] buf; - buf = NULL; + buf = nullptr; finfo.meta.clear(); finfo.image.clear(); diff --git a/kernel/kls_sgi/fmt_codec_sgi.cpp b/kernel/kls_sgi/fmt_codec_sgi.cpp index 0ec1ea4..ff0e784 100644 --- a/kernel/kls_sgi/fmt_codec_sgi.cpp +++ b/kernel/kls_sgi/fmt_codec_sgi.cpp @@ -73,9 +73,9 @@ s32 fmt_codec::read_init(const std::string &file) return SQE_R_NOFILE; currentImage = -1; - starttab = NULL; - lengthtab = NULL; - channel[0] = channel[1] = channel[2] = channel[3] = NULL; + starttab = nullptr; + lengthtab = nullptr; + channel[0] = channel[1] = channel[2] = channel[3] = nullptr; finfo.animated = false; @@ -323,15 +323,15 @@ void fmt_codec::read_close() frs.close(); delete [] starttab; - starttab = NULL; + starttab = nullptr; delete [] lengthtab; - lengthtab = NULL; + lengthtab = nullptr; for(s32 i = 0;i < 4;i++) { delete [] channel[i]; - channel[i] = NULL; + channel[i] = nullptr; } finfo.meta.clear(); diff --git a/kernel/kls_svg/fmt_codec_png.cpp b/kernel/kls_svg/fmt_codec_png.cpp index 66c43ee..eed37a7 100644 --- a/kernel/kls_svg/fmt_codec_png.cpp +++ b/kernel/kls_svg/fmt_codec_png.cpp @@ -242,13 +242,13 @@ s32 fmt_codec::read_init(const std::string &file) currentImage = -1; - if((png_ptr = my_png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0)) == NULL) + if((png_ptr = my_png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0)) == nullptr) { zerror = true; return SQE_R_NOMEMORY; } - if((info_ptr = my_png_create_info_struct(png_ptr)) == NULL) + if((info_ptr = my_png_create_info_struct(png_ptr)) == nullptr) { zerror = true; return SQE_R_NOMEMORY; diff --git a/kernel/kls_tiff/fmt_codec_tiff.cpp b/kernel/kls_tiff/fmt_codec_tiff.cpp index e22cb70..8a24379 100644 --- a/kernel/kls_tiff/fmt_codec_tiff.cpp +++ b/kernel/kls_tiff/fmt_codec_tiff.cpp @@ -118,11 +118,11 @@ s32 fmt_codec::read_init(const std::string &file) { currentImage = -1; - if((ftiff = TIFFOpen(file.c_str(), "r")) == NULL) + if((ftiff = TIFFOpen(file.c_str(), "r")) == nullptr) return SQE_R_BADFILE; - TIFFSetWarningHandler(NULL); - TIFFSetErrorHandler(NULL); + TIFFSetWarningHandler(nullptr); + TIFFSetErrorHandler(nullptr); finfo.animated = false; diff --git a/kernel/kls_wal/fmt_codec_wal.cpp b/kernel/kls_wal/fmt_codec_wal.cpp index a5b46d5..4aee809 100644 --- a/kernel/kls_wal/fmt_codec_wal.cpp +++ b/kernel/kls_wal/fmt_codec_wal.cpp @@ -77,7 +77,7 @@ s32 fmt_codec::read_init(const std::string &file) finfo.animated = false; - bits = NULL; + bits = nullptr; return SQE_OK; } diff --git a/kernel/kls_wbmp/fmt_codec_wbmp.cpp b/kernel/kls_wbmp/fmt_codec_wbmp.cpp index f69dab6..fb62fc3 100644 --- a/kernel/kls_wbmp/fmt_codec_wbmp.cpp +++ b/kernel/kls_wbmp/fmt_codec_wbmp.cpp @@ -89,7 +89,7 @@ s32 fmt_codec::read_init(const std::string &file) finfo.animated = false; - wbmp.bitmap = NULL; + wbmp.bitmap = nullptr; return SQE_OK; } @@ -196,7 +196,7 @@ void fmt_codec::read_close() frs.close(); delete [] wbmp.bitmap; - wbmp.bitmap = NULL; + wbmp.bitmap = nullptr; finfo.meta.clear(); finfo.image.clear(); diff --git a/kernel/kls_wmf/fmt_codec_wmf.cpp b/kernel/kls_wmf/fmt_codec_wmf.cpp index ec5045d..82c989f 100644 --- a/kernel/kls_wmf/fmt_codec_wmf.cpp +++ b/kernel/kls_wmf/fmt_codec_wmf.cpp @@ -89,7 +89,7 @@ s32 fmt_codec::read_init(const std::string &file) file.c_str() }; - buf = NULL; + buf = nullptr; call(2, (char **)argv, &buf, &w, &h); @@ -144,7 +144,7 @@ void fmt_codec::read_close() finfo.image.clear(); delete [] buf; - buf = NULL; + buf = nullptr; } #include "fmt_codec_cd_func.h" diff --git a/kernel/kls_xbm/fmt_codec_xbm.cpp b/kernel/kls_xbm/fmt_codec_xbm.cpp index 71409ae..6114996 100644 --- a/kernel/kls_xbm/fmt_codec_xbm.cpp +++ b/kernel/kls_xbm/fmt_codec_xbm.cpp @@ -101,7 +101,7 @@ s32 fmt_codec::read_next() if(strncmp(str, "#define ", 8) != 0) return SQE_R_BADFILE; - if((ptr = strstr(str, "_width ")) == NULL) + if((ptr = strstr(str, "_width ")) == nullptr) return SQE_R_BADFILE; image.w = (long)atoi(ptr+6); @@ -112,7 +112,7 @@ s32 fmt_codec::read_next() if(strncmp(str, "#define ", 8) != 0) return SQE_R_BADFILE; - if((ptr = strstr(str, "_height ")) == NULL) + if((ptr = strstr(str, "_height ")) == nullptr) return SQE_R_BADFILE; image.h = (long)atoi(ptr+7); @@ -127,7 +127,7 @@ s32 fmt_codec::read_next() if(str[0] == '\n') if(!sq_fgets(str, sizeof(str)-1, fptr)) return SQE_R_BADFILE; - if(strstr(str, "_bits[") == NULL || (ptr = strrchr(str, '{')) == NULL) + if (!strstr(str, "_bits[") || !(ptr = strrchr(str, '{'))) return SQE_R_BADFILE; if((strstr(str, "unsigned") && (strstr(str, "char"))) || strstr(str, "char")) diff --git a/kernel/kls_xcur/fmt_codec_xcur.cpp b/kernel/kls_xcur/fmt_codec_xcur.cpp index 28d42f1..b32c90e 100644 --- a/kernel/kls_xcur/fmt_codec_xcur.cpp +++ b/kernel/kls_xcur/fmt_codec_xcur.cpp @@ -157,7 +157,7 @@ void fmt_codec::read_close() frs.close(); delete [] tocs; - tocs = NULL; + tocs = nullptr; finfo.meta.clear(); finfo.image.clear(); diff --git a/kernel/kls_xpm/xpm_utils.h b/kernel/kls_xpm/xpm_utils.h index d44b2e9..01d0d0a 100644 --- a/kernel/kls_xpm/xpm_utils.h +++ b/kernel/kls_xpm/xpm_utils.h @@ -60,17 +60,17 @@ RGBA fmt_codec::hex2rgb(const s8 *hex) memcpy(c, hex, 2); c[2] = 0; - rgba.r = (s8)strtol(c, NULL, 16); + rgba.r = (s8)strtol(c, nullptr, 16); hex = hex + 2 + add; memcpy(c, hex, 2); c[2] = 0; - rgba.g = (s8)strtol(c, NULL, 16); + rgba.g = (s8)strtol(c, nullptr, 16); hex = hex + 2 + add; memcpy(c, hex, 2); c[2] = 0; - rgba.b = (s8)strtol(c, NULL, 16); + rgba.b = (s8)strtol(c, nullptr, 16); rgba.a = 255; diff --git a/kernel/kls_xwd/fmt_codec_xwd.cpp b/kernel/kls_xwd/fmt_codec_xwd.cpp index 0ba5226..054767f 100644 --- a/kernel/kls_xwd/fmt_codec_xwd.cpp +++ b/kernel/kls_xwd/fmt_codec_xwd.cpp @@ -77,7 +77,7 @@ s32 fmt_codec::read_init(const std::string &file) return SQE_R_NOFILE; currentImage = -1; - pal = NULL; + pal = nullptr; finfo.animated = false; @@ -205,7 +205,7 @@ void fmt_codec::read_close() frs.close(); delete [] pal; - pal = NULL; + pal = nullptr; finfo.meta.clear(); finfo.image.clear(); diff --git a/kernel/ksquirrel-libs/fileio.cpp b/kernel/ksquirrel-libs/fileio.cpp index b7cea5c..dc50b30 100644 --- a/kernel/ksquirrel-libs/fileio.cpp +++ b/kernel/ksquirrel-libs/fileio.cpp @@ -111,7 +111,7 @@ bool ifstreamK::readCHex(u32 &hex) h[i] = '\0'; - hex = strtol(h, NULL, 16); + hex = strtol(h, nullptr, 16); return good(); } -- cgit v1.2.3