restructured member variable names
diff --git a/libasn1fix/asn1fix.c b/libasn1fix/asn1fix.c
index 63cd148..1d06dba 100644
--- a/libasn1fix/asn1fix.c
+++ b/libasn1fix/asn1fix.c
@@ -118,7 +118,7 @@
TQ_FOR(omod, &arg->asn->modules, mod_next) {
int sameNames;
if(omod == arg->mod) break;
- sameNames = strcmp(omod->Identifier, arg->mod->Identifier)?0:1;
+ sameNames = strcmp(omod->ModuleName, arg->mod->ModuleName)?0:1;
if(omod->module_oid && arg->mod->module_oid) {
/* Compare only the OID. */
if(asn1p_oid_compare(omod->module_oid,
@@ -126,18 +126,18 @@
FATAL("ASN.1 module %s in %s "
"has the same OBJECT IDENTIFIER"
" as module %s",
- omod->Identifier,
+ omod->ModuleName,
omod->source_file_name,
- arg->mod->Identifier
+ arg->mod->ModuleName
);
RET2RVAL(-1, rvalue);
} else if(sameNames) {
- WARNING("ASN.1 module %s is defined more than once, with different OIDs", omod->Identifier);
+ WARNING("ASN.1 module %s is defined more than once, with different OIDs", omod->ModuleName);
RET2RVAL(1, rvalue);
}
} else if(sameNames) {
FATAL("ASN.1 module %s is defined more than once",
- omod->Identifier);
+ omod->ModuleName);
RET2RVAL(-1, rvalue);
}
}
@@ -150,7 +150,7 @@
break;
default:
FATAL("Module %s defined with ambiguous global tagging mode",
- arg->mod->Identifier);
+ arg->mod->ModuleName);
RET2RVAL(-1, rvalue);
}
@@ -162,7 +162,7 @@
break;
case MSF_unk_INSTRUCTIONS:
WARNING("Module %s defined with unrecognized "
- "encoding reference", arg->mod->Identifier);
+ "encoding reference", arg->mod->ModuleName);
RET2RVAL(1, rvalue);
/* Fall through */
case MSF_TAG_INSTRUCTIONS:
@@ -170,7 +170,7 @@
break;
default:
FATAL("Module %s defined with ambiguous encoding reference",
- arg->mod->Identifier);
+ arg->mod->ModuleName);
RET2RVAL(-1, rvalue);
}
@@ -452,10 +452,10 @@
"Please rename either instance to resolve the conflict",
arg->expr->Identifier,
arg->expr->_lineno,
- arg->mod->Identifier,
+ arg->mod->ModuleName,
tmparg.expr->Identifier,
tmparg.expr->_lineno,
- tmparg.mod->Identifier,
+ tmparg.mod->ModuleName,
diff_files ? " (" : "",
diff_files ? tmparg.mod->source_file_name : "",
diff_files ? ")" : ""
diff --git a/libasn1fix/asn1fix_constr.c b/libasn1fix/asn1fix_constr.c
index 588c08e..7adbcac 100644
--- a/libasn1fix/asn1fix_constr.c
+++ b/libasn1fix/asn1fix_constr.c
@@ -446,7 +446,7 @@
"improper use of "
"EXTENSIBILITY IMPLIED flag "
"of module %s",
- arg->mod->Identifier);
+ arg->mod->ModuleName);
}
return -1;
} else {
diff --git a/libasn1fix/asn1fix_retrieve.c b/libasn1fix/asn1fix_retrieve.c
index d7eeed2..730c861 100644
--- a/libasn1fix/asn1fix_retrieve.c
+++ b/libasn1fix/asn1fix_retrieve.c
@@ -51,7 +51,7 @@
* Okay, right now we have a module name and, hopefully, an OID.
* Search the arg->asn for the specified module.
*/
- mod = asn1f_lookup_module(arg, xp->from, xp->from_oid);
+ mod = asn1f_lookup_module(arg, xp->fromModuleName, xp->identifier.oid);
if(mod == NULL) {
/* Conditional debug */
if(!(arg->expr->_mark & TM_BROKEN)) {
@@ -59,7 +59,7 @@
FATAL("Cannot find external module \"%s\" "
"mentioned for "
"\"%s\" at line %d",
- xp->from, name, arg->expr->_lineno);
+ xp->fromModuleName, name, arg->expr->_lineno);
}
/* ENOENT/ETOOMANYREFS */
return NULL;
@@ -97,7 +97,7 @@
* somewhere in the IMPORTS section AND OID is given.
*/
TQ_FOR(xp, &(arg->mod->imports), xp_next) {
- if(strcmp(module_name, xp->from))
+ if(strcmp(module_name, xp->fromModuleName))
continue;
if(oid) {
FATAL("Ambiguous reference: "
@@ -111,7 +111,7 @@
* Yes, there is a renaming.
* Make lookup use OID instead.
*/
- oid = xp->from_oid;
+ oid = xp->identifier.oid;
}
}
@@ -134,7 +134,7 @@
}
}
- if(strcmp(module_name, mod->Identifier) == 0)
+ if(strcmp(module_name, mod->ModuleName) == 0)
return mod;
}
@@ -167,7 +167,7 @@
DEBUG("(%s) in %s for line %d",
asn1f_printable_reference(ref),
- mod->Identifier,
+ mod->ModuleName,
ref->_lineno);
if(ref->comp_count == 1) {
@@ -251,16 +251,16 @@
if(modulename) {
FATAL("Module %s referred by %s in module %s "
"does not contain the requested symbol",
- imports_from->Identifier,
+ imports_from->ModuleName,
asn1f_printable_reference(ref),
- mod->Identifier);
+ mod->ModuleName);
} else {
FATAL("Module %s referred in IMPORTS section "
"for %s of module %s does not contain "
"the requested symbol",
- imports_from->Identifier,
+ imports_from->ModuleName,
asn1f_printable_reference(ref),
- mod->Identifier);
+ mod->ModuleName);
}
}
return expr;
@@ -277,7 +277,7 @@
if(ref_tc == NULL) {
DEBUG("Module \"%s\" does not contain \"%s\" "
"mentioned at line %d: %s",
- mod->Identifier,
+ mod->ModuleName,
identifier,
ref->_lineno,
strerror(errno)
@@ -406,7 +406,7 @@
arg->expr->_mark |= TM_BROKEN;
FATAL("EXPORTS section of module %s in %s "
"does not mention %s at line %d",
- mod->Identifier, mod->source_file_name, name,
+ mod->ModuleName, mod->source_file_name, name,
arg->expr->_lineno);
}