From 6fff79ce6d66485ae5c7835729518ac05e6b9589 Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Thu, 2 Jun 2005 15:10:54 +0000 Subject: [PATCH 1/1] Dave can see a better way of doing the rounding. p4raw-id: //depot/perl@24678 --- handy.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handy.h b/handy.h index 90cf267..534e92e 100644 --- a/handy.h +++ b/handy.h @@ -605,7 +605,7 @@ hopefully catches attempts to access uninitialized memory. (void)((n)>((MEM_SIZE)~0)/sizeof(t)?(Perl_croak_nocontext(a,b),0):0) #define MEM_WRAP_CHECK_(n,t) MEM_WRAP_CHECK(n,t), -#define PERL_STRLEN_ROUNDUP(n) ((void)(((n) > (MEM_SIZE)~0 - 2 * PERL_STRLEN_ROUNDUP_QUANTUM) ? (Perl_croak_nocontext(PL_memory_wrap),0):0),((n-1)&~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM-1))+PERL_STRLEN_ROUNDUP_QUANTUM) +#define PERL_STRLEN_ROUNDUP(n) ((void)(((n) > (MEM_SIZE)~0 - 2 * PERL_STRLEN_ROUNDUP_QUANTUM) ? (Perl_croak_nocontext(PL_memory_wrap),0):0),((n-1+PERL_STRLEN_ROUNDUP_QUANTUM)&~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM-1))) #else @@ -614,7 +614,7 @@ hopefully catches attempts to access uninitialized memory. #define MEM_WRAP_CHECK_2(n,t,a,b) #define MEM_WRAP_CHECK_(n,t) -#define PERL_STRLEN_ROUNDUP(n) (((n-1)&~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM-1))+PERL_STRLEN_ROUNDUP_QUANTUM) +#define PERL_STRLEN_ROUNDUP(n) (((n-1+PERL_STRLEN_ROUNDUP_QUANTUM)&~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM-1))) #endif -- 1.8.3.1