From 031996ef501f8c3d0532f7df1c38cf2e540a4f11 Mon Sep 17 00:00:00 2001 From: Dariusz Michaluk Date: Tue, 13 Feb 2024 15:38:29 +0100 Subject: Imported Upstream version 4.19.0 --- lib/gstr.h | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) (limited to 'lib/gstr.h') diff --git a/lib/gstr.h b/lib/gstr.h index 00c335c..99be6c4 100644 --- a/lib/gstr.h +++ b/lib/gstr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002-2014 Free Software Foundation, Inc. + * Copyright (C) 2002-2022 Free Software Foundation, Inc. * * This file is part of LIBTASN1. * @@ -19,24 +19,32 @@ * 02110-1301, USA */ +#ifndef GSTR_H +# define GSTR_H + unsigned int _asn1_str_cpy (char *dest, size_t dest_tot_size, const char *src); void _asn1_str_cat (char *dest, size_t dest_tot_size, const char *src); -#define Estrcpy(x,y) _asn1_str_cpy(x,ASN1_MAX_ERROR_DESCRIPTION_SIZE,y) -#define Estrcat(x,y) _asn1_str_cat(x,ASN1_MAX_ERROR_DESCRIPTION_SIZE,y) +# define Estrcpy(x,y) _asn1_str_cpy(x,ASN1_MAX_ERROR_DESCRIPTION_SIZE,y) +# define Estrcat(x,y) _asn1_str_cat(x,ASN1_MAX_ERROR_DESCRIPTION_SIZE,y) -inline static -void safe_memset(void *data, int c, size_t size) +inline static void +safe_memset (void *data, int c, size_t size) { - volatile unsigned volatile_zero = 0; - volatile char *vdata = (volatile char*)data; + volatile unsigned volatile_zero = 0; + volatile char *vdata = (volatile char *) data; - /* This is based on a nice trick for safe memset, - * sent by David Jacobson in the openssl-dev mailing list. - */ + /* This is based on a nice trick for safe memset, + * sent by David Jacobson in the openssl-dev mailing list. + */ - if (size > 0) do { - memset(data, c, size); - } while(vdata[volatile_zero] != c); + if (size > 0) + do + { + memset (data, c, size); + } + while (vdata[volatile_zero] != c); } + +#endif /* GSTR_H */ -- cgit v1.2.3