Resolves several compile warnings when comparing different int signedness #1755

alsed · 2024-12-20T00:13:41Z

advances #713 and eliminates several compilation warnings concerning comparison between integers of different signedness.

this resolve a compilation warning about comparison of expressions wih different signedness.

…r_Client_Check function this avoid a compilation warning about comparison of integer expressions of different signedness.

this avoid compilation warnings about comparison expressions of different signedness.

- resolves a compilation warning about comparison expressions of different signedness. - setupstyle() uses getcurrentstylename() to retrieve name. - correction in the message log.

- resolved a comp warning about comparison of different signedness - new function created: calculate_packed_xz(), used by const CPosition& CLevelGraph::vertex_position() and bool CLevelGraph::inside() - aditional minor resolves

…dness - resolves a warning compilation in ConvertTextureFormat(), modified to a for loop range, this avoid integers comparisions. - resolves warnings when int comparing with unsigned macro R__NUM_SUN_CASCADES, in render_phase_sun.cpp. - resolves warnings when int comparing with unsigned macro R__NUM_PARALLEL_CONTEXTS, in r2_loader.cpp - var "b_count" converted to unsigned to resolve warnings within for loops, in AnimationKeyCalculate.h - resolves warnings when for loops compare signed vs unsigned, in r__sector.cpp

…ness (2) - advances OpenXRay#713 and eliminates all warnings concerning this operation: - in R_dsgraph_structure::load() / r__dsgraph_build.cpp - var 'vcnt' converted to u32 in R_Backend_DBG.cpp - several for loops in light.cpp - several for loops in in DetailManager_CACHE.cpp - var 'filled_blocks' converted from int to i32, in SoundRender_Emitter.cpp - in CSoundRender_Core::create() / SoundRender_Core.cpp, explicit convertion of var 'sg_SourceType' to int - for loop in CollectorPacked::CollectorPacked() / xrCDB_Collector.cpp - several for loops in Frustum.cpp

Xottab-DUTY

LGTM!
I didn't checked xrAICore and xrSound yet.
The main thing to correct here is replace unsigned int with u32.

src/Layers/xrRender/AnimationKeyCalculate.h

src/Layers/xrRender/R_Backend_DBG.cpp

src/Layers/xrRender/light.cpp

Xottab-DUTY · 2024-12-30T19:05:37Z

src/xrGame/xrServer.cpp

@@ -866,7 +866,7 @@ void xrServer::Server_Client_Check(IClient* CL)
        return;
    };

-    if (CL->process_id == GetCurrentProcessId())
+    if (CL->process_id == static_cast<u32>(GetCurrentProcessId()))


On Windows process_id variable has DWORD type and GetCurrentProcessId() returns DWORD too.
On Linux this variable has type pid_t and GetCurrentProcessId() is a macro to getpid function that returns pid_t.

Why does it throw a warning here??

As with all the changes in this commit, the warning is for comparing a signed int with an unsigned.

Edit:
Is for pid_t :

warning: comparison of integer expressions of different signedness: ‘u32’ {aka ‘unsigned int’} and ‘__pid_t’ {aka ‘int’} [-Wsign-compare] 869 | if (CL->process_id == GetCurrentProcessId()) | ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~``

Try this. Will it fix the warning?

Suggested change

if (CL->process_id == static_cast<u32>(GetCurrentProcessId()))

if (CL->process_id == static_cast<xrpid_t>(GetCurrentProcessId()))

The warning persist, xrpid_t is consider an int.
How about converting process_id to int for this comparison? unsigned to signed should be safer
if (static_cast<int>(CL->process_id) == GetCurrentProcessId())

alsed · 2024-12-30T21:06:06Z

Changes requested already made.
I'm thinking I should change all unsigned int to u32 since that's what they really are comparing to... let me know if I proceed.

The last 2 warning regarding this (not included in the commit yet) are these:

/xray-16/src/xrCore/LocatorAPI.cpp:362:30: warning: comparison of integer expressions of different signedness: ‘ssize_t’ {aka ‘long int’} and ‘size_t’ {aka ‘long unsigned int’} [-Wsign-compare]
  362 |             VERIFY(read_byte == dwSize);

/xray-16/src/xrCore/string_concatenations.cpp:111:33: warning: comparison of integer expressions of different signedness: ‘u32’ {aka ‘unsigned int’} and ‘int’ [-Wsign-compare]
  111 |     VERIFY(overrun_string_index != -1);

I'm not sure the best way to resolve them, but we can do it and eliminate all.

Also, added fixes for Images.cpp

Xottab-DUTY · 2024-12-31T07:45:25Z

src/xrAICore/Navigation/level_graph_inline.h


-    VERIFY(iFloor((source_position.z - box_z) / cell_size + .5f) < (int)m_row_length);


This VERIFY was removed. Needs to be returned.

Ops! ...returned.

Xottab-DUTY · 2024-12-31T09:30:13Z

src/xrSound/SoundRender_Core.cpp

