diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-10-01 22:07:34 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-10-01 22:14:09 +0200 |
| commit | 0f25d868fa70dd4a4f373158a8ce692806161981 (patch) | |
| tree | 10fe4392984348573f7d7ad82d69cf9edbf4799b /src | |
| parent | 6b4c44923d89de87d9b908b10eecc19f598f51c3 (diff) | |
| download | libtasn1-0f25d868fa70dd4a4f373158a8ce692806161981.tar.gz libtasn1-0f25d868fa70dd4a4f373158a8ce692806161981.tar.bz2 libtasn1-0f25d868fa70dd4a4f373158a8ce692806161981.zip | |
updated to new types
Diffstat (limited to 'src')
| -rw-r--r-- | src/asn1Coding.c | 6 | ||||
| -rw-r--r-- | src/asn1Decoding.c | 10 | ||||
| -rw-r--r-- | src/asn1Parser.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/asn1Coding.c b/src/asn1Coding.c index 9ddb0a4..b9a7ca3 100644 --- a/src/asn1Coding.c +++ b/src/asn1Coding.c @@ -133,8 +133,8 @@ main (int argc, char *argv[]) char *inputFileAsnName = NULL; char *inputFileAssignmentName = NULL; int checkSyntaxOnly = 0; - ASN1_TYPE definitions = ASN1_TYPE_EMPTY; - ASN1_TYPE structure = ASN1_TYPE_EMPTY; + asn_node_t definitions = NULL; + asn_node_t structure = NULL; char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE]; int asn1_result = ASN1_SUCCESS; FILE *outputFile; @@ -248,7 +248,7 @@ main (int argc, char *argv[]) while (readAssignment (inputFile, varName, value) == ASSIGNMENT_SUCCESS) { printf ("var=%s, value=%s\n", varName, value); - if (structure == ASN1_TYPE_EMPTY) + if (structure == NULL) { asn1_result = asn1_create_element (definitions, value, &structure); } diff --git a/src/asn1Decoding.c b/src/asn1Decoding.c index c46e43b..f942734 100644 --- a/src/asn1Decoding.c +++ b/src/asn1Decoding.c @@ -33,7 +33,7 @@ #include <read-file.h> #include "benchmark.h" -static int decode(ASN1_TYPE definitions, const char* typeName, void* der, int der_len, int benchmark); +static int decode(asn_node_t definitions, const char* typeName, void* der, int der_len, int benchmark); /* This feature is available in gcc versions 2.5 and later. */ #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) @@ -76,7 +76,7 @@ main (int argc, char *argv[]) char *inputFileAsnName = NULL; char *inputFileDerName = NULL; char *typeName = NULL; - ASN1_TYPE definitions = ASN1_TYPE_EMPTY; + asn_node_t definitions = NULL; char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE]; int asn1_result = ASN1_SUCCESS; unsigned char *der; @@ -224,11 +224,11 @@ main (int argc, char *argv[]) exit (0); } -static int simple_decode(ASN1_TYPE definitions, const char* typeName, void* der, int der_len, int benchmark) +static int simple_decode(asn_node_t definitions, const char* typeName, void* der, int der_len, int benchmark) { int asn1_result; -ASN1_TYPE structure = ASN1_TYPE_EMPTY; +asn_node_t structure = NULL; char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE]; asn1_result = asn1_create_element (definitions, typeName, &structure); @@ -263,7 +263,7 @@ char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE]; return ASN1_SUCCESS; } -static int decode(ASN1_TYPE definitions, const char* typeName, void* der, int der_len, int benchmark) +static int decode(asn_node_t definitions, const char* typeName, void* der, int der_len, int benchmark) { struct benchmark_st st; diff --git a/src/asn1Parser.c b/src/asn1Parser.c index e14da83..4bd4d68 100644 --- a/src/asn1Parser.c +++ b/src/asn1Parser.c @@ -80,7 +80,7 @@ main (int argc, char *argv[]) char *inputFileName = NULL; char *vectorName = NULL; int checkSyntaxOnly = 0; - ASN1_TYPE pointer = ASN1_TYPE_EMPTY; + asn_node_t pointer = NULL; char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE]; int parse_result = ASN1_SUCCESS; |