* Sebastian Hammer, Adam Dickmeiss
*
* $Log: explain.c,v $
- * Revision 1.8 1997-09-09 10:19:51 adam
+ * Revision 1.9 1997-11-24 11:34:38 adam
+ * Using odr_nullval() instead of ODR_NULLVAL when appropriate.
+ *
+ * Revision 1.8 1997/09/09 10:19:51 adam
* New MSV5.0 port with fewer warnings.
*
* Revision 1.7 1997/08/28 20:17:36 adam
int (*handle)();
} IrExpChoice;
-static Odr_null *ODR_NULLVALUE = "NULL";
-
typedef char *Z_ElementSetName;
typedef Odr_oid *Z_AttributeSetId;
typedef char *Z_InternationalString;
if (!ir_match_start (name, p, iea, ++argi))
return TCL_OK;
- ir_choice (iea, arm, p, ODR_NULLVALUE, argi);
+ ir_choice (iea, arm, p, odr_nullval(), argi);
return ir_match_end (name, iea, argi);
}
ir_InternationalString (iea, p->name, "name", argi);
ir_HumanString (iea, p->title, "title", argi);
if (p->searchCost)
- ir_choice (iea, searchCostArm, p->searchCost, ODR_NULLVALUE, argi);
+ ir_choice (iea, searchCostArm, p->searchCost, odr_nullval(), argi);
ir_bool (iea, p->scanable, "scanable", argi);
ir_sequence (ir_InternationalString, iea, p->broader,
ir_bool (iea, p->available, "available", argi);
ir_bool (iea, p->retentionSupported, "retentionSupported", argi);
- ir_choice (iea, waitActionArm, p->waitAction, ODR_NULLVALUE, argi);
+ ir_choice (iea, waitActionArm, p->waitAction, odr_nullval(), argi);
ir_HumanString (iea, p->description, "description", argi);
ir_External (iea, p->specificExplain, "specificExplain", argi);
ir_SortKeyDetailsSortType (iea, p->sortType, "sortType", argi);
if (p->caseSensitivity)
- ir_choice (iea, sortArm, p->caseSensitivity, ODR_NULLVALUE, argi);
+ ir_choice (iea, sortArm, p->caseSensitivity, odr_nullval(), argi);
return ir_match_end (name, iea, argi);
}
ir_CommonInfo (iea, p->commonInfo, "commonInfo", argi);
ir_DatabaseName (iea, p->databaseName, "databaseName", argi);
- ir_choice (iea, arm, p->processingContext, ODR_NULLVALUE, argi);
+ ir_choice (iea, arm, p->processingContext, odr_nullval(), argi);
ir_InternationalString (iea, p->name, "name", argi);
ir_oid (iea, p->oid, "oid", argi);
ir_HumanString (iea, p->description, "description", argi);
{ NULL, 0, NULL }};
if (!ir_match_start (name, p, iea, ++argi))
return TCL_OK;
- ir_choice (iea, arm, &p->which, ODR_NULLVALUE, argi);
+ ir_choice (iea, arm, &p->which, odr_nullval(), argi);
ir_InternationalString (iea, p->bodyType, "bodyType", argi);
ir_octet (iea, p->content, "content", argi);
return ir_match_end (name, iea, argi);
if (!ir_match_start (name, p, iea, ++argi))
return TCL_OK;
- ir_choice (iea, arm, p->accessType, ODR_NULLVALUE, argi);
+ ir_choice (iea, arm, p->accessType, odr_nullval(), argi);
ir_HumanString (iea, p->accessText, "accessText", argi);
ir_sequence (ir_oid, iea, p->accessChallenges,
&p->num_accessChallenges, "accessChallenges", argi);