osmocom
/
asn1c
mirror of https://gerrit.osmocom.org/asn1c
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

do not use reserved identifiers for variables

This commit is contained in:
Lev Walkin 2016-03-13 17:13:20 -07:00
parent 84b578827c
commit 1ec7605500
3 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libasn1fix/asn1fix_misc.c
View File

@ -22,20 +22,19 @@ asn1f_printable_value(asn1p_value_t *v) {
static size_t managedptr_len;
int ret;
#define ENSURE(len) do { \
size_t __len = (len); \
if(__len >= managedptr_len) { \
if(managedptr) \
free(managedptr); \
managedptr = malloc(__len + 1); \
if(managedptr) { \
managedptr_len = __len; \
} else { \
managedptr_len = 0; \
return "<memory allocation error>"; \
} \
} \
} while(0)
#define ENSURE(len) do { \
size_t tmp_len = (len); \
if(tmp_len >= managedptr_len) { \
free(managedptr); \
managedptr = malloc(tmp_len + 1); \
if(managedptr) { \
managedptr_len = tmp_len; \
} else { \
managedptr_len = 0; \
return "<memory allocation error>"; \
} \
} \
} while(0)
if(v == NULL)
return "<no value>";

14
libasn1print/asn1print.c
View File

@ -9,13 +9,13 @@
#include "asn1print.h"
#define INDENT(fmt, args...) do { \
if(!(flags & APF_NOINDENT)) { \
int __i = level; \
while(__i--) printf(" "); \
} \
printf(fmt, ##args); \
} while(0)
#define INDENT(fmt, args...) do { \
if(!(flags & APF_NOINDENT)) { \
int tmp_i = level; \
while(tmp_i--) printf(" "); \
} \
printf(fmt, ##args); \
} while(0)
static int asn1print_module(asn1p_t *asn, asn1p_module_t *mod, enum asn1print_flags flags);
static int asn1print_oid(int prior_len, asn1p_oid_t *oid, enum asn1print_flags flags);

34
skeletons/asn_internal.h
View File

@ -79,23 +79,25 @@ static void ASN_DEBUG(const char *fmt, ...) { (void)fmt; }
|| __ASN_E_cbc(buf2, size2) \
|| __ASN_E_cbc(buf3, size3))
#define _i_ASN_TEXT_INDENT(nl, level) do { \
int __level = (level); \
int __nl = ((nl) != 0); \
int __i; \
if(__nl) _ASN_CALLBACK("\n", 1); \
if(__level < 0) __level = 0; \
for(__i = 0; __i < __level; __i++) \
_ASN_CALLBACK(" ", 4); \
er.encoded += __nl + 4 * __level; \
} while(0)
#define _i_ASN_TEXT_INDENT(nl, level) do { \
int tmp_level = (level); \
int tmp_nl = ((nl) != 0); \
int tmp_i; \
if(tmp_nl) _ASN_CALLBACK("\n", 1); \
if(tmp_level < 0) tmp_level = 0; \
for(tmp_i = 0; tmp_i < tmp_level; tmp_i++) \
_ASN_CALLBACK(" ", 4); \
er.encoded += tmp_nl + 4 * tmp_level; \
} while(0)
#define _i_INDENT(nl) do { \
int __i; \
if((nl) && cb("\n", 1, app_key) < 0) return -1; \
for(__i = 0; __i < ilevel; __i++) \
if(cb(" ", 4, app_key) < 0) return -1; \
} while(0)
#define _i_INDENT(nl) do { \
int tmp_i; \
if((nl) && cb("\n", 1, app_key) < 0) \
return -1; \
for(tmp_i = 0; tmp_i < ilevel; tmp_i++) \
if(cb(" ", 4, app_key) < 0) \
return -1; \
} while(0)
/*
* Check stack against overflow, if limit is set.