uefi-ref/nasm
1
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm synced 2026-08-26 16:23:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

asm/preproc.c: remove git merge crap in comment

Browse source 
A comment accidentally was left with a merge resolution
annotation. This was of course harmless, being in a comment, but it
shouldn't be there.

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin (Intel) 2026-04-10 13:21:41 -07:00
parent 97db0b96c2
commit 3cb6231581
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
asm/preproc.c
View file

@ -156,14 +156,10 @@ static bool is_smac_param(enum token_type toktype)
* We prohibit tokens of length > MAX_TEXT even though length here is
* an unsigned int; this avoids problems if the length is passed
* through an interface with type "int", and is absurdly large anyway.
<<<<<<< Updated upstream
*
* Use INT_MAX >> 2 to try to at least try to avoid risking wraparound
* even in the fairly extreme case when "int" is incorrectly used and
* two lengths are added. That is still 512GB with a 32-bit int...
=======
* Use INT_MAX >> 1 to try to at least try to avoid risking wraparound
* even when "int" is incorrectly used.
>>>>>>> Stashed changes
*
* Earlier versions of the source code incorrectly stated that
* examining the text string alone can be unconditionally valid. This