@@ -115,7 +115,7 @@ CSound* CSoundRender_Core::create(pcstr fName, esound_type sound_type, int game_
    auto* snd = xr_new<CSound>(handle);

    snd->g_type = game_type;
-    if (game_type == sg_SourceType)
+    if (game_type == static_cast<int>(sg_SourceType))


game_type is u32, so no need to cast sg_SourceType to int.

Suggested change

if (game_type == static_cast<int>(sg_SourceType))

if (game_type == sg_SourceType)

Xottab-DUTY · 2024-12-31T09:30:16Z

src/xrSound/SoundRender_Emitter.h

@@ -85,7 +85,7 @@ class CSoundRender_Emitter final : public CSound_emitter
    std::atomic<Task*> prefill_task{};

    size_t current_block{};
-    int filled_blocks{};
+    u32 filled_blocks{};


This was actually made as int on purpose in case of underflows.
It's better to leave it as is for now and examine the code that operates on this variable to make sure there are no underflows.

Suggested change

u32 filled_blocks{};

int filled_blocks{};

Alright, comment added because I have the memory of a goldfish

No comment here, please.
Other person is working on xrSound currently and it might cause conflicts.

- all `unsigned int` changed to `u32` - on SoundRender_Emitter.h - var `filled_blocks` reverted to `int` as requested. - reverted changes to `level_graph_inline.h` - proposal for `Server_Client_Check()` on `xrServer.cpp`

alsed added 6 commits December 17, 2024 11:50

var game_type converted to i32 in all instances

b8d691d

this resolve a compilation warning about comparison of expressions wih different signedness.

explicit conversion to u32 of GetCurrentProcessId()/getpid() in Serve…

e9d23a1

…r_Client_Check function this avoid a compilation warning about comparison of integer expressions of different signedness.

local variable "c" converted to size_t

1e19d9c

this avoid compilation warnings about comparison expressions of different signedness.

var "m_style_id" explictly converted to int

23ec545

- resolves a compilation warning about comparison expressions of different signedness. - setupstyle() uses getcurrentstylename() to retrieve name. - correction in the message log.

calculate_packed_xz() refactored in level_graph_inline.h

72a2fd8

- resolved a comp warning about comparison of different signedness - new function created: calculate_packed_xz(), used by const CPosition& CLevelGraph::vertex_position() and bool CLevelGraph::inside() - aditional minor resolves

github-actions bot added Renderer AI Artificial Intelligence Sound UI labels Dec 20, 2024

alsed changed the title ~~Resolves several compile warnings when comparing different int signedness~~ Resolves all compile warnings when comparing different int signedness Dec 21, 2024

alsed changed the title ~~Resolves all compile warnings when comparing different int signedness~~ Resolves several compile warnings when comparing different int signedness Dec 21, 2024

alsed added 2 commits December 23, 2024 10:42

Merge branch 'OpenXRay:dev' into dev

7ad00a2

Merge branch 'OpenXRay:dev' into dev

06f74a9

Xottab-DUTY requested changes Dec 30, 2024

View reviewed changes

Xottab-DUTY added Code Quality good first issue Good start for beginners that want to contribute. labels Dec 30, 2024

alsed added 2 commits December 30, 2024 18:17

Requested changes: "unsigned int" to "u32"

1679150

Also, added fixes for Images.cpp

Merge branch 'OpenXRay:dev' into dev

cbf6777

Xottab-DUTY reviewed Dec 31, 2024

View reviewed changes

Xottab-DUTY requested changes Dec 31, 2024

View reviewed changes

revision changes:

91e7e6f

- all `unsigned int` changed to `u32` - on SoundRender_Emitter.h - var `filled_blocks` reverted to `int` as requested. - reverted changes to `level_graph_inline.h` - proposal for `Server_Client_Check()` on `xrServer.cpp`

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Resolves several compile warnings when comparing different int signedness #1755

Resolves several compile warnings when comparing different int signedness #1755

alsed commented Dec 20, 2024 •

edited

Loading

Xottab-DUTY left a comment

Xottab-DUTY Dec 30, 2024

alsed Dec 30, 2024 •

edited

Loading

Xottab-DUTY Dec 31, 2024 •

edited

Loading

alsed Dec 31, 2024 •

edited

Loading

alsed commented Dec 30, 2024

Xottab-DUTY Dec 31, 2024

alsed Dec 31, 2024

Xottab-DUTY Dec 31, 2024

Xottab-DUTY Dec 31, 2024

alsed Dec 31, 2024

Xottab-DUTY Dec 31, 2024

alsed Dec 31, 2024

	if (CL->process_id == static_cast<u32>(GetCurrentProcessId()))
	if (CL->process_id == static_cast<xrpid_t>(GetCurrentProcessId()))


		VERIFY(iFloor((source_position.z - box_z) / cell_size + .5f) < (int)m_row_length);

	if (game_type == static_cast<int>(sg_SourceType))
	if (game_type == sg_SourceType)

Resolves several compile warnings when comparing different int signedness #1755

Are you sure you want to change the base?

Resolves several compile warnings when comparing different int signedness #1755

Conversation

alsed commented Dec 20, 2024 • edited Loading

Xottab-DUTY left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alsed Dec 30, 2024 • edited Loading

Choose a reason for hiding this comment

Xottab-DUTY Dec 31, 2024 • edited Loading

Choose a reason for hiding this comment

alsed Dec 31, 2024 • edited Loading

Choose a reason for hiding this comment

alsed commented Dec 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alsed commented Dec 20, 2024 •

edited

Loading

alsed Dec 30, 2024 •

edited

Loading

Xottab-DUTY Dec 31, 2024 •

edited

Loading

alsed Dec 31, 2024 •

edited

Loading