--- parser3/src/include/pa_memory.h 2003/04/01 15:42:26 1.1.2.9.2.17 +++ parser3/src/include/pa_memory.h 2003/04/08 12:47:30 1.1.2.9.2.18 @@ -9,7 +9,7 @@ #ifndef PA_MEMORY_H #define PA_MEMORY_H -static const char* IDENT_MEMORY_H="$Date: 2003/04/01 15:42:26 $"; +static const char* IDENT_MEMORY_H="$Date: 2003/04/08 12:47:30 $"; // include @@ -71,14 +71,12 @@ inline void *pa_malloc_atomic(size_t siz return pa_fail_alloc("allocate clean", size); } /// @a length may be null, which mean "autocalc it" -inline char *pa_strdup(const char* auto_variable_never_null, size_t length=0) { - if(!length) - length=strlen(auto_variable_never_null); - - size_t size=length+1; +inline char *pa_strdup(const char* auto_variable_never_null, size_t helper_length=0) { + size_t known_length=(helper_length?helper_length:strlen(auto_variable_never_null)); + size_t size=known_length+1; if(char *result=static_cast(PA_GC_MALLOC_ATOMIC(size))) { - memcpy(result, auto_variable_never_null, length); - result[length]=0; + memcpy(result, auto_variable_never_null, size); + result[known_length]=0; return result; } @@ -144,8 +142,8 @@ public: static void *malloc_atomic(size_t size) { return pa_malloc_atomic(size); } - static char *strdup(const char* auto_variable_never_null, size_t length=0) { - return pa_strdup(auto_variable_never_null, length); + static char *strdup(const char* auto_variable_never_null, size_t helper_length=0) { + return pa_strdup(auto_variable_never_null, helper_length); } static void free(void *ptr) { pa_free(ptr);