Possible compatibility problems with earlier versions marked with '*'.
+* Changed code so that it compiles under C++. The type definition
+of Odr_fun which is a member of Odr_arm was changed. The result is,
+that an explicit typecast is needed for the fun pointer when
+using Odr_arm - as in:
+ {1, -1, -1, Z_IdAuthentication_idPass, (Odr_fun)z_IdPass},
+
Updated TagSet-G and -M definitions (tagsetm.tag and tagsetg.tag).
Implemented the new structured date and time definition as approved
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: proto.c,v $
- * Revision 1.54 1996-11-11 13:14:46 adam
+ * Revision 1.55 1998-02-11 11:53:32 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.54 1996/11/11 13:14:46 adam
* Fixed tagging bug in z_ProximityOperator.
*
* Revision 1.53 1996/10/09 15:54:55 quinn
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_OtherInfo_characterInfo,
odr_visiblestring},
{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_OtherInfo_binaryInfo,
- odr_octetstring},
+ (Odr_fun)odr_octetstring},
{ODR_IMPLICIT, ODR_CONTEXT, 4, Z_OtherInfo_externallyDefinedInfo,
- z_External},
- {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_OtherInfo_oid, odr_oid},
+ (Odr_fun)z_External},
+ {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_OtherInfo_oid, (Odr_fun)odr_oid},
{-1, -1, -1, -1, 0}
};
int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_OtherInformation *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
odr_implicit_settag(o, ODR_CONTEXT, 201);
- if (odr_sequence_of(o, z_OtherInformationUnit, &(*p)->list,
+ if (odr_sequence_of(o, (Odr_fun)z_OtherInformationUnit, &(*p)->list,
&(*p)->num_elements))
return 1;
*p = 0;
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_StringOrNumeric_string,
odr_visiblestring},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_StringOrNumeric_numeric,
- odr_integer},
+ (Odr_fun)odr_integer},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_StringOrNumeric *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
int z_StringList(ODR o, Z_StringList **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_StringList *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, z_InternationalString, &(*p)->strings,
+ if (odr_sequence_of(o, (Odr_fun)z_InternationalString, &(*p)->strings,
&(*p)->num_strings))
return 1;
*p = 0;
static Odr_arm arm[] =
{
{-1, -1, -1, Z_IdAuthentication_open, z_StrAuthentication},
- {-1, -1, -1, Z_IdAuthentication_idPass, z_IdPass},
- {-1, -1, -1, Z_IdAuthentication_anonymous, odr_null},
- {-1, -1, -1, Z_IdAuthentication_other, z_External},
+ {-1, -1, -1, Z_IdAuthentication_idPass, (Odr_fun)z_IdPass},
+ {-1, -1, -1, Z_IdAuthentication_anonymous, (Odr_fun)odr_null},
+ {-1, -1, -1, Z_IdAuthentication_other, (Odr_fun)z_External},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_IdAuthentication *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
int z_DatabaseSpecific(ODR o, Z_DatabaseSpecific **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_DatabaseSpecific *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
odr_implicit_settag(o, ODR_CONTEXT, 1);
- if (odr_sequence_of(o, z_DatabaseSpecificUnit, &(*p)->elements,
+ if (odr_sequence_of(o, (Odr_fun)z_DatabaseSpecificUnit, &(*p)->elements,
&(*p)->num_elements))
return 1;
*p = 0;
{ODR_IMPLICIT, ODR_CONTEXT, 0, Z_ElementSetNames_generic,
z_ElementSetName},
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementSetNames_databaseSpecific,
- z_DatabaseSpecific},
+ (Odr_fun)z_DatabaseSpecific},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_ElementSetNames *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt && odr_ok(o);
return opt && odr_ok(o);
return
odr_implicit_settag(o, ODR_CONTEXT, 1) &&
- odr_sequence_of(o, z_StringOrNumeric, &(*p)->list,
+ odr_sequence_of(o, (Odr_fun)z_StringOrNumeric, &(*p)->list,
&(*p)->num_list) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- (odr_sequence_of(o, odr_integer, &(*p)->semanticAction,
+ (odr_sequence_of(o, (Odr_fun)odr_integer, &(*p)->semanticAction,
&(*p)->num_semanticAction) || odr_ok(o)) &&
odr_sequence_end(o);
}
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 121, Z_AttributeValue_numeric,
- odr_integer},
+ (Odr_fun)odr_integer},
{ODR_IMPLICIT, ODR_CONTEXT, 224, Z_AttributeValue_complex,
- z_ComplexAttribute},
+ (Odr_fun)z_ComplexAttribute},
{-1, -1, -1, -1, 0}
};
#endif
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 45, Z_Term_general, odr_octetstring},
- {ODR_IMPLICIT, ODR_CONTEXT, 215, Z_Term_numeric, odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 45, Z_Term_general, (Odr_fun)odr_octetstring},
+ {ODR_IMPLICIT, ODR_CONTEXT, 215, Z_Term_numeric, (Odr_fun)odr_integer},
{ODR_IMPLICIT, ODR_CONTEXT, 216, Z_Term_characterString,
odr_visiblestring},
- {ODR_IMPLICIT, ODR_CONTEXT, 217, Z_Term_oid, odr_oid},
+ {ODR_IMPLICIT, ODR_CONTEXT, 217, Z_Term_oid, (Odr_fun)odr_oid},
{ODR_IMPLICIT, ODR_CONTEXT, 218, Z_Term_dateTime, odr_cstring},
- {ODR_IMPLICIT, ODR_CONTEXT, 219, Z_Term_external, z_External},
+ {ODR_IMPLICIT, ODR_CONTEXT, 219, Z_Term_external, (Odr_fun)z_External},
/* add intUnit here */
- {ODR_IMPLICIT, ODR_CONTEXT, 221, Z_Term_null, odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 221, Z_Term_null, (Odr_fun)odr_null},
{-1, -1, -1, -1, 0}
};
if (o->direction ==ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Term *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
return opt && odr_ok(o);
return
odr_implicit_settag(o, ODR_CONTEXT, 44) &&
- odr_sequence_of(o, z_AttributeElement, &(*p)->attributeList,
+ odr_sequence_of(o, (Odr_fun)z_AttributeElement, &(*p)->attributeList,
&(*p)->num_attributes) &&
z_Term(o, &(*p)->term, 0) &&
odr_sequence_end(o);
return
z_ResultSetId(o, &(*p)->resultSet, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 44) &&
- odr_sequence_of(o, z_AttributeElement, &(*p)->attributeList,
+ odr_sequence_of(o, (Odr_fun)z_AttributeElement, &(*p)->attributeList,
&(*p)->num_attributes) &&
odr_sequence_end(o);
}
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ProxCode_known, odr_integer},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ProxCode_private, odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ProxCode_known, (Odr_fun)odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ProxCode_private, (Odr_fun)odr_integer},
{-1, -1, -1, -1, 0}
};
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_Operator_and, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Operator_or, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Operator_and_not, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Operator_prox, z_ProximityOperator},
+ {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_Operator_and, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Operator_or, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Operator_and_not, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Operator_prox, (Odr_fun)z_ProximityOperator},
{-1, -1, -1, -1, 0}
};
if (!odr_constructed_begin(o, p, ODR_CONTEXT, 46))
return opt && odr_ok(o);
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Operator *)odr_malloc(o, sizeof(**p));
if (odr_choice(o, arm, &(*p)->u, &(*p)->which) &&
odr_constructed_end(o))
{
static Odr_arm arm[] =
{
- {-1, -1, -1, Z_Operand_APT, z_AttributesPlusTerm},
- {-1, -1, -1, Z_Operand_resultSetId, z_ResultSetId},
- {-1, -1, -1, Z_Operand_resultAttr, z_ResultSetPlusAttributes},
+ {-1, -1, -1, Z_Operand_APT, (Odr_fun)z_AttributesPlusTerm},
+ {-1, -1, -1, Z_Operand_resultSetId, (Odr_fun)z_ResultSetId},
+ {-1, -1, -1, Z_Operand_resultAttr, (Odr_fun)z_ResultSetPlusAttributes},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Operand *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
{
static Odr_arm arm[] =
{
- {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_RPNStructure_simple, z_Operand},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_RPNStructure_complex, z_Complex},
+ {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_RPNStructure_simple, (Odr_fun)z_Operand},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_RPNStructure_complex, (Odr_fun)z_Complex},
{-1 -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_RPNStructure *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Query_type_1, z_RPNQuery},
- {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_Query_type_2, odr_octetstring},
- {ODR_IMPLICIT, ODR_CONTEXT, 101, Z_Query_type_101, z_RPNQuery},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Query_type_1, (Odr_fun)z_RPNQuery},
+ {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_Query_type_2, (Odr_fun)odr_octetstring},
+ {ODR_IMPLICIT, ODR_CONTEXT, 101, Z_Query_type_101, (Odr_fun)z_RPNQuery},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Query *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
{
static Odr_arm arm[] =
{
- {-1, -1, -1, Z_DiagRec_defaultFormat, z_DefaultDiagFormat},
- {-1, -1, -1, Z_DiagRec_externallyDefined, z_External},
+ {-1, -1, -1, Z_DiagRec_defaultFormat, (Odr_fun)z_DefaultDiagFormat},
+ {-1, -1, -1, Z_DiagRec_externallyDefined, (Odr_fun)z_External},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_DiagRec *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_DiagRecs *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, z_DiagRec, &(*p)->diagRecs,
+ if (odr_sequence_of(o, (Odr_fun)z_DiagRec, &(*p)->diagRecs,
&(*p)->num_diagRecs))
return 1;
*p = 0;
static Odr_arm arm[] =
{
{ODR_EXPLICIT, ODR_CONTEXT, 1, Z_NamePlusRecord_databaseRecord,
- z_DatabaseRecord},
+ (Odr_fun)z_DatabaseRecord},
{ODR_EXPLICIT, ODR_CONTEXT, 2, Z_NamePlusRecord_surrogateDiagnostic,
- z_DiagRec},
+ (Odr_fun)z_DiagRec},
{-1, -1, -1, -1, 0}
};
int z_NamePlusRecordList(ODR o, Z_NamePlusRecordList **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_NamePlusRecordList *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, z_NamePlusRecord, &(*p)->records,
+ if (odr_sequence_of(o, (Odr_fun)z_NamePlusRecord, &(*p)->records,
&(*p)->num_records))
return 1;
*p = 0;
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 28, Z_Records_DBOSD, z_NamePlusRecordList},
- {ODR_IMPLICIT, ODR_CONTEXT, 130, Z_Records_NSD, z_DiagRec},
+ {ODR_IMPLICIT, ODR_CONTEXT, 28, Z_Records_DBOSD, (Odr_fun)z_NamePlusRecordList},
+ {ODR_IMPLICIT, ODR_CONTEXT, 130, Z_Records_NSD, (Odr_fun)z_DiagRec},
{ODR_IMPLICIT, ODR_CONTEXT, 205, Z_Records_multipleNSD,
- z_DiagRecs},
+ (Odr_fun)z_DiagRecs},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Records *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 37, Z_AccessRequest_simpleForm,
- odr_octetstring},
+ (Odr_fun)odr_octetstring},
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessRequest_externallyDefined,
- z_External},
+ (Odr_fun)z_External},
{-1, -1, -1, -1, 0}
};
if (!odr_sequence_begin(o, p, sizeof(**p)))
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 38, Z_AccessResponse_simpleForm,
- odr_octetstring},
+ (Odr_fun)odr_octetstring},
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessResponse_externallyDefined,
- z_External},
+ (Odr_fun)z_External},
{-1, -1, -1, -1, 0}
};
if (!odr_sequence_begin(o, p, sizeof(**p)))
int z_AttributeList(ODR o, Z_AttributeList **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_AttributeList *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
odr_implicit_settag(o, ODR_CONTEXT, 44);
- if (odr_sequence_of(o, z_AttributeElement, &(*p)->attributes,
+ if (odr_sequence_of(o, (Odr_fun)z_AttributeElement, &(*p)->attributes,
&(*p)->num_attributes))
return 1;
*p = 0;
if (!odr_implicit_settag(o, ODR_CONTEXT, 44))
return 0;
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
- if (!odr_sequence_of(o, z_AttributeElement, &(*p)->attributeList,
+ *p = (Z_AttributesPlusTerm*)odr_malloc(o, sizeof(**p));
+ if (!odr_sequence_of(o, (Odr_fun)z_AttributeElement, &(*p)->attributeList,
&(*p)->num_attributes))
return 0;
if (!odr_sequence_end(o) || !odr_sequence_end(o))
int z_AlternativeTerm(ODR o, Z_AlternativeTerm **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_AlternativeTerm *)odr_malloc(o, sizeof(**p));
else if (!*p)
{
o->t_class = -1;
return opt && odr_ok(o);
}
- if (odr_sequence_of(o, z_AttributesPlusTerm, &(*p)->terms,
+ if (odr_sequence_of(o, (Odr_fun)z_AttributesPlusTerm, &(*p)->terms,
&(*p)->num_terms))
return 1;
*p = 0;
{
if (!odr_initmember(o, p, sizeof(**p)))
return opt && odr_ok(o);
- if (odr_sequence_of(o, z_ByDatabase, &(*p)->elements, &(*p)->num_elements))
+ if (odr_sequence_of(o, (Odr_fun)z_ByDatabase, &(*p)->elements, &(*p)->num_elements))
return 1;
*p = 0;
return opt && odr_ok(o);
{
Odr_arm arm[] =
{
- {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_ScanOccurrences_global, odr_integer},
+ {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_ScanOccurrences_global, (Odr_fun)odr_integer},
{ODR_EXPLICIT, ODR_CONTEXT, 3, Z_ScanOccurrences_byDatabase,
- z_ByDatabaseList},
+ (Odr_fun)z_ByDatabaseList},
{-1, -1, -1, -1, 0}
};
{
if (!odr_initmember(o, p, sizeof(**p)))
return opt && odr_ok(o);
- if (!odr_sequence_of(o, z_OccurrenceByAttributesElem, &(*p)->elements,
+ if (!odr_sequence_of(o, (Odr_fun)z_OccurrenceByAttributesElem, &(*p)->elements,
&(*p)->num_elements))
return 1;
*p = 0;
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Entry_termInfo, z_TermInfo},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Entry_termInfo, (Odr_fun)z_TermInfo},
{ODR_EXPLICIT, ODR_CONTEXT, 2, Z_Entry_surrogateDiagnostic,
- z_DiagRec},
+ (Odr_fun)z_DiagRec},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Entry *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
int z_Entries(ODR o, Z_Entries **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Entries *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, z_Entry, &(*p)->entries,
+ if (odr_sequence_of(o, (Odr_fun)z_Entry, &(*p)->entries,
&(*p)->num_entries))
return 1;
*p = 0;
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ListEntries_entries, z_Entries},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ListEntries_entries, (Odr_fun)z_Entries},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ListEntries_nonSurrogateDiagnostics,
- z_DiagRecs},
+ (Odr_fun)z_DiagRecs},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_ListEntries *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementSpec_elementSetName,
odr_visiblestring},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ElementSpec_externalSpec,
- z_External},
+ (Odr_fun)z_External},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_ElementSpec *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
1, 0) &&
odr_implicit(o, z_Specification, &(*p)->generic, ODR_CONTEXT, 2, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 3) &&
- (odr_sequence_of(o, z_DbSpecific, &(*p)->dbSpecific,
+ (odr_sequence_of(o, (Odr_fun)z_DbSpecific, &(*p)->dbSpecific,
&(*p)->num_dbSpecific) || odr_ok(o)) &&
odr_implicit_settag(o, ODR_CONTEXT, 4) &&
- (odr_sequence_of(o, odr_oid, &(*p)->recordSyntax,
+ (odr_sequence_of(o, (Odr_fun)odr_oid, &(*p)->recordSyntax,
&(*p)->num_recordSyntax) || odr_ok(o)) &&
odr_sequence_end(o);
}
static Odr_arm arm[] =
{
{ODR_EXPLICIT, ODR_CONTEXT, 19, Z_RecordComp_simple,
- z_ElementSetNames},
+ (Odr_fun)z_ElementSetNames},
{ODR_IMPLICIT, ODR_CONTEXT, 209, Z_RecordComp_complex,
- z_CompSpec},
+ (Odr_fun)z_CompSpec},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_RecordComposition *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
29, 0) &&
#ifdef Z_95
odr_implicit_settag(o, ODR_CONTEXT, 212) &&
- (odr_sequence_of(o, z_Range, &(*p)->additionalRanges,
+ (odr_sequence_of(o, (Odr_fun)z_Range, &(*p)->additionalRanges,
&(*p)->num_ranges) || odr_ok(o)) &&
z_RecordComposition(o, &(*p)->recordComposition, 1) &&
#else
odr_implicit(o, z_DeleteSetStatus, &(*p)->deleteOperationStatus,
ODR_CONTEXT, 0, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 1) &&
- (odr_sequence_of(o, z_ListStatus, &(*p)->deleteListStatuses,
+ (odr_sequence_of(o, (Odr_fun)z_ListStatus, &(*p)->deleteListStatuses,
&(*p)->num_statuses) || odr_ok(o)) &&
odr_implicit(o, odr_integer, &(*p)->numberNotDeleted, ODR_CONTEXT,
34, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 35) &&
- (odr_sequence_of(o, z_ListStatus, &(*p)->bulkStatuses,
+ (odr_sequence_of(o, (Odr_fun)z_ListStatus, &(*p)->bulkStatuses,
&(*p)->num_bulkStatuses) || odr_ok(o)) &&
odr_implicit(o, odr_visiblestring, &(*p)->deleteMessage, ODR_CONTEXT,
36, 1) &&
odr_implicit(o, odr_integer, &(*p)->numberOfRecordsReturned,
ODR_CONTEXT, 24, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 0) &&
- odr_sequence_of(o, z_NamePlusRecord, &(*p)->segmentRecords,
+ odr_sequence_of(o, (Odr_fun)z_NamePlusRecord, &(*p)->segmentRecords,
&(*p)->num_segmentRecords) &&
z_OtherInformation(o, &(*p)->otherInfo, 1) &&
odr_sequence_end(o);
odr_implicit(o, z_InternationalString, &(*p)->userId, ODR_CONTEXT,
1, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- odr_sequence_of(o, odr_integer, &(*p)->allowableFunctions,
+ odr_sequence_of(o, (Odr_fun)odr_integer, &(*p)->allowableFunctions,
&(*p)->num_allowableFunctions) &&
odr_sequence_end(o);
}
z_ReferenceId(o, &(*p)->referenceId, 1) &&
odr_implicit(o, odr_integer, &(*p)->operationStatus, ODR_CONTEXT, 3, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 4) &&
- (odr_sequence_of(o, z_DiagRec, &(*p)->diagnostics,
+ (odr_sequence_of(o, (Odr_fun)z_DiagRec, &(*p)->diagnostics,
&(*p)->num_diagnostics) || odr_ok(o)) &&
odr_implicit(o, z_External, &(*p)->taskPackage, ODR_CONTEXT, 5, 1) &&
z_OtherInformation(o, &(*p)->otherInfo, 1) &&
{
{ODR_IMPLICIT, ODR_CONTEXT, 0, Z_SortKey_sortField,
z_InternationalString},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortKey_elementSpec, z_Specification},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortKey_elementSpec, (Odr_fun)z_Specification},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortKey_sortAttributes,
- z_SortAttributes},
+ (Odr_fun)z_SortAttributes},
{-1, -1, -1, -1, 0}
};
{
if (!odr_initmember(o, p, sizeof(**p)))
return opt && odr_ok(o);
- if (odr_sequence_of(o, z_SortDbSpecific, &(*p)->dbSpecific,
+ if (odr_sequence_of(o, (Odr_fun)z_SortDbSpecific, &(*p)->dbSpecific,
&(*p)->num_dbSpecific))
return 1;
*p = 0;
{
static Odr_arm arm[] =
{
- {ODR_EXPLICIT, ODR_CONTEXT, 1, Z_SortElement_generic, z_SortKey},
+ {ODR_EXPLICIT, ODR_CONTEXT, 1, Z_SortElement_generic, (Odr_fun)z_SortKey},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortElement_databaseSpecific,
- z_SortDbSpecificList},
+ (Odr_fun)z_SortDbSpecificList},
{-1, -1, -1, -1, 0}
};
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortMissingValAct_abort, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortMissingValAct_null, odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortMissingValAct_abort, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortMissingValAct_null, (Odr_fun)odr_null},
{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_SortMissingValAct_valData,
- odr_octetstring},
+ (Odr_fun)odr_octetstring},
{-1, -1, -1, -1, 0}
};
{
if (!odr_initmember(o, p, sizeof(**p)))
return opt && odr_ok(o);
- if (odr_sequence_of(o, z_SortKeySpec, &(*p)->specs, &(*p)->num_specs))
+ if (odr_sequence_of(o, (Odr_fun)z_SortKeySpec, &(*p)->specs, &(*p)->num_specs))
return 1;
*p = 0;
return opt && odr_ok(o);
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 20, Z_APDU_initRequest, z_InitRequest},
- {ODR_IMPLICIT, ODR_CONTEXT, 21, Z_APDU_initResponse, z_InitResponse},
- {ODR_IMPLICIT, ODR_CONTEXT, 22, Z_APDU_searchRequest, z_SearchRequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 20, Z_APDU_initRequest, (Odr_fun)z_InitRequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 21, Z_APDU_initResponse, (Odr_fun)z_InitResponse},
+ {ODR_IMPLICIT, ODR_CONTEXT, 22, Z_APDU_searchRequest, (Odr_fun)z_SearchRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 23, Z_APDU_searchResponse,
- z_SearchResponse},
+ (Odr_fun)z_SearchResponse},
{ODR_IMPLICIT, ODR_CONTEXT, 24, Z_APDU_presentRequest,
- z_PresentRequest},
+ (Odr_fun)z_PresentRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 25, Z_APDU_presentResponse,
- z_PresentResponse},
+ (Odr_fun)z_PresentResponse},
{ODR_IMPLICIT, ODR_CONTEXT, 26, Z_APDU_deleteResultSetRequest,
- z_DeleteResultSetRequest},
+ (Odr_fun)z_DeleteResultSetRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 27, Z_APDU_deleteResultSetResponse,
- z_DeleteResultSetResponse},
+ (Odr_fun)z_DeleteResultSetResponse},
{ODR_IMPLICIT, ODR_CONTEXT, 28, Z_APDU_accessControlRequest,
- z_AccessControlRequest},
+ (Odr_fun)z_AccessControlRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 29, Z_APDU_accessControlResponse,
- z_AccessControlResponse},
+ (Odr_fun)z_AccessControlResponse},
{ODR_IMPLICIT, ODR_CONTEXT, 30, Z_APDU_resourceControlRequest,
- z_ResourceControlRequest},
+ (Odr_fun)z_ResourceControlRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 31, Z_APDU_resourceControlResponse,
- z_ResourceControlResponse},
+ (Odr_fun)z_ResourceControlResponse},
{ODR_IMPLICIT, ODR_CONTEXT, 32, Z_APDU_triggerResourceControlRequest,
- z_TriggerResourceControlRequest},
+ (Odr_fun)z_TriggerResourceControlRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 33, Z_APDU_resourceReportRequest,
- z_ResourceReportRequest},
+ (Odr_fun)z_ResourceReportRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 34, Z_APDU_resourceReportResponse,
- z_ResourceReportResponse},
- {ODR_IMPLICIT, ODR_CONTEXT, 35, Z_APDU_scanRequest, z_ScanRequest},
- {ODR_IMPLICIT, ODR_CONTEXT, 36, Z_APDU_scanResponse, z_ScanResponse},
- {ODR_IMPLICIT, ODR_CONTEXT, 43, Z_APDU_sortRequest, z_SortRequest},
- {ODR_IMPLICIT, ODR_CONTEXT, 44, Z_APDU_sortResponse, z_SortResponse},
- {ODR_IMPLICIT, ODR_CONTEXT, 45, Z_APDU_segmentRequest, z_Segment},
+ (Odr_fun)z_ResourceReportResponse},
+ {ODR_IMPLICIT, ODR_CONTEXT, 35, Z_APDU_scanRequest, (Odr_fun)z_ScanRequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 36, Z_APDU_scanResponse, (Odr_fun)z_ScanResponse},
+ {ODR_IMPLICIT, ODR_CONTEXT, 43, Z_APDU_sortRequest, (Odr_fun)z_SortRequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 44, Z_APDU_sortResponse, (Odr_fun)z_SortResponse},
+ {ODR_IMPLICIT, ODR_CONTEXT, 45, Z_APDU_segmentRequest, (Odr_fun)z_Segment},
{ODR_IMPLICIT, ODR_CONTEXT, 46, Z_APDU_extendedServicesRequest,
- z_ExtendedServicesRequest},
+ (Odr_fun)z_ExtendedServicesRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 47, Z_APDU_extendedServicesResponse,
- z_ExtendedServicesResponse},
- {ODR_IMPLICIT, ODR_CONTEXT, 48, Z_APDU_close, z_Close},
+ (Odr_fun)z_ExtendedServicesResponse},
+ {ODR_IMPLICIT, ODR_CONTEXT, 48, Z_APDU_close, (Odr_fun)z_Close},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_APDU *)odr_malloc(o, sizeof(**p));
odr_setlenlen(o, 5);
if (!odr_choice(o, arm, &(*p)->u, &(*p)->which))
{
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: prt-acc.c,v $
- * Revision 1.6 1998-01-05 09:04:57 adam
+ * Revision 1.7 1998-02-11 11:53:32 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.6 1998/01/05 09:04:57 adam
* Fixed bugs in encoders/decoders - Not operator (!) missing.
*
* Revision 1.5 1995/09/29 17:11:53 quinn
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PromptId1_enumeratedPrompt,
- z_EnumeratedPrompt1},
+ (Odr_fun)z_EnumeratedPrompt1},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_PromptId1_nonEnumeratedPrompt,
odr_visiblestring},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_PromptId1 *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Challenge1_character,
odr_visiblestring},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Challenge1_encrypted,
- z_Encryption1},
+ (Odr_fun)z_Encryption1},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_PromptInfo1 *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
int z_Challenge1(ODR o, Z_Challenge1 **p, int opt)
{
if (o->direction == ODR_ENCODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Challenge1 *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, z_ChallengeUnit1, &(*p)->list,
+ if (odr_sequence_of(o, (Odr_fun)z_ChallengeUnit1, &(*p)->list,
&(*p)->num_challenges))
return 1;
*p = 0;
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Response1_string, odr_visiblestring},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Response1_accept, odr_bool},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Response1_acknowledge, odr_null},
- {ODR_EXPLICIT, ODR_CONTEXT, 4, Z_Response1_diagnostic, z_DiagRec},
- {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_Response1_encrypted, z_Encryption1},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Response1_accept, (Odr_fun)odr_bool},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Response1_acknowledge, (Odr_fun)odr_null},
+ {ODR_EXPLICIT, ODR_CONTEXT, 4, Z_Response1_diagnostic, (Odr_fun)z_DiagRec},
+ {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_Response1_encrypted, (Odr_fun)z_Encryption1},
{-1, -1, -1, -1, 0}
};
int z_Response1(ODR o, Z_Response1 **p, int opt)
{
if (o->direction == ODR_ENCODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Response1 *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, z_ResponseUnit1, &(*p)->list,
+ if (odr_sequence_of(o, (Odr_fun)z_ResponseUnit1, &(*p)->list,
&(*p)->num_responses))
return 1;
*p = 0;
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PromptObject1_challenge, z_Challenge1},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_PromptObject1_response, z_Response1},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PromptObject1_challenge, (Odr_fun)z_Challenge1},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_PromptObject1_response, (Odr_fun)z_Response1},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_PromptObject1 *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: prt-add.c,v $
- * Revision 1.3 1998-01-05 09:04:57 adam
+ * Revision 1.4 1998-02-11 11:53:32 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.3 1998/01/05 09:04:57 adam
* Fixed bugs in encoders/decoders - Not operator (!) missing.
*
* Revision 1.2 1997/04/30 08:52:02 quinn
int z_ResultsByDB_elem (ODR o, Z_ResultsByDB_elem **p, int opt)
{
static Odr_arm arm[] = {
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ResultsByDB_all, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ResultsByDB_list, z_ResultsByDBList},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ResultsByDB_all, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ResultsByDB_list, (Odr_fun)z_ResultsByDBList},
{-1, -1, -1, -1, 0}
};
if (!odr_sequence_begin (o, p, sizeof(**p)))
{
if (!odr_initmember (o, p, sizeof(**p)))
return opt && odr_ok(o);
- if (odr_sequence_of (o, z_ResultsByDB_elem, &(*p)->elements,
+ if (odr_sequence_of (o, (Odr_fun)z_ResultsByDB_elem, &(*p)->elements,
&(*p)->num))
return 1;
*p = 0;
{
static Odr_arm arm[] = {
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_QueryExpression_term,
- z_QueryExpressionTerm},
- {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_QueryExpression_query, z_Query},
+ (Odr_fun)z_QueryExpressionTerm},
+ {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_QueryExpression_query, (Odr_fun)z_Query},
{-1, -1, -1, -1, 0}
};
if (!odr_initmember(o, p, sizeof(**p)))
{
if (!odr_initmember (o, p, sizeof(**p)))
return opt && odr_ok(o);
- if (odr_sequence_of (o, z_SearchInfoReport_elem, &(*p)->elements,
+ if (odr_sequence_of (o, (Odr_fun)z_SearchInfoReport_elem, &(*p)->elements,
&(*p)->num))
return 1;
*p = 0;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: prt-arc.c,v $
- * Revision 1.1 1996-06-10 08:55:20 quinn
+ * Revision 1.2 1998-02-11 11:53:32 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.1 1996/06/10 08:55:20 quinn
* Added Summary, OPAC
*
*
odr_implicit(o, z_InternationalString, &(*p)->bibliographicLevel,
ODR_CONTEXT, 5, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 6) &&
- (odr_sequence_of(o, z_FormatSpec, &(*p)->format, &(*p)->num_format) ||
+ (odr_sequence_of(o, (Odr_fun)z_FormatSpec, &(*p)->format, &(*p)->num_format) ||
odr_ok(o)) &&
odr_implicit(o, z_InternationalString, &(*p)->publicationPlace,
ODR_CONTEXT, 7, 1) &&
odr_implicit(o, z_InternationalString, &(*p)->enumAndChron,
ODR_CONTEXT, 17, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 18) &&
- (odr_sequence_of(o, z_Volume, &(*p)->volumes, &(*p)->num_volumes) ||
+ (odr_sequence_of(o, (Odr_fun)z_Volume, &(*p)->volumes, &(*p)->num_volumes) ||
odr_ok(o)) &&
odr_implicit_settag(o, ODR_CONTEXT, 19) &&
- (odr_sequence_of(o, z_CircRecord, &(*p)->circulationData,
+ (odr_sequence_of(o, (Odr_fun)z_CircRecord, &(*p)->circulationData,
&(*p)->num_circulationData) || odr_ok(o)) &&
odr_sequence_end(o);
}
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_HoldingsRecord_marcHoldingsRecord,
- z_External},
+ (Odr_fun)z_External},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_HoldingsRecord_holdingsAndCirc,
- z_HoldingsAndCircData},
+ (Odr_fun)z_HoldingsAndCircData},
{-1, -1, -1, -1, 0}
};
odr_implicit(o, z_External, &(*p)->bibliographicRecord,
ODR_CONTEXT, 1, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- (odr_sequence_of(o, z_HoldingsRecord, &(*p)->holdingsData,
+ (odr_sequence_of(o, (Odr_fun)z_HoldingsRecord, &(*p)->holdingsData,
&(*p)->num_holdingsData) || odr_ok(o)) &&
odr_sequence_end(o);
}
* Databasix Information Systems B.V., Utrecht, The Netherlands.
*
* $Log: prt-dat.c,v $
- * Revision 1.1 1998-02-10 15:31:46 adam
+ * Revision 1.2 1998-02-11 11:53:32 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.1 1998/02/10 15:31:46 adam
* Implemented date and time structure. Changed the Update Extended
* Service.
*
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Quarter_first, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Quarter_second, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Quarter_third, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_Quarter_fourth, odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Quarter_first, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Quarter_second, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Quarter_third, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_Quarter_fourth, (Odr_fun)odr_null},
{-1, -1, -1, -1, 0}
};
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Season_winter, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Season_spring, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Season_summer, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_Season_autumn, odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Season_winter, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Season_spring, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Season_summer, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_Season_autumn, (Odr_fun)odr_null},
{-1, -1, -1, -1, 0}
};
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PartOfYear_monthAndDay, z_MonthAndDay},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_PartOfYear_julianDay, odr_integer},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_PartOfYear_weekNumber, odr_integer},
- {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_PartOfYear_quarter, z_Quarter},
- {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_PartOfYear_season, z_Season},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_PartOfYear_monthAndDay,
+ (Odr_fun) z_MonthAndDay},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_PartOfYear_julianDay,
+ (Odr_fun) odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_PartOfYear_weekNumber,
+ (Odr_fun) odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_PartOfYear_quarter,
+ (Odr_fun) z_Quarter},
+ {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_PartOfYear_season,
+ (Odr_fun) z_Season},
{-1, -1, -1, -1, 0}
};
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Era_decade, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Era_century, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Era_millennium, odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Era_decade, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Era_century, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Era_millennium, (Odr_fun)odr_null},
{-1, -1, -1, -1, 0}
};
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Zone_local, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Zone_utc, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Zone_utcOffset, odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Zone_local, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Zone_utc, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Zone_utcOffset, (Odr_fun)odr_integer},
{-1, -1, -1, -1, 0}
};
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: prt-dia.c,v $
- * Revision 1.4 1996-01-22 09:46:34 quinn
+ * Revision 1.5 1998-02-11 11:53:32 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.4 1996/01/22 09:46:34 quinn
* Added Sort PDU. Moved StringList to main protocol file.
*
* Revision 1.3 1995/09/29 17:11:54 quinn
odr_implicit(o, z_Specification, &(*p)->spec, ODR_CONTEXT, 1, 0) &&
odr_implicit(o, z_DatabaseName, &(*p)->db, ODR_CONTEXT, 2, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 3) &&
- (odr_sequence_of(o, z_Specification, &(*p)->goodOnes,
+ (odr_sequence_of(o, (Odr_fun)z_Specification, &(*p)->goodOnes,
&(*p)->num_goodOnes) || odr_ok(o)) &&
odr_sequence_end(o);
}
odr_implicit(o, z_AttributeList, &(*p)->unsupportedCombination,
ODR_CONTEXT, 1, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- (odr_sequence_of(o, z_AttributeList, &(*p)->alternatives,
+ (odr_sequence_of(o, (Odr_fun)z_AttributeList, &(*p)->alternatives,
&(*p)->num_alternatives) || odr_ok(o)) &&
odr_sequence_end(o);
}
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Proximity_resultSets, odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Proximity_resultSets, (Odr_fun)odr_null},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Proximity_badSet,
- z_InternationalString},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Proximity_relation, odr_integer},
- {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_Proximity_unit, odr_integer},
- {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_Proximity_distance, odr_integer},
- {ODR_EXPLICIT, ODR_CONTEXT, 6, Z_Proximity_attributes, z_AttributeList},
- {ODR_IMPLICIT, ODR_CONTEXT, 7, Z_Proximity_ordered, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 8, Z_Proximity_exclusion, odr_null},
+ (Odr_fun)z_InternationalString},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Proximity_relation, (Odr_fun)odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_Proximity_unit, (Odr_fun)odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_Proximity_distance, (Odr_fun)odr_integer},
+ {ODR_EXPLICIT, ODR_CONTEXT, 6, Z_Proximity_attributes, (Odr_fun)z_AttributeList},
+ {ODR_IMPLICIT, ODR_CONTEXT, 7, Z_Proximity_ordered, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 8, Z_Proximity_exclusion, (Odr_fun)odr_null},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Proximity *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
int z_AttrListList(ODR o, Z_AttrListList **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_AttrListList *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, z_AttributeList, &(*p)->lists, &(*p)->num_lists))
+ if (odr_sequence_of(o, (Odr_fun)z_AttributeList, &(*p)->lists, &(*p)->num_lists))
return 1;
*p = 0;
return opt && odr_ok(o);
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_ScanD_nonZeroStepSize, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ScanD_specifiedStepSize, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_ScanD_termList1, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_ScanD_termList2, z_AttrListList},
- {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_ScanD_posInResponse, odr_integer},
- {ODR_IMPLICIT, ODR_CONTEXT, 6, Z_ScanD_resources, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 7, Z_ScanD_endOfList, odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_ScanD_nonZeroStepSize, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ScanD_specifiedStepSize, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_ScanD_termList1, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_ScanD_termList2, (Odr_fun)z_AttrListList},
+ {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_ScanD_posInResponse, (Odr_fun)odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 6, Z_ScanD_resources, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 7, Z_ScanD_endOfList, (Odr_fun)odr_null},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Scan *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_SortD_sequence, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortD_noRsName, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortD_tooMany, odr_integer},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_SortD_incompatible, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_SortD_generic, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_SortD_dbSpecific, odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_SortD_sequence, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortD_noRsName, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortD_tooMany, (Odr_fun)odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_SortD_incompatible, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_SortD_generic, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_SortD_dbSpecific, (Odr_fun)odr_null},
#if 0
- {ODR_EXPLICIT, ODR_CONTEXT, 6, Z_SortD_sortElement, z_SortElement},
+ {ODR_EXPLICIT, ODR_CONTEXT, 6, Z_SortD_sortElement, (Odr_fun)z_SortElement},
#endif
- {ODR_IMPLICIT, ODR_CONTEXT, 7, Z_SortD_key, odr_integer},
- {ODR_IMPLICIT, ODR_CONTEXT, 8, Z_SortD_action, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 9, Z_SortD_illegal, odr_integer},
- {ODR_IMPLICIT, ODR_CONTEXT, 10, Z_SortD_inputTooLarge, z_StringList},
- {ODR_IMPLICIT, ODR_CONTEXT, 11, Z_SortD_aggregateTooLarge, odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 7, Z_SortD_key, (Odr_fun)odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 8, Z_SortD_action, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 9, Z_SortD_illegal, (Odr_fun)odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 10, Z_SortD_inputTooLarge, (Odr_fun)z_StringList},
+ {ODR_IMPLICIT, ODR_CONTEXT, 11, Z_SortD_aggregateTooLarge, (Odr_fun)odr_null},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Sort *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_SegmentationD_segments, odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_SegmentationD_segments, (Odr_fun)odr_null},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Segmentation *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_ExtServicesD_req, odr_integer},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ExtServicesD_permission, odr_integer},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ExtServicesD_immediate, odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_ExtServicesD_req, (Odr_fun)odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ExtServicesD_permission, (Odr_fun)odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ExtServicesD_immediate, (Odr_fun)odr_integer},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_ExtServices *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
int z_OidList(ODR o, Z_OidList **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_OidList *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, odr_oid, &(*p)->oids, &(*p)->num_oids))
+ if (odr_sequence_of(o, (Odr_fun)odr_oid, &(*p)->oids, &(*p)->num_oids))
return 1;
*p = 0;
return opt && odr_ok(o);
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_AccessCtrlD_noUser, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_AccessCtrlD_refused, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_AccessCtrlD_simple, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_AccessCtrlD_oid, z_OidList},
- {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_AccessCtrlD_alternative, z_OidList},
- {ODR_IMPLICIT, ODR_CONTEXT, 6, Z_AccessCtrlD_pwdInv, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 7, Z_AccessCtrlD_pwdExp, odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_AccessCtrlD_noUser, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_AccessCtrlD_refused, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_AccessCtrlD_simple, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_AccessCtrlD_oid, (Odr_fun)z_OidList},
+ {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_AccessCtrlD_alternative, (Odr_fun)z_OidList},
+ {ODR_IMPLICIT, ODR_CONTEXT, 6, Z_AccessCtrlD_pwdInv, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 7, Z_AccessCtrlD_pwdExp, (Odr_fun)odr_null},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_AccessCtrl *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
return
odr_implicit(o, odr_oid, &(*p)->unsupportedSyntax, ODR_CONTEXT, 1, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- (odr_sequence_of(o, odr_oid, &(*p)->suggestedAlternatives,
+ (odr_sequence_of(o, (Odr_fun)odr_oid, &(*p)->suggestedAlternatives,
&(*p)->num_suggestedAlternatives) || odr_ok(o)) &&
odr_sequence_end(o);
}
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1000, Z_DiagFormat_tooMany, z_TooMany},
- {ODR_IMPLICIT, ODR_CONTEXT, 1001, Z_DiagFormat_badSpec, z_BadSpec},
- {ODR_IMPLICIT, ODR_CONTEXT, 1002, Z_DiagFormat_dbUnavail, z_DbUnavail},
- {ODR_IMPLICIT, ODR_CONTEXT, 1003, Z_DiagFormat_unSupOp, odr_integer},
- {ODR_IMPLICIT, ODR_CONTEXT, 1004, Z_DiagFormat_attribute, z_Attribute},
- {ODR_IMPLICIT, ODR_CONTEXT, 1005, Z_DiagFormat_attCombo, z_AttCombo},
- {ODR_IMPLICIT, ODR_CONTEXT, 1006, Z_DiagFormat_term, z_DiagTerm},
- {ODR_EXPLICIT, ODR_CONTEXT, 1007, Z_DiagFormat_proximity, z_Proximity},
- {ODR_EXPLICIT, ODR_CONTEXT, 1008, Z_DiagFormat_scan, z_Scan},
- {ODR_EXPLICIT, ODR_CONTEXT, 1009, Z_DiagFormat_sort, z_Sort},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1000, Z_DiagFormat_tooMany, (Odr_fun)z_TooMany},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1001, Z_DiagFormat_badSpec, (Odr_fun)z_BadSpec},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1002, Z_DiagFormat_dbUnavail, (Odr_fun)z_DbUnavail},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1003, Z_DiagFormat_unSupOp, (Odr_fun)odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1004, Z_DiagFormat_attribute, (Odr_fun)z_Attribute},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1005, Z_DiagFormat_attCombo, (Odr_fun)z_AttCombo},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1006, Z_DiagFormat_term, (Odr_fun)z_DiagTerm},
+ {ODR_EXPLICIT, ODR_CONTEXT, 1007, Z_DiagFormat_proximity, (Odr_fun)z_Proximity},
+ {ODR_EXPLICIT, ODR_CONTEXT, 1008, Z_DiagFormat_scan, (Odr_fun)z_Scan},
+ {ODR_EXPLICIT, ODR_CONTEXT, 1009, Z_DiagFormat_sort, (Odr_fun)z_Sort},
{ODR_EXPLICIT, ODR_CONTEXT, 1010, Z_DiagFormat_segmentation,
- z_Segmentation},
+ (Odr_fun)z_Segmentation},
{ODR_EXPLICIT, ODR_CONTEXT, 1011, Z_DiagFormat_extServices,
- z_ExtServices},
+ (Odr_fun)z_ExtServices},
{ODR_EXPLICIT, ODR_CONTEXT, 1012, Z_DiagFormat_accessCtrl,
- z_AccessCtrl},
+ (Odr_fun)z_AccessCtrl},
{ODR_IMPLICIT, ODR_CONTEXT, 1013, Z_DiagFormat_recordSyntax,
- z_RecordSyntax},
+ (Odr_fun)z_RecordSyntax},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_DiagFormat *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Diagnostic_defaultDiagRec,
- z_DefaultDiagFormat},
+ (Odr_fun)z_DefaultDiagFormat},
{ODR_EXPLICIT, ODR_CONTEXT, 2, Z_Diagnostic_explicitDiagnostic,
- z_DiagFormat},
+ (Odr_fun)z_DiagFormat},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Diagnostic *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
int z_DiagnosticFormat(ODR o, Z_DiagnosticFormat **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_DiagnosticFormat *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, z_DiagnosticUnit, &(*p)->diagnostics,
+ if (odr_sequence_of(o, (Odr_fun)z_DiagnosticUnit, &(*p)->diagnostics,
&(*p)->num_diagnostics))
return 1;
*p = 0;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: prt-esp.c,v $
- * Revision 1.2 1998-02-10 15:31:46 adam
+ * Revision 1.3 1998-02-11 11:53:32 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.2 1998/02/10 15:31:46 adam
* Implemented date and time structure. Changed the Update Extended
* Service.
*
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Occurrences_all, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Occurrences_last, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Occurrences_values, z_OccurValues},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Occurrences_all, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Occurrences_last, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Occurrences_values, (Odr_fun)z_OccurValues},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Occurrences *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ETagUnit_specificTag, z_SpecificTag},
- {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_ETagUnit_wildThing, z_Occurrences},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_ETagUnit_wildPath, odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ETagUnit_specificTag, (Odr_fun)z_SpecificTag},
+ {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_ETagUnit_wildThing, (Odr_fun)z_Occurrences},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_ETagUnit_wildPath, (Odr_fun)odr_null},
{-1, -1, -1 -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_ETagUnit *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
int z_ETagPath(ODR o, Z_ETagPath **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_ETagPath *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, z_ETagUnit, &(*p)->tags, &(*p)->num_tags))
+ if (odr_sequence_of(o, (Odr_fun)z_ETagUnit, &(*p)->tags, &(*p)->num_tags))
return 1;
*p = 0;
return opt && odr_ok(o);
int z_CompoPrimitives(ODR o, Z_CompoPrimitives **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_CompoPrimitives *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_sequence_of(o, z_InternationalString, &(*p)->primitives,
int z_CompoSpecs(ODR o, Z_CompoSpecs **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_CompoSpecs *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, z_SimpleElement, &(*p)->specs, &(*p)->num_specs))
+ if (odr_sequence_of(o, (Odr_fun)z_SimpleElement, &(*p)->specs, &(*p)->num_specs))
return 1;
*p = 0;
return opt && odr_ok(o);
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_CompoElement_primitives,
- z_CompoPrimitives},
+ (Odr_fun)z_CompoPrimitives},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_CompoElement_specs,
- z_CompoSpecs},
+ (Odr_fun)z_CompoSpecs},
{-1, -1, -1, -1, 0}
};
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ERequest_simpleElement,
- z_SimpleElement},
+ (Odr_fun)z_SimpleElement},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ERequest_compositeElement,
- z_CompositeElement},
+ (Odr_fun)z_CompositeElement},
{-1, -1, -1 -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_ElementRequest *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
odr_implicit(o, odr_integer, &(*p)->defaultTagType, ODR_CONTEXT,
4, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 5) &&
- (odr_sequence_of(o, z_ElementRequest, &(*p)->elements,
+ (odr_sequence_of(o, (Odr_fun)z_ElementRequest, &(*p)->elements,
&(*p)->num_elements) || odr_ok(o)) &&
odr_sequence_end(o);
}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: prt-exd.c,v $
- * Revision 1.7 1998-02-10 15:31:46 adam
+ * Revision 1.8 1998-02-11 11:53:32 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.7 1998/02/10 15:31:46 adam
* Implemented date and time structure. Changed the Update Extended
* Service.
*
8, 1) &&
odr_implicit(o, odr_integer, &(*p)->taskStatus, ODR_CONTEXT, 9, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 10) &&
- (odr_sequence_of(o, z_DiagRec, &(*p)->packageDiagnostics,
+ (odr_sequence_of(o, (Odr_fun)z_DiagRec, &(*p)->packageDiagnostics,
&(*p)->num_packageDiagnostics) || odr_ok(o)) &&
odr_implicit(o, z_External, &(*p)->taskSpecificParameters, ODR_CONTEXT,
11, 0) &&
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_IOBilling_billInvoice, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IOBilling_prepay, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_IOBilling_depositAccount, odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_IOBilling_billInvoice, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IOBilling_prepay, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_IOBilling_depositAccount, (Odr_fun)odr_null},
{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_IOBilling_creditCard,
- z_IOCreditCardInfo},
+ (Odr_fun)z_IOCreditCardInfo},
{ODR_IMPLICIT, ODR_CONTEXT, 4, Z_IOBilling_cardInfoPreviouslySupplied,
- odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_IOBilling_privateKnown, odr_null},
+ (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_IOBilling_privateKnown, (Odr_fun)odr_null},
{ODR_IMPLICIT, ODR_CONTEXT, 6, Z_IOBilling_privateNotKnown,
- z_External},
+ (Odr_fun)z_External},
{-1, -1, -1, -1, 0}
};
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ItemOrder_esRequest, z_IORequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ItemOrder_esRequest, (Odr_fun)z_IORequest},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ItemOrder_taskPackage,
- z_IOTaskPackage},
+ (Odr_fun)z_IOTaskPackage},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_ItemOrder *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_IUSuppliedRecordsId_versionNumber,
z_InternationalString},
{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_IUSuppliedRecordsId_previousVersion,
- odr_external},
+ (Odr_fun)odr_external},
{-1, -1, -1, -1, 0}
};
if (!odr_initmember(o, p, sizeof(**p)))
{
static Odr_arm arm[] = {
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IUSuppliedRecords_number,
- odr_integer},
+ (Odr_fun)odr_integer},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_IUSuppliedRecords_string,
- z_InternationalString},
+ (Odr_fun)z_InternationalString},
{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_IUSuppliedRecords_opaque,
- odr_octetstring},
+ (Odr_fun)odr_octetstring},
{-1, -1, -1, -1, 0}
};
if (!odr_sequence_begin (o, p, sizeof(**p)))
{
if (!odr_initmember (o, p, sizeof(**p)))
return opt && odr_ok(o);
- if (odr_sequence_of (o, z_IUSuppliedRecords_elem, &(*p)->elements,
+ if (odr_sequence_of (o, (Odr_fun)z_IUSuppliedRecords_elem, &(*p)->elements,
&(*p)->num))
return 1;
*p = 0;
{
static Odr_arm arm[] = {
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IUTaskPackageRecordStructure_record,
- odr_external},
+ (Odr_fun)odr_external},
{ODR_EXPLICIT, ODR_CONTEXT, 2, Z_IUTaskPackageRecordStructure_surrogateDiagnostics,
- z_DiagRecs},
+ (Odr_fun)z_DiagRecs},
{-1, -1, -1, -1, 0}
};
if (!odr_sequence_begin (o, p, sizeof(**p)))
odr_implicit (o, odr_integer,
&(*p)->updateStatus, ODR_CONTEXT, 1, 0) &&
odr_implicit_settag (o, ODR_CONTEXT, 2) &&
- (odr_sequence_of(o, z_DiagRec, &(*p)->globalDiagnostics,
+ (odr_sequence_of(o, (Odr_fun)z_DiagRec, &(*p)->globalDiagnostics,
&(*p)->num_globalDiagnostics) || odr_ok(o)) &&
odr_implicit_settag (o, ODR_CONTEXT, 3) &&
- odr_sequence_of(o, z_IUTaskPackageRecordStructure, &(*p)->taskPackageRecords,
+ odr_sequence_of(o, (Odr_fun)z_IUTaskPackageRecordStructure, &(*p)->taskPackageRecords,
&(*p)->num_taskPackageRecords) &&
odr_sequence_end (o);
}
{
static Odr_arm arm[] = {
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_IUUpdate_esRequest,
- z_IUUpdateEsRequest},
+ (Odr_fun)z_IUUpdateEsRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_IUUpdate_taskPackage,
- z_IUUpdateTaskPackage},
+ (Odr_fun)z_IUUpdateTaskPackage},
{-1, -1, -1, -1, 0}
};
if (!odr_initmember(o, p, sizeof(**p)))
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: prt-exp.c,v $
- * Revision 1.8 1996-01-02 11:46:41 quinn
+ * Revision 1.9 1998-02-11 11:53:32 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.8 1996/01/02 11:46:41 quinn
* Changed 'operator' to 'roperator' to avoid C++ conflict.
*
* Revision 1.7 1995/12/14 16:28:07 quinn
{
if (!odr_initmember(o, p, sizeof(**p)))
return opt && odr_ok(o);
- if (odr_sequence_of(o, z_HumanStringUnit, &(*p)->strings,
+ if (odr_sequence_of(o, (Odr_fun)z_HumanStringUnit, &(*p)->strings,
&(*p)->num_strings))
return 1;
*p = 0;
{
if (!odr_initmember(o, p, sizeof(**p)))
return opt && odr_ok(o);
- if (odr_sequence_of(o, z_IconObjectUnit, &(*p)->iconUnits,
+ if (odr_sequence_of(o, (Odr_fun)z_IconObjectUnit, &(*p)->iconUnits,
&(*p)->num_iconUnits))
return 1;
*p = 0;
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 0, Z_NetworkAddress_iA,
- z_NetworkAddressIA},
+ (Odr_fun)z_NetworkAddressIA},
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_NetworkAddress_oPA,
- z_NetworkAddressOPA},
+ (Odr_fun)z_NetworkAddressOPA},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_NetworkAddress_other,
- z_NetworkAddressOther},
+ (Odr_fun)z_NetworkAddressOther},
{-1, -1, -1, -1, 0}
};
return opt && odr_ok(o);
return
odr_implicit_settag(o, ODR_CONTEXT, 0) &&
- (odr_sequence_of(o, z_QueryTypeDetails, &(*p)->queryTypesSupported,
+ (odr_sequence_of(o, (Odr_fun)z_QueryTypeDetails, &(*p)->queryTypesSupported,
&(*p)->num_queryTypesSupported) || odr_ok(o)) &&
odr_implicit_settag(o, ODR_CONTEXT, 1) &&
- (odr_sequence_of(o, odr_oid, &(*p)->diagnosticsSets,
+ (odr_sequence_of(o, (Odr_fun)odr_oid, &(*p)->diagnosticsSets,
&(*p)->num_diagnosticsSets) || odr_ok(o)) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- (odr_sequence_of(o, odr_oid, &(*p)->attributeSetIds,
+ (odr_sequence_of(o, (Odr_fun)odr_oid, &(*p)->attributeSetIds,
&(*p)->num_attributeSetIds) || odr_ok(o)) &&
odr_implicit_settag(o, ODR_CONTEXT, 3) &&
- (odr_sequence_of(o, odr_oid, &(*p)->schemas, &(*p)->num_schemas) ||
+ (odr_sequence_of(o, (Odr_fun)odr_oid, &(*p)->schemas, &(*p)->num_schemas) ||
odr_ok(o)) &&
odr_implicit_settag(o, ODR_CONTEXT, 4) &&
- (odr_sequence_of(o, odr_oid, &(*p)->recordSyntaxes,
+ (odr_sequence_of(o, (Odr_fun)odr_oid, &(*p)->recordSyntaxes,
&(*p)->num_recordSyntaxes) || odr_ok(o)) &&
odr_implicit_settag(o, ODR_CONTEXT, 5) &&
- (odr_sequence_of(o, odr_oid, &(*p)->resourceChallenges,
+ (odr_sequence_of(o, (Odr_fun)odr_oid, &(*p)->resourceChallenges,
&(*p)->num_resourceChallenges) || odr_ok(o)) &&
odr_implicit(o, z_AccessRestrictions, &(*p)->restrictedAccess,
ODR_CONTEXT, 6, 1) &&
odr_implicit(o, z_Costs, &(*p)->costInfo, ODR_CONTEXT, 8, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 9) &&
- (odr_sequence_of(o, odr_oid, &(*p)->variantSets,
+ (odr_sequence_of(o, (Odr_fun)odr_oid, &(*p)->variantSets,
&(*p)->num_variantSets) || odr_ok(o)) &&
odr_implicit_settag(o, ODR_CONTEXT, 10) &&
- (odr_sequence_of(o, z_ElementSetName, &(*p)->elementSetNames,
+ (odr_sequence_of(o, (Odr_fun)z_ElementSetName, &(*p)->elementSetNames,
&(*p)->num_elementSetNames) || odr_ok(o)) &&
odr_implicit_settag(o, ODR_CONTEXT, 11) &&
- (odr_sequence_of(o, z_InternationalString, &(*p)->unitSystems,
+ (odr_sequence_of(o, (Odr_fun)z_InternationalString, &(*p)->unitSystems,
&(*p)->num_unitSystems) || odr_ok(o)) &&
odr_sequence_end(o);
}
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 0, Z_QueryTypeDetails_private,
- z_PrivateCapabilities},
+ (Odr_fun)z_PrivateCapabilities},
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_QueryTypeDetails_rpn,
- z_RpnCapabilities},
+ (Odr_fun)z_RpnCapabilities},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_QueryTypeDetails_iso8777,
- z_Iso8777Capabilities},
+ (Odr_fun)z_Iso8777Capabilities},
{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_QueryTypeDetails_z3958,
- z_HumanString},
+ (Odr_fun)z_HumanString},
{ODR_IMPLICIT, ODR_CONTEXT, 4, Z_QueryTypeDetails_erpn,
- z_RpnCapabilities},
+ (Odr_fun)z_RpnCapabilities},
{ODR_IMPLICIT, ODR_CONTEXT, 5, Z_QueryTypeDetails_rankedList,
- z_HumanString},
+ (Odr_fun)z_HumanString},
{-1, -1, -1, -1, 0}
};
return opt && odr_ok(o);
return
odr_implicit_settag(o, ODR_CONTEXT, 0) &&
- (odr_sequence_of(o, z_PrivateCapOperator, &(*p)->operators,
+ (odr_sequence_of(o, (Odr_fun)z_PrivateCapOperator, &(*p)->operators,
&(*p)->num_operators) || odr_ok(o)) &&
odr_implicit_settag(o, ODR_CONTEXT, 1) &&
- (odr_sequence_of(o, z_SearchKey, &(*p)->searchKeys,
+ (odr_sequence_of(o, (Odr_fun)z_SearchKey, &(*p)->searchKeys,
&(*p)->num_searchKeys) || odr_ok(o)) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- (odr_sequence_of(o, z_HumanString, &(*p)->description,
+ (odr_sequence_of(o, (Odr_fun)z_HumanString, &(*p)->description,
&(*p)->num_description) || odr_ok(o)) &&
odr_sequence_end(o);
}
return opt && odr_ok(o);
return
odr_implicit_settag(o, ODR_CONTEXT, 0) &&
- (odr_sequence_of(o, odr_integer, &(*p)->operators, &(*p)->num_operators) || odr_ok(o)) &&
+ (odr_sequence_of(o, (Odr_fun)odr_integer, &(*p)->operators, &(*p)->num_operators) || odr_ok(o)) &&
odr_implicit(o, odr_bool, &(*p)->resultSetAsOperandSupported,
ODR_CONTEXT, 1, 0) &&
odr_implicit(o, odr_bool, &(*p)->restrictionOperandSupported,
return opt && odr_ok(o);
return
odr_implicit_settag(o, ODR_CONTEXT, 0) &&
- odr_sequence_of(o, z_SearchKey, &(*p)->searchKeys,
+ odr_sequence_of(o, (Odr_fun)z_SearchKey, &(*p)->searchKeys,
&(*p)->num_searchKeys) &&
odr_implicit(o, z_HumanString, &(*p)->restrictions, ODR_CONTEXT,
1, 1) &&
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ProxSupportUnit_known,
- odr_integer},
+ (Odr_fun)odr_integer},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ProxSupportUnit_private,
- z_ProxSupportPrivate},
+ (Odr_fun)z_ProxSupportPrivate},
{-1, -1, -1, -1, 0}
};
return
odr_implicit(o, odr_bool, &(*p)->anySupport, ODR_CONTEXT, 0, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 1) &&
- (odr_sequence_of(o, z_ProxSupportUnit, &(*p)->unitsSupported,
+ (odr_sequence_of(o, (Odr_fun)z_ProxSupportUnit, &(*p)->unitsSupported,
&(*p)->num_unitsSupported) || odr_ok(o)) &&
odr_sequence_end(o);
}
odr_explicit(o, odr_integer, &(*p)->accessType, ODR_CONTEXT, 0, 0) &&
odr_implicit(o, z_HumanString, &(*p)->accessText, ODR_CONTEXT, 1, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- (odr_sequence_of(o, odr_oid, &(*p)->accessChallenges,
+ (odr_sequence_of(o, (Odr_fun)odr_oid, &(*p)->accessChallenges,
&(*p)->num_accessChallenges) || odr_ok(o)) &&
odr_sequence_end(o);
}
{
if (!odr_initmember(o, p, sizeof(**p)))
return opt && odr_ok(o);
- if (odr_sequence_of(o, z_AccessRestrictionsUnit, &(*p)->restrictions,
+ if (odr_sequence_of(o, (Odr_fun)z_AccessRestrictionsUnit, &(*p)->restrictions,
&(*p)->num_restrictions))
return 1;
*p = 0;
odr_implicit(o, z_Charge, &(*p)->searchCharge, ODR_CONTEXT, 3, 1) &&
odr_implicit(o, z_Charge, &(*p)->subscriptCharge, ODR_CONTEXT, 4, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 5) &&
- (odr_sequence_of(o, z_CostsOtherCharge, &(*p)->otherCharges,
+ (odr_sequence_of(o, (Odr_fun)z_CostsOtherCharge, &(*p)->otherCharges,
&(*p)->num_otherCharges) || odr_ok(o)) &&
odr_sequence_end(o);
}
odr_implicit(o, odr_oid, &(*p)->defaultAttributeSet,
ODR_CONTEXT, 0, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 1) &&
- odr_sequence_of(o, z_AttributeCombination, &(*p)->legalCombinations,
+ odr_sequence_of(o, (Odr_fun)z_AttributeCombination, &(*p)->legalCombinations,
&(*p)->num_legalCombinations) &&
odr_sequence_end(o);
}
{
if (!odr_initmember(o, p, sizeof(**p)))
return opt && odr_ok(o);
- if (odr_sequence_of(o, z_AttributeOccurrence, &(*p)->occurrences,
+ if (odr_sequence_of(o, (Odr_fun)z_AttributeOccurrence, &(*p)->occurrences,
&(*p)->num_occurrences))
return 1;
*p = 0;
{
if (!odr_initmember(o, p, sizeof(**p)))
return opt && odr_ok(o);
- if (odr_sequence_of(o, z_StringOrNumeric, &(*p)->attributes,
+ if (odr_sequence_of(o, (Odr_fun)z_StringOrNumeric, &(*p)->attributes,
&(*p)->num_attributes))
return 1;
*p = 0;
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_AttributeOcc_anyOrNone, odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_AttributeOcc_anyOrNone, (Odr_fun)odr_null},
{ODR_IMPLICIT, ODR_CONTEXT, 4, Z_AttributeOcc_specific,
- z_AttributeValueList},
+ (Odr_fun)z_AttributeValueList},
{-1, -1, -1, -1, 0}
};
odr_explicit(o, z_StringOrNumeric, &(*p)->value, ODR_CONTEXT, 0, 0) &&
odr_implicit(o, z_HumanString, &(*p)->description, ODR_CONTEXT, 1, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- (odr_sequence_of(o, z_StringOrNumeric, &(*p)->subAttributes,
+ (odr_sequence_of(o, (Odr_fun)z_StringOrNumeric, &(*p)->subAttributes,
&(*p)->num_subAttributes) || odr_ok(o)) &&
odr_implicit_settag(o, ODR_CONTEXT, 3) &&
- (odr_sequence_of(o, z_StringOrNumeric, &(*p)->superAttributes,
+ (odr_sequence_of(o, (Odr_fun)z_StringOrNumeric, &(*p)->superAttributes,
&(*p)->num_superAttributes) || odr_ok(o)) &&
odr_implicit(o, odr_null, &(*p)->partialSupport, ODR_CONTEXT, 4, 1) &&
odr_sequence_end(o);
15, 1) &&
odr_implicit(o, z_HumanString, &(*p)->hours, ODR_CONTEXT, 16, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 17) &&
- (odr_sequence_of(o, z_DatabaseList, &(*p)->dbCombinations,
+ (odr_sequence_of(o, (Odr_fun)z_DatabaseList, &(*p)->dbCombinations,
&(*p)->num_dbCombinations) || odr_ok(o)) &&
odr_implicit_settag(o, ODR_CONTEXT, 18) &&
- (odr_sequence_of(o, z_NetworkAddress, &(*p)->addresses,
+ (odr_sequence_of(o, (Odr_fun)z_NetworkAddress, &(*p)->addresses,
&(*p)->num_addresses) || odr_ok(o)) &&
odr_implicit(o, z_AccessInfo, &(*p)->commonAccessInfo, ODR_CONTEXT,
19, 1) &&
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 0, Z_Exp_RecordCount_actualNumber,
- odr_integer},
+ (Odr_fun)odr_integer},
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Exp_RecordCount_approxNumber,
- odr_integer},
+ (Odr_fun)odr_integer},
{-1, -1, -1, -1, 0}
};
odr_implicit(o, odr_bool, &(*p)->available, ODR_CONTEXT, 6, 0) &&
odr_implicit(o, z_HumanString, &(*p)->titleString, ODR_CONTEXT, 7, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 8) &&
- (odr_sequence_of(o, z_HumanString, &(*p)->keywords,
+ (odr_sequence_of(o, (Odr_fun)z_HumanString, &(*p)->keywords,
&(*p)->num_keywords) || odr_ok(o)) &&
odr_implicit(o, z_HumanString, &(*p)->description, ODR_CONTEXT, 9, 1) &&
odr_implicit(o, z_DatabaseList, &(*p)->associatedDbs, ODR_CONTEXT,
2, 0) &&
odr_implicit(o, z_HumanString, &(*p)->description, ODR_CONTEXT, 3, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 4) &&
- (odr_sequence_of(o, z_TagTypeMapping, &(*p)->tagTypeMapping,
+ (odr_sequence_of(o, (Odr_fun)z_TagTypeMapping, &(*p)->tagTypeMapping,
&(*p)->num_tagTypeMapping) || odr_ok(o)) &&
odr_implicit_settag(o, ODR_CONTEXT, 5) &&
- (odr_sequence_of(o, z_ElementInfo, &(*p)->recordStructure,
+ (odr_sequence_of(o, (Odr_fun)z_ElementInfo, &(*p)->recordStructure,
&(*p)->num_recordStructure) || odr_ok(o)) &&
odr_sequence_end(o);
}
if (!odr_initmember(o, p, sizeof(**p)))
return opt && odr_ok(o);
odr_implicit_settag(o, ODR_CONTEXT, 201);
- if (odr_sequence_of(o, z_OtherInformationUnit, &(*p)->list,
+ if (odr_sequence_of(o, (Odr_fun)z_OtherInformationUnit, &(*p)->list,
&(*p)->num))
return 1;
*p = 0;
if (!odr_initmember(o, p, sizeof(**p)))
return opt && odr_ok(o);
odr_implicit_settag(o, ODR_CONTEXT, 201);
- if (odr_sequence_of(o, z_OtherInformationUnit, &(*p)->list,
+ if (odr_sequence_of(o, (Odr_fun)z_OtherInformationUnit, &(*p)->list,
&(*p)->num))
return 1;
*p = 0;
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 0, Z_ElementDataType_primitive,
- odr_integer},
+ (Odr_fun)odr_integer},
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementDataType_structured,
- z_ElementInfoList},
+ (Odr_fun)z_ElementInfoList},
{-1, -1, -1, -1, 0}
};
odr_implicit(o, z_HumanString, &(*p)->description, ODR_CONTEXT,
3, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 4) &&
- (odr_sequence_of(o, z_TagSetInfoElements, &(*p)->elements,
+ (odr_sequence_of(o, (Odr_fun)z_TagSetInfoElements, &(*p)->elements,
&(*p)->num_elements) || odr_ok(o)) &&
odr_sequence_end(o);
}
odr_implicit(o, z_InternationalString, &(*p)->name, ODR_CONTEXT,
2, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 3) &&
- (odr_sequence_of(o, odr_oid, &(*p)->transferSyntaxes,
+ (odr_sequence_of(o, (Odr_fun)odr_oid, &(*p)->transferSyntaxes,
&(*p)->num_transferSyntaxes) || odr_ok(o)) &&
odr_implicit(o, z_HumanString, &(*p)->description, ODR_CONTEXT, 4, 1) &&
odr_implicit(o, z_InternationalString, &(*p)->asn1Module, ODR_CONTEXT,
5, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 6) &&
- (odr_sequence_of(o, z_ElementInfo, &(*p)->abstractStructure,
+ (odr_sequence_of(o, (Odr_fun)z_ElementInfo, &(*p)->abstractStructure,
&(*p)->num_abstractStructure) || odr_ok(o)) &&
odr_sequence_end(o);
}
odr_implicit(o, odr_oid, &(*p)->attributeSet, ODR_CONTEXT, 1, 0) &&
odr_implicit(o, z_InternationalString, &(*p)->name, ODR_CONTEXT, 2, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 3) &&
- (odr_sequence_of(o, z_AttributeType, &(*p)->attributes,
+ (odr_sequence_of(o, (Odr_fun)z_AttributeType, &(*p)->attributes,
&(*p)->num_attributes) || odr_ok(o)) &&
odr_implicit(o, z_HumanString, &(*p)->description, ODR_CONTEXT, 4, 1) &&
odr_sequence_end(o);
odr_implicit(o, z_HumanString, &(*p)->description, ODR_CONTEXT, 1, 1) &&
odr_implicit(o, odr_integer, &(*p)->attributeType, ODR_CONTEXT, 2, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 3) &&
- odr_sequence_of(o, z_AttributeDescription, &(*p)->attributeValues,
+ odr_sequence_of(o, (Odr_fun)z_AttributeDescription, &(*p)->attributeValues,
&(*p)->num_attributeValues) &&
odr_sequence_end(o);
}
odr_implicit(o, z_HumanString, &(*p)->description, ODR_CONTEXT, 1, 1) &&
odr_explicit(o, z_StringOrNumeric, &(*p)->attributeValue, ODR_CONTEXT, 2, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 3) &&
- (odr_sequence_of(o, z_StringOrNumeric, &(*p)->equivalentAttributes,
+ (odr_sequence_of(o, (Odr_fun)z_StringOrNumeric, &(*p)->equivalentAttributes,
&(*p)->num_equivalentAttributes) || odr_ok(o)) &&
odr_sequence_end(o);
}
odr_implicit(o, z_DatabaseName, &(*p)->databaseName, ODR_CONTEXT,
1, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- (odr_sequence_of(o, z_TermListElement, &(*p)->termLists,
+ (odr_sequence_of(o, (Odr_fun)z_TermListElement, &(*p)->termLists,
&(*p)->num_termLists) || odr_ok(o)) &&
odr_sequence_end(o);
}
odr_implicit(o, z_CommonInfo, &(*p)->commonInfo, ODR_CONTEXT, 0, 1) &&
odr_implicit(o, z_DatabaseName, &(*p)->databaseName, ODR_CONTEXT, 1, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- (odr_sequence_of(o, z_AttributeSetDetails, &(*p)->attributesBySet,
+ (odr_sequence_of(o, (Odr_fun)z_AttributeSetDetails, &(*p)->attributesBySet,
&(*p)->num_attributesBySet) && odr_ok(o)) &&
odr_implicit(o, z_AttributeCombinations, &(*p)->attributeCombinations, ODR_CONTEXT, 3, 1) &&
odr_sequence_end(o);
odr_implicit(o, odr_oid, &(*p)->attributeSet, ODR_CONTEXT,
0, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 1) &&
- odr_sequence_of(o, z_AttributeTypeDetails, &(*p)->attributesByType,
+ odr_sequence_of(o, (Odr_fun)z_AttributeTypeDetails, &(*p)->attributesByType,
&(*p)->num_attributesByType) &&
odr_sequence_end(o);
}
odr_implicit(o, odr_integer, &(*p)->attributeType, ODR_CONTEXT, 0, 0) &&
odr_implicit(o, z_OmittedAttributeInterpretation, &(*p)->optionalType, ODR_CONTEXT, 1, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- (odr_sequence_of(o, z_AttributeValue, &(*p)->attributeValues,
+ (odr_sequence_of(o, (Odr_fun)z_AttributeValue, &(*p)->attributeValues,
&(*p)->num_attributeValues) || odr_ok(o)) &&
odr_sequence_end(o);
}
odr_implicit(o, z_EScanInfo, &(*p)->scanInfo, ODR_CONTEXT, 4, 1) &&
odr_implicit(o, odr_integer, &(*p)->estNumberTerms, ODR_CONTEXT, 5, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 6) &&
- (odr_sequence_of(o, z_Term, &(*p)->sampleTerms,
+ (odr_sequence_of(o, (Odr_fun)z_Term, &(*p)->sampleTerms,
&(*p)->num_sampleTerms) || odr_ok(o)) &&
odr_sequence_end(o);
}
odr_implicit(o, odr_oid, &(*p)->schema, ODR_CONTEXT, 4, 0) &&
odr_implicit(o, z_HumanString, &(*p)->description, ODR_CONTEXT, 5, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 6) &&
- (odr_sequence_of(o, z_PerElementDetails, &(*p)->detailsPerElement, &(*p)->num_detailsPerElement) || odr_ok(o)) &&
+ (odr_sequence_of(o, (Odr_fun)z_PerElementDetails, &(*p)->detailsPerElement, &(*p)->num_detailsPerElement) || odr_ok(o)) &&
odr_sequence_end(o);
}
odr_implicit(o, odr_oid, &(*p)->recordSyntax, ODR_CONTEXT, 3, 0) &&
odr_implicit(o, z_HumanString, &(*p)->description, ODR_CONTEXT, 4, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 5) &&
- (odr_sequence_of(o, z_PerElementDetails, &(*p)->detailsPerElement,
+ (odr_sequence_of(o, (Odr_fun)z_PerElementDetails, &(*p)->detailsPerElement,
&(*p)->num_detailsPerElement) || odr_ok(o)) &&
odr_sequence_end(o);
}
odr_implicit(o, z_InternationalString, &(*p)->name, ODR_CONTEXT, 0, 1) &&
odr_implicit(o, z_RecordTag, &(*p)->recordTag, ODR_CONTEXT, 1, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- (odr_sequence_of(o, z_Path, &(*p)->schemaTags, &(*p)->num_schemaTags) ||
+ (odr_sequence_of(o, (Odr_fun)z_Path, &(*p)->schemaTags, &(*p)->num_schemaTags) ||
odr_ok(o)) &&
odr_implicit(o, odr_integer, &(*p)->maxSize, ODR_CONTEXT, 3, 1) &&
odr_implicit(o, odr_integer, &(*p)->minSize, ODR_CONTEXT, 4, 1) &&
odr_implicit(o, z_DatabaseName, &(*p)->databaseName, ODR_CONTEXT,
1, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- (odr_sequence_of(o, z_SortKeyDetails, &(*p)->sortKeys,
+ (odr_sequence_of(o, (Odr_fun)z_SortKeyDetails, &(*p)->sortKeys,
&(*p)->num_sortKeys) || odr_ok(o)) &&
odr_sequence_end(o);
}
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 0, Z_SortKeyDetailsSortType_character,
- odr_null},
+ (Odr_fun)odr_null},
{ODR_IMPLICIT, ODR_CONTEXT, 0, Z_SortKeyDetailsSortType_numeric,
- odr_null},
+ (Odr_fun)odr_null},
{ODR_IMPLICIT, ODR_CONTEXT, 0, Z_SortKeyDetailsSortType_structured,
- z_HumanString},
+ (Odr_fun)z_HumanString},
{-1, -1, -1, -1, 0}
};
return
odr_implicit(o, z_HumanString, &(*p)->description, ODR_CONTEXT, 0, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 1) &&
- (odr_sequence_of(o, z_Specification, &(*p)->elementSpecifications,
+ (odr_sequence_of(o, (Odr_fun)z_Specification, &(*p)->elementSpecifications,
&(*p)->num_elementSpecifications) || odr_ok(o)) &&
odr_implicit(o, z_AttributeCombinations, &(*p)->attributeSpecifications,
ODR_CONTEXT, 2, 1) &&
odr_implicit(o, z_InternationalString, &(*p)->name, ODR_CONTEXT,
2, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 3) &&
- (odr_sequence_of(o, z_VariantClass, &(*p)->variants,
+ (odr_sequence_of(o, (Odr_fun)z_VariantClass, &(*p)->variants,
&(*p)->num_variants) || odr_ok(o)) &&
odr_sequence_end(o);
}
odr_implicit(o, z_HumanString, &(*p)->description, ODR_CONTEXT, 1, 1) &&
odr_implicit(o, odr_integer, &(*p)->variantClass, ODR_CONTEXT, 2, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 3) &&
- odr_sequence_of(o, z_VariantType, &(*p)->variantTypes,
+ odr_sequence_of(o, (Odr_fun)z_VariantType, &(*p)->variantTypes,
&(*p)->num_variantTypes) &&
odr_sequence_end(o);
}
{
if (!odr_initmember(o, p, sizeof(**p)))
return opt && odr_ok(o);
- if (odr_sequence_of(o, z_ValueDescription, &(*p)->enumerated,
+ if (odr_sequence_of(o, (Odr_fun)z_ValueDescription, &(*p)->enumerated,
&(*p)->num_enumerated))
return 1;
*p = 0;
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_ValueSet_range, z_ValueRange},
+ {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_ValueSet_range, (Odr_fun)z_ValueRange},
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ValueSet_enumerated,
- z_ValueSetEnumerated},
+ (Odr_fun)z_ValueSetEnumerated},
{-1, -1, -1, -1, 0}
};
{
static Odr_arm arm[] =
{
- {ODR_NONE, -1, -1, Z_ValueDescription_integer, odr_integer},
- {ODR_NONE, -1, -1, Z_ValueDescription_string, z_InternationalString},
- {ODR_NONE, -1, -1, Z_ValueDescription_octets, odr_octetstring},
- {ODR_NONE, -1, -1, Z_ValueDescription_oid, odr_oid},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ValueDescription_unit, z_Unit},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ValueDescription_valueAndUnit, z_IntUnit},
+ {ODR_NONE, -1, -1, Z_ValueDescription_integer, (Odr_fun)odr_integer},
+ {ODR_NONE, -1, -1, Z_ValueDescription_string, (Odr_fun)z_InternationalString},
+ {ODR_NONE, -1, -1, Z_ValueDescription_octets, (Odr_fun)odr_octetstring},
+ {ODR_NONE, -1, -1, Z_ValueDescription_oid, (Odr_fun)odr_oid},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ValueDescription_unit, (Odr_fun)z_Unit},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ValueDescription_valueAndUnit, (Odr_fun)z_IntUnit},
{-1, -1, -1, -1, 0}
};
1, 0) &&
odr_implicit(o, z_HumanString, &(*p)->description, ODR_CONTEXT, 2, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 3) &&
- (odr_sequence_of(o, z_UnitType, &(*p)->units, &(*p)->num_units) ||
+ (odr_sequence_of(o, (Odr_fun)z_UnitType, &(*p)->units, &(*p)->num_units) ||
odr_ok(o)) &&
odr_sequence_end(o);
}
odr_explicit(o, z_StringOrNumeric, &(*p)->unitType, ODR_CONTEXT,
2, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 3) &&
- odr_sequence_of(o, z_Units, &(*p)->units, &(*p)->num_units) &&
+ odr_sequence_of(o, (Odr_fun)z_Units, &(*p)->units, &(*p)->num_units) &&
odr_sequence_end(o);
}
return
odr_implicit(o, z_CommonInfo, &(*p)->commonInfo, ODR_CONTEXT, 0, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 1) &&
- odr_sequence_of(o, z_CategoryInfo, &(*p)->categories,
+ odr_sequence_of(o, (Odr_fun)z_CategoryInfo, &(*p)->categories,
&(*p)->num_categories) &&
odr_sequence_end(o);
}
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_Explain_targetInfo, z_TargetInfo},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Explain_databaseInfo, z_DatabaseInfo},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Explain_schemaInfo, z_SchemaInfo},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Explain_tagSetInfo, z_TagSetInfo},
+ {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_Explain_targetInfo, (Odr_fun)z_TargetInfo},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Explain_databaseInfo, (Odr_fun)z_DatabaseInfo},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Explain_schemaInfo, (Odr_fun)z_SchemaInfo},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Explain_tagSetInfo, (Odr_fun)z_TagSetInfo},
{ODR_IMPLICIT, ODR_CONTEXT, 4, Z_Explain_recordSyntaxInfo,
- z_RecordSyntaxInfo},
+ (Odr_fun)z_RecordSyntaxInfo},
{ODR_IMPLICIT, ODR_CONTEXT, 5, Z_Explain_attributeSetInfo,
- z_AttributeSetInfo},
+ (Odr_fun)z_AttributeSetInfo},
{ODR_IMPLICIT, ODR_CONTEXT, 6, Z_Explain_termListInfo,
- z_TermListInfo},
+ (Odr_fun)z_TermListInfo},
{ODR_IMPLICIT, ODR_CONTEXT, 7, Z_Explain_extendedServicesInfo,
- z_ExtendedServicesInfo},
+ (Odr_fun)z_ExtendedServicesInfo},
{ODR_IMPLICIT, ODR_CONTEXT, 8, Z_Explain_attributeDetails,
- z_AttributeDetails},
+ (Odr_fun)z_AttributeDetails},
{ODR_IMPLICIT, ODR_CONTEXT, 9, Z_Explain_termListDetails,
- z_TermListDetails},
+ (Odr_fun)z_TermListDetails},
{ODR_IMPLICIT, ODR_CONTEXT, 10, Z_Explain_elementSetDetails,
- z_ElementSetDetails},
+ (Odr_fun)z_ElementSetDetails},
{ODR_IMPLICIT, ODR_CONTEXT, 11, Z_Explain_retrievalRecordDetails,
- z_RetrievalRecordDetails},
+ (Odr_fun)z_RetrievalRecordDetails},
{ODR_IMPLICIT, ODR_CONTEXT, 12, Z_Explain_sortDetails,
- z_SortDetails},
+ (Odr_fun)z_SortDetails},
{ODR_IMPLICIT, ODR_CONTEXT, 13, Z_Explain_processing,
- z_ProcessingInformation},
+ (Odr_fun)z_ProcessingInformation},
{ODR_IMPLICIT, ODR_CONTEXT, 14, Z_Explain_variants,
- z_VariantSetInfo},
- {ODR_IMPLICIT, ODR_CONTEXT, 15, Z_Explain_units, z_UnitInfo},
+ (Odr_fun)z_VariantSetInfo},
+ {ODR_IMPLICIT, ODR_CONTEXT, 15, Z_Explain_units, (Odr_fun)z_UnitInfo},
{ODR_IMPLICIT, ODR_CONTEXT, 100, Z_Explain_categoryList,
- z_CategoryList},
+ (Odr_fun)z_CategoryList},
{-1, -1, -1, -1, 0}
};
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: prt-ext.c,v $
- * Revision 1.15 1998-02-10 15:31:46 adam
+ * Revision 1.16 1998-02-11 11:53:32 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.15 1998/02/10 15:31:46 adam
* Implemented date and time structure. Changed the Update Extended
* Service.
*
*/
static Z_ext_typeent type_table[] =
{
- {VAL_SUTRS, Z_External_sutrs, z_SUTRS},
- {VAL_EXPLAIN, Z_External_explainRecord, z_ExplainRecord},
- {VAL_RESOURCE1, Z_External_resourceReport1, z_ResourceReport1},
- {VAL_RESOURCE2, Z_External_resourceReport2, z_ResourceReport2},
- {VAL_PROMPT1, Z_External_promptObject1, z_PromptObject1 },
- {VAL_GRS1, Z_External_grs1, z_GenericRecord},
- {VAL_EXTENDED, Z_External_extendedService, z_TaskPackage},
- {VAL_ITEMORDER, Z_External_itemOrder, z_ItemOrder},
- {VAL_DIAG1, Z_External_diag1, z_DiagnosticFormat},
- {VAL_ESPEC1, Z_External_espec1, z_Espec1},
- {VAL_SUMMARY, Z_External_summary, z_BriefBib},
- {VAL_OPAC, Z_External_OPAC, z_OPACRecord},
- {VAL_SEARCHRES1, Z_External_searchResult1, z_SearchInfoReport},
- {VAL_DBUPDATE, Z_External_update, z_IUUpdate},
- {VAL_DATETIME, Z_External_dateTime, z_DateTime},
+ {VAL_SUTRS, Z_External_sutrs, (Odr_fun) z_SUTRS},
+ {VAL_EXPLAIN, Z_External_explainRecord, (Odr_fun)z_ExplainRecord},
+ {VAL_RESOURCE1, Z_External_resourceReport1, (Odr_fun)z_ResourceReport1},
+ {VAL_RESOURCE2, Z_External_resourceReport2, (Odr_fun)z_ResourceReport2},
+ {VAL_PROMPT1, Z_External_promptObject1, (Odr_fun)z_PromptObject1 },
+ {VAL_GRS1, Z_External_grs1, (Odr_fun)z_GenericRecord},
+ {VAL_EXTENDED, Z_External_extendedService, (Odr_fun)z_TaskPackage},
+ {VAL_ITEMORDER, Z_External_itemOrder, (Odr_fun)z_ItemOrder},
+ {VAL_DIAG1, Z_External_diag1, (Odr_fun)z_DiagnosticFormat},
+ {VAL_ESPEC1, Z_External_espec1, (Odr_fun)z_Espec1},
+ {VAL_SUMMARY, Z_External_summary, (Odr_fun)z_BriefBib},
+ {VAL_OPAC, Z_External_OPAC, (Odr_fun)z_OPACRecord},
+ {VAL_SEARCHRES1, Z_External_searchResult1, (Odr_fun)z_SearchInfoReport},
+ {VAL_DBUPDATE, Z_External_update, (Odr_fun)z_IUUpdate},
+ {VAL_DATETIME, Z_External_dateTime, (Odr_fun)z_DateTime},
{VAL_NONE, 0, 0}
};
static Odr_arm arm[] =
{
- {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_single, odr_any},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_External_octet, odr_octetstring},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_External_arbitrary, odr_bitstring},
+ {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_single, (Odr_fun)odr_any},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_External_octet, (Odr_fun)odr_octetstring},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_External_arbitrary, (Odr_fun)odr_bitstring},
- {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_sutrs, z_SUTRS},
+ {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_sutrs, (Odr_fun)z_SUTRS},
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_explainRecord,
- z_ExplainRecord},
+ (Odr_fun)z_ExplainRecord},
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_resourceReport1,
- z_ResourceReport1},
+ (Odr_fun)z_ResourceReport1},
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_resourceReport2,
- z_ResourceReport2},
+ (Odr_fun)z_ResourceReport2},
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_promptObject1,
- z_PromptObject1},
- {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_grs1, z_GenericRecord},
+ (Odr_fun)z_PromptObject1},
+ {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_grs1, (Odr_fun)z_GenericRecord},
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_extendedService,
- z_TaskPackage},
- {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_itemOrder, z_ItemOrder},
- {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_diag1, z_DiagnosticFormat},
- {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_espec1, z_Espec1},
- {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_summary, z_BriefBib},
- {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_OPAC, z_OPACRecord},
+ (Odr_fun)z_TaskPackage},
+ {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_itemOrder, (Odr_fun)z_ItemOrder},
+ {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_diag1, (Odr_fun)z_DiagnosticFormat},
+ {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_espec1, (Odr_fun)z_Espec1},
+ {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_summary, (Odr_fun)z_BriefBib},
+ {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_OPAC, (Odr_fun)z_OPACRecord},
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_searchResult1,
- z_SearchInfoReport},
- {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_update, z_IUUpdate},
- {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_dateTime, z_DateTime},
+ (Odr_fun)z_SearchInfoReport},
+ {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_update, (Odr_fun)z_IUUpdate},
+ {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_dateTime, (Odr_fun)z_DateTime},
{-1, -1, -1, -1, 0}
};
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: prt-grs.c,v $
- * Revision 1.6 1997-05-14 06:53:23 adam
+ * Revision 1.7 1998-02-11 11:53:32 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.6 1997/05/14 06:53:23 adam
* C++ support.
*
* Revision 1.5 1995/10/18 16:12:20 quinn
int z_GenericRecord(ODR o, Z_GenericRecord **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_GenericRecord *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, z_TaggedElement, &(*p)->elements, &(*p)->num_elements))
+ if (odr_sequence_of(o, (Odr_fun)z_TaggedElement, &(*p)->elements, &(*p)->num_elements))
return 1;
*p = 0;
return opt && odr_ok(o);
{
static Odr_arm arm[] =
{
- {ODR_NONE, -1, -1, Z_ElementData_octets, odr_octetstring},
- {ODR_NONE, -1, -1, Z_ElementData_numeric, odr_integer},
- {ODR_NONE, -1, -1, Z_ElementData_date, odr_generalizedtime},
- {ODR_NONE, -1, -1, Z_ElementData_ext, z_External},
- {ODR_NONE, -1, -1, Z_ElementData_string, z_InternationalString},
+ {ODR_NONE, -1, -1, Z_ElementData_octets, (Odr_fun)odr_octetstring},
+ {ODR_NONE, -1, -1, Z_ElementData_numeric, (Odr_fun)odr_integer},
+ {ODR_NONE, -1, -1, Z_ElementData_date, (Odr_fun)odr_generalizedtime},
+ {ODR_NONE, -1, -1, Z_ElementData_ext, (Odr_fun)z_External},
+ {ODR_NONE, -1, -1, Z_ElementData_string, (Odr_fun)z_InternationalString},
/* The entry below provides some backwards compatibility */
- {ODR_NONE, -1, -1, Z_ElementData_string, odr_visiblestring},
- {ODR_NONE, -1, -1, Z_ElementData_trueOrFalse, odr_bool},
- {ODR_NONE, -1, -1, Z_ElementData_oid, odr_oid},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementData_intUnit, z_IntUnit},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ElementData_elementNotThere, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_ElementData_elementEmpty, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_ElementData_noDataRequested, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_ElementData_diagnostic, z_External},
- {ODR_EXPLICIT, ODR_CONTEXT, 6, Z_ElementData_subtree, z_GenericRecord},
+ {ODR_NONE, -1, -1, Z_ElementData_string, (Odr_fun)odr_visiblestring},
+ {ODR_NONE, -1, -1, Z_ElementData_trueOrFalse, (Odr_fun)odr_bool},
+ {ODR_NONE, -1, -1, Z_ElementData_oid, (Odr_fun)odr_oid},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementData_intUnit, (Odr_fun)z_IntUnit},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ElementData_elementNotThere, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_ElementData_elementEmpty, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_ElementData_noDataRequested, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_ElementData_diagnostic, (Odr_fun)z_External},
+ {ODR_EXPLICIT, ODR_CONTEXT, 6, Z_ElementData_subtree, (Odr_fun)z_GenericRecord},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_ElementData *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
odr_implicit(o, z_Order, &(*p)->seriesOrder, ODR_CONTEXT, 1, 1) &&
odr_implicit(o, z_Usage, &(*p)->usageRight, ODR_CONTEXT, 2, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 3) &&
- (odr_sequence_of(o, z_HitVector, &(*p)->hits, &(*p)->num_hits) ||
+ (odr_sequence_of(o, (Odr_fun)z_HitVector, &(*p)->hits, &(*p)->num_hits) ||
odr_ok(o)) &&
odr_implicit(o, z_InternationalString, &(*p)->displayName, ODR_CONTEXT,
4, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 5) &&
- (odr_sequence_of(o, z_Variant, &(*p)->supportedVariants,
+ (odr_sequence_of(o, (Odr_fun)z_Variant, &(*p)->supportedVariants,
&(*p)->num_supportedVariants) || odr_ok(o)) &&
odr_implicit(o, z_InternationalString, &(*p)->message, ODR_CONTEXT,
6, 1) &&
int z_TagPath(ODR o, Z_TagPath **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_TagPath *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, z_TagUnit, &(*p)->tags, &(*p)->num_tags))
+ if (odr_sequence_of(o, (Odr_fun)z_TagUnit, &(*p)->tags, &(*p)->num_tags))
return 1;
*p = 0;
return opt && odr_ok(o);
{
static Odr_arm arm[] =
{
- {ODR_NONE, -1, -1, Z_Triple_integer, odr_integer},
- {ODR_NONE, -1, -1, Z_Triple_internationalString, z_InternationalString},
+ {ODR_NONE, -1, -1, Z_Triple_integer, (Odr_fun)odr_integer},
+ {ODR_NONE, -1, -1, Z_Triple_internationalString, (Odr_fun)z_InternationalString},
/* The entry below provides some backwards compatibility */
- {ODR_NONE, -1, -1, Z_Triple_internationalString, odr_visiblestring},
- {ODR_NONE, -1, -1, Z_Triple_octetString, odr_octetstring},
- {ODR_NONE, -1, -1, Z_Triple_oid, odr_oid},
- {ODR_NONE, -1, -1, Z_Triple_boolean, odr_bool},
- {ODR_NONE, -1, -1, Z_Triple_null, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Triple_unit, z_Unit},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Triple_valueAndUnit, z_IntUnit},
+ {ODR_NONE, -1, -1, Z_Triple_internationalString, (Odr_fun)odr_visiblestring},
+ {ODR_NONE, -1, -1, Z_Triple_octetString, (Odr_fun)odr_octetstring},
+ {ODR_NONE, -1, -1, Z_Triple_oid, (Odr_fun)odr_oid},
+ {ODR_NONE, -1, -1, Z_Triple_boolean, (Odr_fun)odr_bool},
+ {ODR_NONE, -1, -1, Z_Triple_null, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Triple_unit, (Odr_fun)z_Unit},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Triple_valueAndUnit, (Odr_fun)z_IntUnit},
{-1, -1, -1, -1, 0}
};
odr_implicit(o, odr_oid, &(*p)->globalVariantSetId, ODR_CONTEXT,
1, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- odr_sequence_of(o, z_Triple, &(*p)->triples, &(*p)->num_triples) &&
+ odr_sequence_of(o, (Odr_fun)z_Triple, &(*p)->triples, &(*p)->num_triples) &&
odr_sequence_end(o);
}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: prt-rsc.c,v $
- * Revision 1.5 1995-09-29 17:11:55 quinn
+ * Revision 1.6 1998-02-11 11:53:32 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.5 1995/09/29 17:11:55 quinn
* Smallish
*
* Revision 1.4 1995/09/27 15:02:43 quinn
return opt && odr_ok(o);
return
odr_implicit_settag(o, ODR_CONTEXT, 1) &&
- odr_sequence_of(o, z_Estimate1, &(*p)->estimates,
+ odr_sequence_of(o, (Odr_fun)z_Estimate1, &(*p)->estimates,
&(*p)->num_estimates) &&
odr_implicit(o, odr_visiblestring, &(*p)->message, ODR_CONTEXT, 2, 0) &&
odr_sequence_end(o);
return opt && odr_ok(o);
return
odr_implicit_settag(o, ODR_CONTEXT, 1) &&
- (odr_sequence_of(o, z_Estimate2, &(*p)->estimates,
+ (odr_sequence_of(o, (Odr_fun)z_Estimate2, &(*p)->estimates,
&(*p)->num_estimates) || odr_ok(o)) &&
odr_implicit(o, odr_visiblestring, &(*p)->message, ODR_CONTEXT, 2, 1) &&
odr_sequence_end(o);
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zget.c,v $
- * Revision 1.13 1998-01-29 13:13:39 adam
+ * Revision 1.14 1998-02-11 11:53:32 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.13 1998/01/29 13:13:39 adam
* Function zget_presentRequest fills resultSetId with "default" instead
* of "Default".
*
Z_InitRequest *zget_InitRequest(ODR o)
{
- Z_InitRequest *r = odr_malloc(o, sizeof(*r));
+ Z_InitRequest *r = (Z_InitRequest *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->options = odr_malloc(o, sizeof(*r->options));
+ r->options = (Odr_bitmask *)odr_malloc(o, sizeof(*r->options));
ODR_MASK_ZERO(r->options);
- r->protocolVersion = odr_malloc(o, sizeof(*r->protocolVersion));
+ r->protocolVersion = (Odr_bitmask *)odr_malloc(o, sizeof(*r->protocolVersion));
ODR_MASK_ZERO(r->protocolVersion);
- r->preferredMessageSize = odr_malloc(o, sizeof(int));
+ r->preferredMessageSize = (int *)odr_malloc(o, sizeof(int));
*r->preferredMessageSize = 30*1024;
- r->maximumRecordSize = odr_malloc(o, sizeof(int));
+ r->maximumRecordSize = (int *)odr_malloc(o, sizeof(int));
*r->maximumRecordSize = 30*1024;
r->idAuthentication = 0;
r->implementationId = "YAZ (id=81)";
Z_InitResponse *zget_InitResponse(ODR o)
{
- Z_InitResponse *r = odr_malloc(o, sizeof(*r));
+ Z_InitResponse *r = (Z_InitResponse *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->options = odr_malloc(o, sizeof(*r->options));
+ r->options = (Odr_bitmask *)odr_malloc(o, sizeof(*r->options));
ODR_MASK_ZERO(r->options);
- r->protocolVersion = odr_malloc(o, sizeof(*r->protocolVersion));
+ r->protocolVersion = (Odr_bitmask *)odr_malloc(o, sizeof(*r->protocolVersion));
ODR_MASK_ZERO(r->protocolVersion);
- r->preferredMessageSize = odr_malloc(o, sizeof(int));
+ r->preferredMessageSize = (int *)odr_malloc(o, sizeof(int));
*r->preferredMessageSize = 30*1024;
- r->maximumRecordSize = odr_malloc(o, sizeof(int));
+ r->maximumRecordSize = (int *)odr_malloc(o, sizeof(int));
*r->maximumRecordSize = 30*1024;
- r->result = odr_malloc(o, sizeof(bool_t));
+ r->result = (int *)odr_malloc(o, sizeof(bool_t));
*r->result = 1;
r->implementationId = "YAZ (id=81)";
r->implementationName = "Index Data/YAZ";
Z_SearchRequest *zget_SearchRequest(ODR o)
{
- Z_SearchRequest *r = odr_malloc(o, sizeof(*r));
+ Z_SearchRequest *r = (Z_SearchRequest *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->smallSetUpperBound = odr_malloc(o, sizeof(int));
+ r->smallSetUpperBound = (int *)odr_malloc(o, sizeof(int));
*r->smallSetUpperBound = 0;
- r->largeSetLowerBound = odr_malloc(o, sizeof(int));
+ r->largeSetLowerBound = (int *)odr_malloc(o, sizeof(int));
*r->largeSetLowerBound = 1;
- r->mediumSetPresentNumber = odr_malloc(o, sizeof(int));
+ r->mediumSetPresentNumber = (int *)odr_malloc(o, sizeof(int));
*r->mediumSetPresentNumber = 0;
- r->replaceIndicator = odr_malloc(o, sizeof(bool_t));
+ r->replaceIndicator = (int *)odr_malloc(o, sizeof(bool_t));
*r->replaceIndicator = 1;
r->resultSetName = "default";
r->num_databaseNames = 0;
Z_SearchResponse *zget_SearchResponse(ODR o)
{
- Z_SearchResponse *r = odr_malloc(o, sizeof(*r));
+ Z_SearchResponse *r = (Z_SearchResponse *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->resultCount = odr_malloc(o, sizeof(int));
+ r->resultCount = (int *)odr_malloc(o, sizeof(int));
*r->resultCount = 0;
- r->numberOfRecordsReturned = odr_malloc(o, sizeof(int));
+ r->numberOfRecordsReturned = (int *)odr_malloc(o, sizeof(int));
*r->numberOfRecordsReturned = 0;
- r->nextResultSetPosition = odr_malloc(o, sizeof(int));
+ r->nextResultSetPosition = (int *)odr_malloc(o, sizeof(int));
*r->nextResultSetPosition = 0;
- r->searchStatus = odr_malloc(o, sizeof(bool_t));
+ r->searchStatus = (int *)odr_malloc(o, sizeof(bool_t));
*r->searchStatus = 1;
r->resultSetStatus = 0;
r->presentStatus = 0;
Z_PresentRequest *zget_PresentRequest(ODR o)
{
- Z_PresentRequest *r = odr_malloc(o, sizeof(*r));
+ Z_PresentRequest *r = (Z_PresentRequest *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->resultSetId = "default";
- r->resultSetStartPoint = odr_malloc(o, sizeof(int));
+ r->resultSetStartPoint = (int *)odr_malloc(o, sizeof(int));
*r->resultSetStartPoint = 1;
- r->numberOfRecordsRequested = odr_malloc(o, sizeof(int));
+ r->numberOfRecordsRequested = (int *)odr_malloc(o, sizeof(int));
*r->numberOfRecordsRequested = 10;
#ifdef Z_95
r->num_ranges = 0;
Z_PresentResponse *zget_PresentResponse(ODR o)
{
- Z_PresentResponse *r = odr_malloc(o, sizeof(*r));
+ Z_PresentResponse *r = (Z_PresentResponse *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->numberOfRecordsReturned = odr_malloc(o, sizeof(int));
+ r->numberOfRecordsReturned = (int *)odr_malloc(o, sizeof(int));
*r->numberOfRecordsReturned = 0;
- r->nextResultSetPosition = odr_malloc(o, sizeof(int));
+ r->nextResultSetPosition = (int *)odr_malloc(o, sizeof(int));
*r->nextResultSetPosition = 0;
- r->presentStatus = odr_malloc(o, sizeof(int));
+ r->presentStatus = (int *)odr_malloc(o, sizeof(int));
*r->presentStatus = Z_PRES_SUCCESS;
r->records = 0;
#ifdef Z_95
Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o)
{
- Z_DeleteResultSetRequest *r = odr_malloc(o, sizeof(*r));
+ Z_DeleteResultSetRequest *r = (Z_DeleteResultSetRequest *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->deleteFunction = odr_malloc(o, sizeof(int));
+ r->deleteFunction = (int *)odr_malloc(o, sizeof(int));
*r->deleteFunction = Z_DeleteRequest_list;
r->num_ids = 0;
r->resultSetList = 0;
Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o)
{
- Z_DeleteResultSetResponse *r = odr_malloc(o, sizeof(*r));
+ Z_DeleteResultSetResponse *r = (Z_DeleteResultSetResponse *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->deleteOperationStatus = odr_malloc(o, sizeof(int));
+ r->deleteOperationStatus = (int *)odr_malloc(o, sizeof(int));
*r->deleteOperationStatus = Z_DeleteStatus_success;
r->num_statuses = 0;
r->deleteListStatuses = 0;
Z_ScanRequest *zget_ScanRequest(ODR o)
{
- Z_ScanRequest *r = odr_malloc(o, sizeof(*r));
+ Z_ScanRequest *r = (Z_ScanRequest *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->num_databaseNames = 0;
r->attributeSet = 0;
r->termListAndStartPoint = 0;
r->stepSize = 0;
- r->numberOfTermsRequested = odr_malloc(o, sizeof(int));
+ r->numberOfTermsRequested = (int *)odr_malloc(o, sizeof(int));
*r->numberOfTermsRequested = 20;
r->preferredPositionInResponse = 0;
#ifdef Z_95
Z_ScanResponse *zget_ScanResponse(ODR o)
{
- Z_ScanResponse *r = odr_malloc(o, sizeof(*r));
+ Z_ScanResponse *r = (Z_ScanResponse *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->stepSize = 0;
- r->scanStatus = odr_malloc(o, sizeof(int));
+ r->scanStatus = (int *)odr_malloc(o, sizeof(int));
*r->scanStatus = Z_Scan_success;
- r->numberOfEntriesReturned = odr_malloc(o, sizeof(int));
+ r->numberOfEntriesReturned = (int *)odr_malloc(o, sizeof(int));
*r->numberOfEntriesReturned = 0;
r->positionOfTerm =0;
r->entries = 0;
Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o)
{
- Z_TriggerResourceControlRequest *r = odr_malloc(o, sizeof(*r));
+ Z_TriggerResourceControlRequest *r = (Z_TriggerResourceControlRequest *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->requestedAction = odr_malloc(o, sizeof(int));
+ r->requestedAction = (int *)odr_malloc(o, sizeof(int));
*r->requestedAction = Z_TriggerResourceCtrl_resourceReport;
r->prefResourceReportFormat = 0;
r->resultSetWanted = 0;
Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o)
{
- Z_ResourceControlRequest *r = odr_malloc(o, sizeof(*r));
+ Z_ResourceControlRequest *r = (Z_ResourceControlRequest *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->suspendedFlag = 0;
r->resourceReport = 0;
r->partialResultsAvailable = 0;
- r->responseRequired = odr_malloc(o, sizeof(bool_t));
+ r->responseRequired = (int *)odr_malloc(o, sizeof(bool_t));
*r->responseRequired = 0;
r->triggeredRequestFlag = 0;
#ifdef Z_95
Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o)
{
- Z_ResourceControlResponse *r = odr_malloc(o, sizeof(*r));
+ Z_ResourceControlResponse *r = (Z_ResourceControlResponse *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->continueFlag = odr_malloc(o, sizeof(bool_t));
+ r->continueFlag = (int *)odr_malloc(o, sizeof(bool_t));
*r->continueFlag = 1;
r->resultSetWanted = 0;
#ifdef Z_95
Z_AccessControlRequest *zget_AccessControlRequest(ODR o)
{
- Z_AccessControlRequest *r = odr_malloc(o, sizeof(*r));
+ Z_AccessControlRequest *r = (Z_AccessControlRequest *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->which = Z_AccessRequest_simpleForm;
Z_AccessControlResponse *zget_AccessControlResponse(ODR o)
{
- Z_AccessControlResponse *r = odr_malloc(o, sizeof(*r));
+ Z_AccessControlResponse *r = (Z_AccessControlResponse *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->which = Z_AccessResponse_simpleForm;
Z_Segment *zget_Segment(ODR o)
{
- Z_Segment *r = odr_malloc(o, sizeof(*r));
+ Z_Segment *r = (Z_Segment *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->numberOfRecordsReturned = odr_malloc(o, sizeof(int));
+ r->numberOfRecordsReturned = (int *)odr_malloc(o, sizeof(int));
*r->numberOfRecordsReturned = 0;
r->num_segmentRecords = 0;
r->segmentRecords = 0;
Z_Close *zget_Close(ODR o)
{
- Z_Close *r = odr_malloc(o, sizeof(*r));
+ Z_Close *r = (Z_Close *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->closeReason = odr_malloc(o, sizeof(int));
+ r->closeReason = (int *)odr_malloc(o, sizeof(int));
*r->closeReason = Z_Close_finished;
r->diagnosticInformation = 0;
r->resourceReportFormat = 0;
Z_ResourceReportRequest *zget_ResourceReportRequest(ODR o)
{
- Z_ResourceReportRequest *r = odr_malloc(o, sizeof(*r));
+ Z_ResourceReportRequest *r = (Z_ResourceReportRequest *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->opId = 0;
Z_ResourceReportResponse *zget_ResourceReportResponse(ODR o)
{
- Z_ResourceReportResponse *r = odr_malloc(o, sizeof(*r));
+ Z_ResourceReportResponse *r = (Z_ResourceReportResponse *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->resourceReportStatus = odr_malloc(o, sizeof(int));
+ r->resourceReportStatus = (int *)odr_malloc(o, sizeof(int));
*r->resourceReportStatus = Z_ResourceReportStatus_success;
r->resourceReport = 0;
r->otherInfo = 0;
Z_SortRequest *zget_SortRequest(ODR o)
{
- Z_SortRequest *r = odr_malloc(o, sizeof(*r));
+ Z_SortRequest *r = (Z_SortRequest *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
r->inputResultSetNames = 0;
Z_SortResponse *zget_SortResponse(ODR o)
{
- Z_SortResponse *r = odr_malloc(o, sizeof(*r));
+ Z_SortResponse *r = (Z_SortResponse *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->sortStatus = odr_malloc(o, sizeof(int));
+ r->sortStatus = (int *)odr_malloc(o, sizeof(int));
*r->sortStatus = Z_SortStatus_success;
- r->resultSetStatus = odr_malloc(o, sizeof(int));
+ r->resultSetStatus = (int *)odr_malloc(o, sizeof(int));
*r->resultSetStatus = Z_SortResultSetStatus_empty;
r->diagnostics = 0;
r->otherInfo = 0;
Z_ExtendedServicesRequest *zget_ExtendedServicesRequest(ODR o)
{
- Z_ExtendedServicesRequest *r = odr_malloc(o, sizeof(*r));
+ Z_ExtendedServicesRequest *r = (Z_ExtendedServicesRequest *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->function = odr_malloc(o, sizeof(int));
+ r->function = (int *)odr_malloc(o, sizeof(int));
*r->function = Z_ExtendedServicesRequest_create;
r->packageType = 0;
r->packageName = 0;
r->permissions = 0;
r->description = 0;
r->taskSpecificParameters = 0;
- r->waitAction = odr_malloc(o, sizeof(int));
+ r->waitAction = (int *)odr_malloc(o, sizeof(int));
*r->waitAction = Z_ExtendedServicesRequest_wait;
r->elements = 0;
r->otherInfo = 0;
Z_ExtendedServicesResponse *zget_ExtendedServicesResponse(ODR o)
{
- Z_ExtendedServicesResponse *r = odr_malloc(o, sizeof(*r));
+ Z_ExtendedServicesResponse *r = (Z_ExtendedServicesResponse *)odr_malloc(o, sizeof(*r));
r->referenceId = 0;
- r->operationStatus = odr_malloc(o, sizeof(int));
+ r->operationStatus = (int *)odr_malloc(o, sizeof(int));
*r->operationStatus = Z_ExtendedServicesResponse_done;
r->num_diagnostics = 0;
r->diagnostics = 0;
Z_APDU *zget_APDU(ODR o, int which)
{
- Z_APDU *r = odr_malloc(o, sizeof(*r));
+ Z_APDU *r = (Z_APDU *)odr_malloc(o, sizeof(*r));
switch (r->which = which)
{
* Europagate, 1995
*
* $Log: cclerrms.c,v $
- * Revision 1.6 1997-09-29 08:56:37 adam
+ * Revision 1.7 1998-02-11 11:53:33 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.6 1997/09/29 08:56:37 adam
* Changed CCL parser to be thread safe. New type, CCL_parser, declared
* and a create/destructers ccl_parser_create/ccl_parser/destory has
* been added.
*
*/
+/* Chas: Required for the correct definition of ccl_err_msg */
+#include "yaz-ccl.h"
+
static char *err_msg_array[] = {
"Ok",
"Search word expected",
* Europagate, 1995
*
* $Log: cclfind.c,v $
- * Revision 1.9 1997-09-29 08:56:37 adam
+ * Revision 1.10 1998-02-11 11:53:33 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.9 1997/09/29 08:56:37 adam
* Changed CCL parser to be thread safe. New type, CCL_parser, declared
* and a create/destructers ccl_parser_create/ccl_parser/destory has
* been added.
*/
static char *copy_token_name (struct ccl_token *tp)
{
- char *str = malloc (tp->len + 1);
+ char *str = (char *)malloc (tp->len + 1);
assert (str);
memcpy (str, tp->name, tp->len);
str[tp->len] = '\0';
static struct ccl_rpn_node *mk_node (int kind)
{
struct ccl_rpn_node *p;
- p = malloc (sizeof(*p));
+ p = (struct ccl_rpn_node *)malloc (sizeof(*p));
assert (p);
p->kind = kind;
return p;
{
struct ccl_rpn_attr *n;
- n = malloc (sizeof(*n));
+ n = (struct ccl_rpn_attr *)malloc (sizeof(*n));
assert (n);
n->type = type;
n->value = value;
{
/* no qualifier(s) applied. Use 'term' if it is defined */
- qa = malloc (2*sizeof(*qa));
+ qa = (struct ccl_rpn_attr **)malloc (2*sizeof(*qa));
assert (qa);
qa[0] = ccl_qual_search (cclp, "term", 4);
qa[1] = NULL;
}
/* make the RPN token */
- p->u.t.term = malloc (len);
+ p->u.t.term = (char *)malloc (len);
assert (p->u.t.term);
p->u.t.term[0] = '\0';
for (i = 0; i<no; i++)
if (qa)
for (i=0; qa[i]; i++)
no++;
- ap = malloc ((no+1) * sizeof(*ap));
+ ap = (struct ccl_rpn_attr **)malloc ((no+1) * sizeof(*ap));
assert (ap);
for (i = 0; cclp->look_token != la; i++)
{
* Europagate, 1995
*
* $Log: cclqual.c,v $
- * Revision 1.8 1997-09-29 08:56:38 adam
+ * Revision 1.9 1998-02-11 11:53:33 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.8 1997/09/29 08:56:38 adam
* Changed CCL parser to be thread safe. New type, CCL_parser, declared
* and a create/destructers ccl_parser_create/ccl_parser/destory has
* been added.
break;
if (!q)
{
- struct ccl_qualifier *new_qual = malloc (sizeof(*new_qual));
+ struct ccl_qualifier *new_qual = (struct ccl_qualifier *)malloc (sizeof(*new_qual));
assert (new_qual);
new_qual->next = b->list;
b->list = new_qual;
- new_qual->name = malloc (strlen(name)+1);
+ new_qual->name = (char *)malloc (strlen(name)+1);
assert (new_qual->name);
strcpy (new_qual->name, name);
attrp = &new_qual->attr_list;
{
struct ccl_rpn_attr *attr;
- attr = malloc (sizeof(*attr));
+ attr = (struct ccl_rpn_attr *)malloc (sizeof(*attr));
assert (attr);
attr->type = *pairs++;
attr->value = *pairs++;
*/
CCL_bibset ccl_qual_mk (void)
{
- CCL_bibset b = malloc (sizeof(*b));
+ CCL_bibset b = (CCL_bibset)malloc (sizeof(*b));
assert (b);
b->list = NULL;
return b;
* Europagate, 1995
*
* $Log: ccltoken.c,v $
- * Revision 1.8 1997-09-29 08:56:38 adam
+ * Revision 1.9 1998-02-11 11:53:33 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.8 1997/09/29 08:56:38 adam
* Changed CCL parser to be thread safe. New type, CCL_parser, declared
* and a create/destructers ccl_parser_create/ccl_parser/destory has
* been added.
}
if (!first)
{
- first = last = malloc (sizeof (*first));
+ first = last = (struct ccl_token *)malloc (sizeof (*first));
assert (first);
last->prev = NULL;
}
else
{
- last->next = malloc (sizeof(*first));
+ last->next = (struct ccl_token *)malloc (sizeof(*first));
assert (last->next);
last->next->prev = last;
last = last->next;
}
if (!first)
{
- first = last = malloc (sizeof (*first));
+ first = last = (struct ccl_token *)malloc (sizeof (*first));
assert (first);
last->prev = NULL;
}
else
{
- last->next = malloc (sizeof(*first));
+ last->next = (struct ccl_token *)malloc (sizeof(*first));
assert (last->next);
last->next->prev = last;
last = last->next;
CCL_parser ccl_parser_create (void)
{
- CCL_parser p = malloc (sizeof(*p));
+ CCL_parser p = (CCL_parser)malloc (sizeof(*p));
if (!p)
return p;
p->look_token = NULL;
# Copyright (C) 1995-1998, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.14 1998-01-07 12:59:27 adam Exp $
+# $Id: Makefile,v 1.15 1998-02-11 11:53:33 adam Exp $
LIBDIR=../lib
INCLUDE=-I../include -I. -I../../xtimosi/src
LIBINCLUDE=-L$(LIBDIR)
DEFS=$(INCLUDE) $(CDEFS) -DCCL2RPN=1
-LIBS=$(LIBDIR)/libasn.a $(LIBDIR)/libodr.a \
- $(LIBDIR)/libcomstack.a ../lib/ccl.a $(LIBMOSI) $(LIBDIR)/libutil.a
+LIBS=$(LIBDIR)/libasn.a $(LIBDIR)/libutil.a \
+ $(LIBDIR)/libcomstack.a ../lib/ccl.a $(LIBMOSI) $(LIBDIR)/libodr.a
CPP=$(CC) -E
PROG=client
PROGO=client.o
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: client.c,v $
- * Revision 1.61 1998-02-10 11:03:06 adam
+ * Revision 1.62 1998-02-11 11:53:33 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.61 1998/02/10 11:03:06 adam
* Implemented command refid. Client prints reference-ID's, when present,
* in responses.
*
*/
odr_setbuf(in, (char*)p->u.octet_aligned->buf,
p->u.octet_aligned->len, 0);
- if (!(*type->fun)(in, &rr, 0))
+ if (!(*type->fun)(in, (char **)&rr, 0))
{
odr_perror(in, "Decoding constructed record.");
fprintf(stderr, "[Near %d]\n", odr_offset(in));
* Note: we throw away the original, BER-encoded record here.
* Do something else with it if you want to keep it.
*/
- r->u.sutrs = rr; /* we don't actually check the type here. */
+ r->u.sutrs = (Odr_oct *)rr; /* we don't actually check the type here. */
r->which = type->what;
}
}
cp = arg + strlen(arg);
if (cp - arg < 1)
break;
- databaseNames[num_databaseNames] = xmalloc (1 + cp - arg);
+ databaseNames[num_databaseNames] = (char *)xmalloc (1 + cp - arg);
memcpy (databaseNames[num_databaseNames], arg, cp - arg);
databaseNames[num_databaseNames++][cp - arg] = '\0';
if (!*cp)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_sortRequest);
Z_SortRequest *req = apdu->u.sortRequest;
- Z_SortKeySpecList *sksl = odr_malloc (out, sizeof(*sksl));
+ Z_SortKeySpecList *sksl = (Z_SortKeySpecList *)odr_malloc (out, sizeof(*sksl));
char setstring[32];
char sort_string[32], sort_flags[32];
int off;
req->referenceId = set_refid (out);
req->inputResultSetNames =
- odr_malloc (out, sizeof(*req->inputResultSetNames));
+ (Z_StringList *)odr_malloc (out, sizeof(*req->inputResultSetNames));
req->inputResultSetNames->num_strings = 1;
req->inputResultSetNames->strings =
- odr_malloc (out, sizeof(*req->inputResultSetNames->strings));
+ (char **)odr_malloc (out, sizeof(*req->inputResultSetNames->strings));
req->inputResultSetNames->strings[0] =
- odr_malloc (out, strlen(setstring)+1);
+ (char *)odr_malloc (out, strlen(setstring)+1);
strcpy (req->inputResultSetNames->strings[0], setstring);
if (newset && setnumber >= 0)
sprintf (setstring, "%d", ++setnumber);
- req->sortedResultSetName = odr_malloc (out, strlen(setstring)+1);
+ req->sortedResultSetName = (char *)odr_malloc (out, strlen(setstring)+1);
strcpy (req->sortedResultSetName, setstring);
req->sortSequence = sksl;
sksl->num_specs = 0;
- sksl->specs = odr_malloc (out, sizeof(sksl->specs) * 20);
+ sksl->specs = (Z_SortKeySpec **)odr_malloc (out, sizeof(sksl->specs) * 20);
bib1.proto = protocol;
bib1.oclass = CLASS_ATTSET;
{
int i;
char *sort_string_sep;
- Z_SortKeySpec *sks = odr_malloc (out, sizeof(*sks));
- Z_SortKey *sk = odr_malloc (out, sizeof(*sk));
+ Z_SortKeySpec *sks = (Z_SortKeySpec *)odr_malloc (out, sizeof(*sks));
+ Z_SortKey *sk = (Z_SortKey *)odr_malloc (out, sizeof(*sk));
arg += off;
sksl->specs[sksl->num_specs++] = sks;
- sks->sortElement = odr_malloc (out, sizeof(*sks->sortElement));
+ sks->sortElement = (Z_SortElement *)odr_malloc (out, sizeof(*sks->sortElement));
sks->sortElement->which = Z_SortElement_generic;
sks->sortElement->u.generic = sk;
if ((sort_string_sep = strchr (sort_string, '=')))
{
- Z_AttributeElement *el = odr_malloc (out, sizeof(*el));
+ Z_AttributeElement *el = (Z_AttributeElement *)odr_malloc (out, sizeof(*el));
sk->which = Z_SortKey_sortAttributes;
sk->u.sortAttributes =
- odr_malloc (out, sizeof(*sk->u.sortAttributes));
+ (Z_SortAttributes *)odr_malloc (out, sizeof(*sk->u.sortAttributes));
sk->u.sortAttributes->id = oid_ent_to_oid(&bib1, oid);
sk->u.sortAttributes->list =
- odr_malloc (out, sizeof(*sk->u.sortAttributes->list));
+ (Z_AttributeList *)odr_malloc (out, sizeof(*sk->u.sortAttributes->list));
sk->u.sortAttributes->list->num_attributes = 1;
sk->u.sortAttributes->list->attributes =
- odr_malloc (out,
+ (Z_AttributeElement **)odr_malloc (out,
sizeof(*sk->u.sortAttributes->list->attributes));
sk->u.sortAttributes->list->attributes[0] = el;
el->attributeSet = 0;
- el->attributeType = odr_malloc (out, sizeof(*el->attributeType));
+ el->attributeType = (int *)odr_malloc (out, sizeof(*el->attributeType));
*el->attributeType = atoi (sort_string);
el->which = Z_AttributeValue_numeric;
- el->value.numeric = odr_malloc (out, sizeof(*el->value.numeric));
+ el->value.numeric = (int *)odr_malloc (out, sizeof(*el->value.numeric));
*el->value.numeric = atoi (sort_string_sep + 1);
}
else
{
sk->which = Z_SortKey_sortField;
- sk->u.sortField = odr_malloc (out, strlen(sort_string)+1);
+ sk->u.sortField = (char *)odr_malloc (out, strlen(sort_string)+1);
strcpy (sk->u.sortField, sort_string);
}
- sks->sortRelation = odr_malloc (out, sizeof(*sks->sortRelation));
+ sks->sortRelation = (int *)odr_malloc (out, sizeof(*sks->sortRelation));
*sks->sortRelation = Z_SortRelation_ascending;
- sks->caseSensitivity = odr_malloc (out, sizeof(*sks->caseSensitivity));
+ sks->caseSensitivity = (int *)odr_malloc (out, sizeof(*sks->caseSensitivity));
*sks->caseSensitivity = Z_SortCase_caseSensitive;
sks->missingValueAction = NULL;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: tcpip.c,v $
- * Revision 1.18 1997-09-29 07:15:25 adam
+ * Revision 1.19 1998-02-11 11:53:33 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.18 1997/09/29 07:15:25 adam
* Changed use of setsockopt to avoid warnings on MSVC.
*
* Revision 1.17 1997/09/17 12:10:30 adam
#include <comstack.h>
#include <tcpip.h>
+/* Chas added the following 2, so we get the definition of completeBER */
+#include <odr.h>
+#include <prt.h>
+
int tcpip_close(COMSTACK h);
int tcpip_put(COMSTACK h, char *buf, int size);
int tcpip_get(COMSTACK h, char **buf, int *bufsize);
/*
* Determine length/completeness of incoming packages
*/
-int completeBER(unsigned char *buf, int len); /* from the ODR module */
+/* Chas: Removed the definition of completeBERfrom here, use the one in the */
+/* include directory as that as the extern "C" around it */
+/*int completeBER(unsigned char *buf, int len); */ /* from the ODR module */
int completeWAIS(unsigned char *buf, int len); /* from waislen.c */
#ifdef TRACE_TCPIP
}
else
new_socket = 0;
- if (!(p = xmalloc(sizeof(struct comstack))))
+ if (!(p = (struct comstack *)xmalloc(sizeof(struct comstack))))
return 0;
- if (!(state = p->cprivate = xmalloc(sizeof(tcpip_state))))
+ if (!(state = (struct tcpip_state *)(p->cprivate =
+ xmalloc(sizeof(tcpip_state)))))
return 0;
#ifdef WINDOWS
void *tcpip_straddr(COMSTACK h, const char *str)
{
- tcpip_state *sp = h->cprivate;
+ tcpip_state *sp = (tcpip_state *)h->cprivate;
if (!tcpip_strtoaddr_ex (str, &sp->addr))
return 0;
int tcpip_more(COMSTACK h)
{
- tcpip_state *sp = h->cprivate;
+ tcpip_state *sp = (tcpip_state *)h->cprivate;
return sp->altlen && (*sp->complete)((unsigned char *) sp->altbuf,
sp->altlen);
*/
int tcpip_connect(COMSTACK h, void *address)
{
- struct sockaddr_in *add = address;
+ struct sockaddr_in *add = (struct sockaddr_in *)address;
TRC(fprintf(stderr, "tcpip_connect\n"));
if (connect(h->iofile, (struct sockaddr *) add, sizeof(*add)) < 0)
int tcpip_bind(COMSTACK h, void *address, int mode)
{
- struct sockaddr *addr = address;
+ struct sockaddr *addr = (struct sockaddr *)address;
#ifdef WINDOWS
BOOL one = 1;
#else
#endif
TRC(fprintf(stderr, "tcpip_bind\n"));
- if (setsockopt(h->iofile, SOL_SOCKET, SO_REUSEADDR, (void*)
+ if (setsockopt(h->iofile, SOL_SOCKET, SO_REUSEADDR, (char*)
&one, sizeof(one)) < 0)
{
h->cerrno = CSYSERR;
COMSTACK tcpip_accept(COMSTACK h)
{
COMSTACK cnew;
- tcpip_state *state, *st = h->cprivate;
+ tcpip_state *state, *st = (tcpip_state *)h->cprivate;
#ifdef WINDOWS
unsigned long tru = 1;
#endif
h->cerrno = CSOUTSTATE;
return 0;
}
- if (!(cnew = xmalloc(sizeof(*cnew))))
+ if (!(cnew = (COMSTACK)xmalloc(sizeof(*cnew))))
{
h->cerrno = CSYSERR;
return 0;
}
memcpy(cnew, h, sizeof(*h));
cnew->iofile = h->newfd;
- if (!(state = cnew->cprivate = xmalloc(sizeof(tcpip_state))))
+ if (!(state = (tcpip_state *)(cnew->cprivate = xmalloc(sizeof(tcpip_state)))))
{
h->cerrno = CSYSERR;
return 0;
*/
int tcpip_get(COMSTACK h, char **buf, int *bufsize)
{
- tcpip_state *sp = h->cprivate;
+ tcpip_state *sp = (tcpip_state *)h->cprivate;
char *tmpc;
int tmpi, berlen, rest, req, tomove;
int hasread = 0, res;
{
if (!*bufsize)
{
- if (!(*buf = xmalloc(*bufsize = CS_TCPIP_BUFCHUNK)))
+ if (!(*buf = (char *)xmalloc(*bufsize = CS_TCPIP_BUFCHUNK)))
return -1;
}
else if (*bufsize - hasread < CS_TCPIP_BUFCHUNK)
- if (!(*buf =xrealloc(*buf, *bufsize *= 2)))
+ if (!(*buf =(char *)xrealloc(*buf, *bufsize *= 2)))
return -1;
if ((res = recv(h->iofile, *buf + hasread, CS_TCPIP_BUFCHUNK, 0)) < 0)
#ifdef WINDOWS
req += CS_TCPIP_BUFCHUNK - rest;
if (!sp->altbuf)
{
- if (!(sp->altbuf = xmalloc(sp->altsize = req)))
+ if (!(sp->altbuf = (char *)xmalloc(sp->altsize = req)))
return -1;
} else if (sp->altsize < req)
- if (!(sp->altbuf =xrealloc(sp->altbuf, sp->altsize = req)))
+ if (!(sp->altbuf =(char *)xrealloc(sp->altbuf, sp->altsize = req)))
return -1;
TRC(fprintf(stderr, " Moving %d bytes to altbuf(0x%x)\n", tomove,
(unsigned) sp->altbuf));
int tcpip_put(COMSTACK h, char *buf, int size)
{
int res;
- struct tcpip_state *state = h->cprivate;
+ struct tcpip_state *state = (struct tcpip_state *)h->cprivate;
TRC(fprintf(stderr, "tcpip_put: size=%d\n", size));
if (state->towrite < 0)
int tcpip_close(COMSTACK h)
{
- tcpip_state *sp = h->cprivate;
+ tcpip_state *sp = (struct tcpip_state *)h->cprivate;
TRC(fprintf(stderr, "tcpip_close\n"));
if (h->iofile != -1)
char *tcpip_addrstr(COMSTACK h)
{
struct sockaddr_in addr;
- tcpip_state *sp = h->cprivate;
+ tcpip_state *sp = (struct tcpip_state *)h->cprivate;
char *r, *buf = sp->buf;
int len;
struct hostent *host;
* CCL - header file
*
* $Log: ccl.h,v $
- * Revision 1.8 1997-09-29 09:01:19 adam
+ * Revision 1.9 1998-02-11 11:53:33 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.8 1997/09/29 09:01:19 adam
* Changed CCL parser to be thread safe. New type, CCL-parser, declared
* and a create/destructor ccl_parser_create/ccl_parser_destroy has been
* added.
int *error, const char **pos);
/* Return english-readable error message */
-char *ccl_err_msg (int ccl_errno);
+const char *ccl_err_msg (int ccl_errno);
/* Delete RPN tree returned by ccl_find */
void ccl_rpn_delete (struct ccl_rpn_node *rpn);
/*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
*
* Permission to use, copy, modify, distribute, and sell this software and
* its documentation, in whole or in part, for any purpose, is hereby granted,
* OF THIS SOFTWARE.
*
* $Log: odr.h,v $
- * Revision 1.24 1997-11-24 11:33:56 adam
+ * Revision 1.25 1998-02-11 11:53:33 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.24 1997/11/24 11:33:56 adam
* Using function odr_nullval() instead of global ODR_NULLVAL when
* appropriate.
*
Odr_ber_tag odr_ber_tag;
} *ODR;
-typedef int (*Odr_fun)();
+typedef int (*Odr_fun)(ODR, char **, int);
typedef struct odr_arm
{
/*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
*
* Permission to use, copy, modify, distribute, and sell this software and
* its documentation, in whole or in part, for any purpose, is hereby granted,
/*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
*
* Permission to use, copy, modify, distribute, and sell this software and
* its documentation, in whole or in part, for any purpose, is hereby granted,
/*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
*
* Permission to use, copy, modify, distribute, and sell this software and
* its documentation, in whole or in part, for any purpose, is hereby granted,
/*
- * Copyright (c) 1995-1997, Index Data
+ * Copyright (c) 1995-1998, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: prt.h,v $
- * Revision 1.21 1997-10-31 12:20:08 adam
+ * Revision 1.22 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.21 1997/10/31 12:20:08 adam
* Improved memory debugging for xmalloc/nmem.c. References to NMEM
* instead of ODR in n ESPEC-1 handling in source d1_espec.c.
* Bug fix: missing fclose in data1_read_espec1.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_any.c,v $
- * Revision 1.13 1997-05-14 06:53:56 adam
+ * Revision 1.14 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.13 1997/05/14 06:53:56 adam
* C++ support.
*
* Revision 1.12 1995/09/29 17:12:15 quinn
o->error = OPROTO;
return 0;
}
- (*p)->buf = odr_malloc(o, res);
+ (*p)->buf = (unsigned char *)odr_malloc(o, res);
memcpy((*p)->buf, o->bp, res);
(*p)->len = (*p)->size = res;
o->bp += res;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_oct.c,v $
- * Revision 1.10 1995-09-29 17:12:18 quinn
+ * Revision 1.11 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.10 1995/09/29 17:12:18 quinn
* Smallish
*
* Revision 1.9 1995/09/27 15:02:55 quinn
}
if (len + 1 > p->size - p->len)
{
- c = odr_malloc(o, p->size += len + 1);
+ c = (unsigned char *)odr_malloc(o, p->size += len + 1);
if (p->len)
memcpy(c, p->buf, p->len);
p->buf = c;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_tag.c,v $
- * Revision 1.17 1997-09-30 09:33:10 adam
+ * Revision 1.18 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.17 1997/09/30 09:33:10 adam
* Minor changes - removed indentation of ifdef.
*
* Revision 1.16 1997/09/17 12:10:33 adam
{
Odr_ber_tag *odr_ber_tag = &o->odr_ber_tag;
int rd;
- char **pp = p;
+ char **pp = (char **)p;
if (o->direction == ODR_DECODE)
*pp = 0;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr.c,v $
- * Revision 1.26 1997-11-24 11:33:56 adam
+ * Revision 1.27 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.26 1997/11/24 11:33:56 adam
* Using function odr_nullval() instead of global ODR_NULLVAL when
* appropriate.
*
ODR odr_createmem(int direction)
{
- struct odr *r;
+ ODR r;
logf (LOG_DEBUG, "odr_createmem dir=%d", direction);
- if (!(r = xmalloc(sizeof(*r))))
+ if (!(r = (ODR)xmalloc(sizeof(*r))))
return 0;
r->direction = direction;
r->print = stderr;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_any.c,v $
- * Revision 1.6 1995-09-29 17:12:22 quinn
+ * Revision 1.7 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.6 1995/09/29 17:12:22 quinn
* Smallish
*
* Revision 1.5 1995/09/27 15:02:58 quinn
return 1;
}
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Odr_oct *)odr_malloc(o, sizeof(**p));
if (ber_any(o, p))
return 1;
*p = 0;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_bit.c,v $
- * Revision 1.10 1995-09-29 17:12:22 quinn
+ * Revision 1.11 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.10 1995/09/29 17:12:22 quinn
* Smallish
*
* Revision 1.9 1995/09/27 15:02:58 quinn
}
if (o->direction == ODR_DECODE)
{
- *p = odr_malloc(o, sizeof(Odr_bitmask));
+ *p = (Odr_bitmask *)odr_malloc(o, sizeof(Odr_bitmask));
memset((*p)->bits, 0, ODR_BITMASK_SIZE);
(*p)->top = -1;
}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_bool.c,v $
- * Revision 1.8 1995-09-29 17:12:23 quinn
+ * Revision 1.9 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.8 1995/09/29 17:12:23 quinn
* Smallish
*
* Revision 1.7 1995/09/27 15:02:58 quinn
if (cons)
return 0;
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(int));
+ *p = (int *)odr_malloc(o, sizeof(int));
return ber_boolean(o, *p);
}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_choice.c,v $
- * Revision 1.14 1997-05-14 06:53:57 adam
+ * Revision 1.15 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.14 1997/05/14 06:53:57 adam
* C++ support.
*
* Revision 1.13 1997/04/30 08:52:10 quinn
int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
{
- int i, cl = -1, tg, cn, *which = whichp, bias = o->choice_bias;
+ int i, cl = -1, tg, cn, *which = (int *)whichp, bias = o->choice_bias;
if (o->error)
return 0;
if (arm[i].tagmode == ODR_IMPLICIT)
{
odr_implicit_settag(o, cl, tg);
- return (*arm[i].fun)(o, p, 0);
+ return (*arm[i].fun)(o, (char **)p, 0);
}
/* explicit */
if (!odr_constructed_begin(o, p, cl, tg))
return 0;
- return (*arm[i].fun)(o, p, 0) &&
+ return (*arm[i].fun)(o, (char **)p, 0) &&
odr_constructed_end(o);
}
}
else /* no tagging. Have to poll type */
{
- if ((*arm[i].fun)(o, p, 1) && *(char**)p)
+ if ((*arm[i].fun)(o, (char **)p, 1) && *(char**)p)
return 1;
}
}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_int.c,v $
- * Revision 1.10 1995-09-29 17:12:24 quinn
+ * Revision 1.11 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.10 1995/09/29 17:12:24 quinn
* Smallish
*
* Revision 1.9 1995/09/29 17:01:50 quinn
return 0;
}
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(int));
+ *p = (int *)odr_malloc(o, sizeof(int));
return ber_integer(o, *p);
}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_mem.c,v $
- * Revision 1.12 1995-11-08 17:41:33 quinn
+ * Revision 1.13 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.12 1995/11/08 17:41:33 quinn
* Smallish.
*
* Revision 1.11 1995/11/01 13:54:43 quinn
togrow = b->size;
if (togrow < min_bytes)
togrow = min_bytes;
- if (b->size && !(b->buf =xrealloc(b->buf, b->size += togrow)))
+ if (b->size && !(b->buf =(unsigned char *)xrealloc(b->buf, b->size += togrow)))
abort();
- else if (!b->size && !(b->buf = xmalloc(b->size = togrow)))
+ else if (!b->size && !(b->buf = (unsigned char *)xmalloc(b->size = togrow)))
abort();
#ifdef ODR_DEBUG
fprintf(stderr, "New size for encode_buffer: %d\n", b->size);
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_oct.c,v $
- * Revision 1.11 1995-09-29 17:12:25 quinn
+ * Revision 1.12 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.11 1995/09/29 17:12:25 quinn
* Smallish
*
* Revision 1.10 1995/09/27 15:02:59 quinn
}
if (o->direction == ODR_DECODE)
{
- *p = odr_malloc(o, sizeof(Odr_oct));
+ *p = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));
(*p)->size= 0;
(*p)->len = 0;
(*p)->buf = 0;
fprintf(o->print, "%s'%s'\n", odr_indent(o), *p);
return 1;
}
- t = odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
+ t = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
if (o->direction == ODR_ENCODE)
{
t->buf = (unsigned char *) *p;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_oid.c,v $
- * Revision 1.12 1995-09-29 17:12:25 quinn
+ * Revision 1.13 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.12 1995/09/29 17:12:25 quinn
* Smallish
*
* Revision 1.11 1995/09/27 15:03:00 quinn
return 1;
}
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, OID_SIZE * sizeof(**p));
+ *p = (int *)odr_malloc(o, OID_SIZE * sizeof(**p));
return ber_oidc(o, *p);
}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_seq.c,v $
- * Revision 1.21 1997-11-24 11:33:56 adam
+ * Revision 1.22 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.21 1997/11/24 11:33:56 adam
* Using function odr_nullval() instead of global ODR_NULLVAL when
* appropriate.
*
if (odr_constructed_begin(o, p, o->t_class, o->t_tag))
{
if (o->direction == ODR_DECODE && size)
- *pp = odr_malloc(o, size);
+ *pp = (char *)odr_malloc(o, size);
return 1;
}
else
{
case ODR_DECODE:
*num = 0;
- *pp = odr_nullval();
+ *pp = (char **)odr_nullval();
while (odr_sequence_more(o))
{
/* outgrown array? */
if (*num * (int) sizeof(void*) >= size)
{
/* double the buffer size */
- tmp = odr_malloc(o, sizeof(void*) * (size += size ? size :
+ tmp = (char **)odr_malloc(o, sizeof(void*) * (size += size ? size :
128));
if (*num)
{
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_tag.c,v $
- * Revision 1.8 1997-05-14 06:53:59 adam
+ * Revision 1.9 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.8 1997/05/14 06:53:59 adam
* C++ support.
*
* Revision 1.7 1996/02/20 12:52:54 quinn
if (o->error)
return 0;
if (o->direction == ODR_DECODE)
- *pp = odr_malloc(o, size);
+ *pp = (char *)odr_malloc(o, size);
else if (!*pp)
{
o->t_class = -1;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_use.c,v $
- * Revision 1.7 1995-09-29 17:12:27 quinn
+ * Revision 1.8 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.7 1995/09/29 17:12:27 quinn
* Smallish
*
* Revision 1.6 1995/09/27 15:03:00 quinn
Odr_external *pp;
static Odr_arm arm[] =
{
- {ODR_EXPLICIT, ODR_CONTEXT, 0, ODR_EXTERNAL_single, odr_any},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, ODR_EXTERNAL_octet, odr_octetstring},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, ODR_EXTERNAL_arbitrary, odr_bitstring},
+ {ODR_EXPLICIT, ODR_CONTEXT, 0, ODR_EXTERNAL_single, (Odr_fun)odr_any},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, ODR_EXTERNAL_octet, (Odr_fun)odr_octetstring},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, ODR_EXTERNAL_arbitrary, (Odr_fun)odr_bitstring},
{-1, -1, -1, -1, 0}
};
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_util.c,v $
- * Revision 1.12 1997-10-31 12:20:08 adam
+ * Revision 1.13 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.12 1997/10/31 12:20:08 adam
* Improved memory debugging for xmalloc/nmem.c. References to NMEM
* instead of ODR in n ESPEC-1 handling in source d1_espec.c.
* Bug fix: missing fclose in data1_read_espec1.
if (!o)
return 0;
- if (!(r = nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(int))))
+ if (!(r = (int *)nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(int))))
return 0;
oid_oidcpy(r, o);
return r;
return 0;
while ((p = strchr(p, '.')))
num++, p++;
- ret = nmem_malloc(nmem, sizeof(*ret)*(num + 1));
+ ret = (int *)nmem_malloc(nmem, sizeof(*ret)*(num + 1));
p = str;
do
ret[i++] = atoi(p);
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_absyn.c,v $
- * Revision 1.16 1997-12-18 10:51:30 adam
+ * Revision 1.17 1998-02-11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.16 1997/12/18 10:51:30 adam
* Implemented sub-trees feature for schemas - including forward
* references.
*
char fname[512];
NMEM mem = data1_nmem_get (dh);
- data1_absyn_cache p = nmem_malloc (mem, sizeof(*p));
+ data1_absyn_cache p = (data1_absyn_cache)nmem_malloc (mem, sizeof(*p));
data1_absyn_cache *pp = data1_absyn_cache_get (dh);
sprintf(fname, "%s.abs", name);
return 0;
}
- res = nmem_malloc(data1_nmem_get(dh), sizeof(*res));
+ res = (data1_absyn *)nmem_malloc(data1_nmem_get(dh), sizeof(*res));
res->name = 0;
res->reference = VAL_NONE;
res->tagset = 0;
if (!cur_elements)
{
- cur_elements = nmem_malloc(data1_nmem_get(dh),
+ cur_elements = (data1_sub_elements *)nmem_malloc(data1_nmem_get(dh),
sizeof(*cur_elements));
cur_elements->next = res->sub_elements;
cur_elements->elements = NULL;
}
level = i;
new_element = *ppl[level] =
- nmem_malloc(data1_nmem_get(dh), sizeof(*new_element));
+ (data1_element *)nmem_malloc(data1_nmem_get(dh), sizeof(*new_element));
new_element->next = new_element->children = 0;
new_element->tag = 0;
new_element->termlists = 0;
else if (*p)
{
data1_tag *nt =
- new_element->tag = nmem_malloc(data1_nmem_get (dh),
+ new_element->tag = (data1_tag *)nmem_malloc(data1_nmem_get (dh),
sizeof(*new_element->tag));
nt->which = DATA1T_string;
nt->value.string = nmem_strdup(data1_nmem_get (dh), p);
- nt->names = nmem_malloc(data1_nmem_get(dh),
+ nt->names = (data1_name *)nmem_malloc(data1_nmem_get(dh),
sizeof(*new_element->tag->names));
nt->names->name = nt->value.string;
nt->names->next = 0;
}
if (*attname == '!')
strcpy(attname, name);
- *tp = nmem_malloc(data1_nmem_get(dh), sizeof(**tp));
+ *tp = (data1_termlist *)nmem_malloc(data1_nmem_get(dh), sizeof(**tp));
(*tp)->next = 0;
if (!((*tp)->att = data1_getattbyname(dh, res->attset,
attname)))
(*tp)->structure = "w";
else
{
- (*tp)->structure = nmem_malloc (data1_nmem_get (dh),
+ (*tp)->structure = (char *)nmem_malloc (data1_nmem_get (dh),
strlen(structure)+1);
strcpy ((*tp)->structure, structure);
}
file, args);
continue;
}
- cur_elements = nmem_malloc(data1_nmem_get(dh),
+ cur_elements = (data1_sub_elements *)nmem_malloc(data1_nmem_get(dh),
sizeof(*cur_elements));
cur_elements->next = res->sub_elements;
cur_elements->elements = NULL;
fclose(f);
return 0;
}
- *tp = nmem_malloc(data1_nmem_get(dh), sizeof(**tp));
+ *tp = (data1_termlist *)nmem_malloc(data1_nmem_get(dh), sizeof(**tp));
if (!((*tp)->att = data1_getattbyname (dh, res->attset,
attname)))
{
(*tp)->structure = "w";
else
{
- (*tp)->structure = nmem_malloc (data1_nmem_get (dh),
+ (*tp)->structure = (char *)nmem_malloc (data1_nmem_get (dh),
strlen(structure)+1);
strcpy ((*tp)->structure, structure);
}
fclose(f);
return 0;
}
- *esetpp = nmem_malloc(data1_nmem_get(dh), sizeof(**esetpp));
+ *esetpp = (data1_esetname *)nmem_malloc(data1_nmem_get(dh), sizeof(**esetpp));
(*esetpp)->name = nmem_strdup(data1_nmem_get(dh), name);
(*esetpp)->next = 0;
if (*fname == '@')
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_attset.c,v $
- * Revision 1.7 1997-09-17 12:10:34 adam
+ * Revision 1.8 1998-02-11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.7 1997/09/17 12:10:34 adam
* YAZ version 1.4.
*
* Revision 1.6 1997/09/05 09:50:56 adam
return 0;
}
- res = nmem_malloc(mem, sizeof(*res));
+ res = (data1_attset *)nmem_malloc(mem, sizeof(*res));
res->name = 0;
res->reference = VAL_NONE;
res->ordinal = -1;
}
if (rr < 3) /* no local attributes given */
{
- locals = nmem_malloc(mem, sizeof(*locals));
+ locals = (data1_local_attribute *)nmem_malloc(mem, sizeof(*locals));
locals->local = num;
locals->next = 0;
}
data1_local_attribute **ap = &locals;
do
{
- *ap = nmem_malloc(mem, sizeof(**ap));
+ *ap = (data1_local_attribute *)nmem_malloc(mem, sizeof(**ap));
(*ap)->local = atoi(p);
(*ap)->next = 0;
ap = &(*ap)->next;
}
while ((p = strchr(p, ',')) && *(++p));
}
- t = *attp = nmem_malloc(mem, sizeof(*t));
+ t = *attp = (data1_att *)nmem_malloc(mem, sizeof(*t));
t->parent = res;
t->name = nmem_strdup(mem, name);
t->value = num;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_espec.c,v $
- * Revision 1.13 1997-11-24 11:33:56 adam
+ * Revision 1.14 1998-02-11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.13 1997/11/24 11:33:56 adam
* Using function odr_nullval() instead of global ODR_NULLVAL when
* appropriate.
*
static Z_Variant *read_variant(int argc, char **argv, NMEM nmem)
{
- Z_Variant *r = nmem_malloc(nmem, sizeof(*r));
+ Z_Variant *r = (Z_Variant *)nmem_malloc(nmem, sizeof(*r));
oident var1;
int i;
int oid[OID_SIZE];
r->globalVariantSetId = odr_oiddup_nmem(nmem, oid_ent_to_oid(&var1, oid));
if (argc)
- r->triples = nmem_malloc(nmem, sizeof(Z_Triple*) * argc);
+ r->triples = (Z_Triple **)nmem_malloc(nmem, sizeof(Z_Triple*) * argc);
else
r->triples = 0;
r->num_triples = argc;
argv[i]);
return 0;
}
- t = r->triples[i] = nmem_malloc(nmem, sizeof(Z_Triple));
+ t = r->triples[i] = (Z_Triple *)nmem_malloc(nmem, sizeof(Z_Triple));
t->variantSetId = 0;
- t->zclass = nmem_malloc(nmem, sizeof(int));
+ t->zclass = (int *)nmem_malloc(nmem, sizeof(int));
*t->zclass = zclass;
- t->type = nmem_malloc(nmem, sizeof(int));
+ t->type = (int *)nmem_malloc(nmem, sizeof(int));
*t->type = type;
/*
* This is wrong.. we gotta look up the correct type for the
else if (isdigit(*value))
{
t->which = Z_Triple_integer;
- t->value.integer = nmem_malloc(nmem, sizeof(*t->value.integer));
+ t->value.integer = (int *)nmem_malloc(nmem, sizeof(*t->value.integer));
*t->value.integer = atoi(value);
}
else
{
t->which = Z_Triple_internationalString;
- t->value.internationalString = nmem_malloc(nmem, strlen(value)+1);
+ t->value.internationalString = (char *)nmem_malloc(nmem, strlen(value)+1);
strcpy(t->value.internationalString, value);
}
}
static Z_Occurrences *read_occurrences(char *occ, NMEM nmem)
{
- Z_Occurrences *op = nmem_malloc(nmem, sizeof(*op));
+ Z_Occurrences *op = (Z_Occurrences *)nmem_malloc(nmem, sizeof(*op));
char *p;
if (!occ)
{
op->which = Z_Occurrences_values;
- op->u.values = nmem_malloc(nmem, sizeof(Z_OccurValues));
- op->u.values->start = nmem_malloc(nmem, sizeof(int));
+ op->u.values = (Z_OccurValues *)nmem_malloc(nmem, sizeof(Z_OccurValues));
+ op->u.values->start = (int *)nmem_malloc(nmem, sizeof(int));
*op->u.values->start = 1;
op->u.values->howMany = 0;
}
}
else
{
- Z_OccurValues *ov = nmem_malloc(nmem, sizeof(*ov));
+ Z_OccurValues *ov = (Z_OccurValues *)nmem_malloc(nmem, sizeof(*ov));
if (!isdigit(*occ))
{
}
op->which = Z_Occurrences_values;
op->u.values = ov;
- ov->start = nmem_malloc(nmem, sizeof(*ov->start));
+ ov->start = (int *)nmem_malloc(nmem, sizeof(*ov->start));
*ov->start = atoi(occ);
if ((p = strchr(occ, '+')))
{
- ov->howMany = nmem_malloc(nmem, sizeof(*ov->howMany));
+ ov->howMany = (int *)nmem_malloc(nmem, sizeof(*ov->howMany));
*ov->howMany = atoi(p + 1);
}
else
static Z_ETagUnit *read_tagunit(char *buf, NMEM nmem)
{
- Z_ETagUnit *u = nmem_malloc(nmem, sizeof(*u));
+ Z_ETagUnit *u = (Z_ETagUnit *)nmem_malloc(nmem, sizeof(*u));
int terms;
int type;
char value[512], occ[512];
force_string = 1;
}
u->which = Z_ETagUnit_specificTag;
- u->u.specificTag = t = nmem_malloc(nmem, sizeof(*t));
- t->tagType = nmem_malloc(nmem, sizeof(*t->tagType));
+ u->u.specificTag = t = (Z_SpecificTag *)nmem_malloc(nmem, sizeof(*t));
+ t->tagType = (int *)nmem_malloc(nmem, sizeof(*t->tagType));
*t->tagType = type;
- t->tagValue = nmem_malloc(nmem, sizeof(*t->tagValue));
+ t->tagValue = (Z_StringOrNumeric *)nmem_malloc(nmem, sizeof(*t->tagValue));
if (!force_string && (numval = atoi(valp)))
{
t->tagValue->which = Z_StringOrNumeric_numeric;
- t->tagValue->u.numeric = nmem_malloc(nmem, sizeof(int));
+ t->tagValue->u.numeric = (int *)nmem_malloc(nmem, sizeof(int));
*t->tagValue->u.numeric = numval;
}
else
{
t->tagValue->which = Z_StringOrNumeric_string;
- t->tagValue->u.string = nmem_malloc(nmem, strlen(valp)+1);
+ t->tagValue->u.string = (char *)nmem_malloc(nmem, strlen(valp)+1);
strcpy(t->tagValue->u.string, valp);
}
if (terms > 2) /* an occurrences-spec exists */
NMEM nmem = data1_nmem_get (dh);
int argc, size_esn = 0;
char *argv[50], line[512];
- Z_Espec1 *res = nmem_malloc(nmem, sizeof(*res));
+ Z_Espec1 *res = (Z_Espec1 *)nmem_malloc(nmem, sizeof(*res));
if (!(f = yaz_path_fopen(data1_get_tabpath(dh), file, "r")))
{
continue;
}
- res->elementSetNames = nmem_malloc(nmem, sizeof(char**)*nnames);
+ res->elementSetNames = (char **)nmem_malloc(nmem, sizeof(char**)*nnames);
for (i = 0; i < nnames; i++)
{
- res->elementSetNames[i] = nmem_malloc(nmem,
+ res->elementSetNames[i] = (char *)nmem_malloc(nmem,
strlen(argv[i+1])+1);
strcpy(res->elementSetNames[i], argv[i+1]);
}
logf(LOG_WARN, "%s: Bad defaulttagtype directive", file);
continue;
}
- res->defaultTagType = nmem_malloc(nmem, sizeof(int));
+ res->defaultTagType = (int *)nmem_malloc(nmem, sizeof(int));
*res->defaultTagType = atoi(argv[1]);
}
else if (!strcmp(argv[0], "defaultvariantrequest"))
int num, i = 0;
if (!res->elements)
- res->elements = nmem_malloc(nmem, size_esn = 24*sizeof(er));
+ res->elements = (Z_ElementRequest **)nmem_malloc(nmem, size_esn = 24*sizeof(er));
else if (res->num_elements >= (int) (size_esn/sizeof(er)))
{
Z_ElementRequest **oe = res->elements;
size_esn *= 2;
- res->elements = nmem_malloc (nmem, size_esn*sizeof(er));
+ res->elements = (Z_ElementRequest **)nmem_malloc (nmem, size_esn*sizeof(er));
memcpy (res->elements, oe, size_esn/2);
}
if (argc < 2)
}
res->elements[res->num_elements++] = er =
- nmem_malloc(nmem, sizeof(*er));
+ (Z_ElementRequest *)nmem_malloc(nmem, sizeof(*er));
er->which = Z_ERequest_simpleElement;
- er->u.simpleElement = se = nmem_malloc(nmem, sizeof(*se));
+ er->u.simpleElement = se = (Z_SimpleElement *)nmem_malloc(nmem, sizeof(*se));
se->variantRequest = 0;
- se->path = tp = nmem_malloc(nmem, sizeof(*tp));
+ se->path = tp = (Z_ETagPath *)nmem_malloc(nmem, sizeof(*tp));
tp->num_tags = 0;
/*
* Parse the element selector.
*/
for (num = 1, ep = path; (ep = strchr(ep, '/')); num++, ep++)
;
- tp->tags = nmem_malloc(nmem, sizeof(Z_ETagUnit*)*num);
+ tp->tags = (Z_ETagUnit **)nmem_malloc(nmem, sizeof(Z_ETagUnit*)*num);
for ((ep = strchr(path, '/')) ; path ;
(void)((path = ep) && (ep = strchr(path, '/'))))
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_expout.c,v $
- * Revision 1.7 1997-12-09 16:18:16 adam
+ * Revision 1.8 1998-02-11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.7 1997/12/09 16:18:16 adam
* Work on EXPLAIN schema. First implementation of sub-schema facility
* in the *.abs files.
*
c = c->child;
if (!is_data_tag (eh, c) || c->u.data.len > 63)
return 0;
- r = odr_malloc(eh->o, sizeof(*r));
+ r = (int *)odr_malloc(eh->o, sizeof(*r));
sprintf(intbuf, "%.*s", 63, c->u.data.data);
*r = atoi(intbuf);
return r;
c = c->child;
if (!is_data_tag (eh, c))
return 0;
- r = odr_malloc(eh->o, c->u.data.len+1);
+ r = (char *)odr_malloc(eh->o, c->u.data.len+1);
memcpy(r, c->u.data.data, c->u.data.len);
r[c->u.data.len] = '\0';
return r;
c = c->child;
if (!is_data_tag (eh, c) || c->u.data.len > 63)
return 0;
- tf = odr_malloc (eh->o, sizeof(*tf));
+ tf = (int *)odr_malloc (eh->o, sizeof(*tf));
sprintf(intbuf, "%.*s", c->u.data.len, c->u.data.data);
*tf = atoi(intbuf);
return tf;
c = c->child;
if (!is_data_tag (eh, c))
return 0;
- r = odr_malloc(eh->o, sizeof(*r));
+ r = (Z_HumanString *)odr_malloc(eh->o, sizeof(*r));
r->num_strings = 1;
- r->strings = odr_malloc(eh->o, sizeof(Z_HumanStringUnit*));
- r->strings[0] = u = odr_malloc(eh->o, sizeof(*u));
+ r->strings = (Z_HumanStringUnit **)odr_malloc(eh->o, sizeof(Z_HumanStringUnit*));
+ r->strings[0] = u = (Z_HumanStringUnit *)odr_malloc(eh->o, sizeof(*u));
u->language = 0;
- u->text = odr_malloc(eh->o, c->u.data.len+1);
+ u->text = (char *)odr_malloc(eh->o, c->u.data.len+1);
memcpy(u->text, c->u.data.data, c->u.data.len);
u->text[c->u.data.len] = '\0';
return r;
static Z_CommonInfo *f_commonInfo(ExpHandle *eh, data1_node *n)
{
- Z_CommonInfo *res = odr_malloc(eh->o, sizeof(*res));
+ Z_CommonInfo *res = (Z_CommonInfo *)odr_malloc(eh->o, sizeof(*res));
data1_node *c;
res->dateAdded = 0;
}
if (!*num)
return NULL;
- res = odr_malloc (eh->o, sizeof(*res) * (*num));
+ res = (int **)odr_malloc (eh->o, sizeof(*res) * (*num));
for (c = n->child, i = 0 ; c; c = c->next)
{
if (is_numeric_tag (eh, c) != 1000)
}
if (!*num)
return NULL;
- res = odr_malloc (eh->o, sizeof(*res) * (*num));
+ res = (char **)odr_malloc (eh->o, sizeof(*res) * (*num));
for (c = n->child, i = 0 ; c; c = c->next)
{
if (!is_numeric_tag (eh, c) != 1001)
Z_RpnCapabilities *f_rpnCapabilities (ExpHandle *eh, data1_node *c)
{
- Z_RpnCapabilities *res = odr_malloc (eh->o, sizeof(*res));
+ Z_RpnCapabilities *res = (Z_RpnCapabilities *)odr_malloc (eh->o, sizeof(*res));
res->num_operators = 0;
res->operators = NULL;
}
if (!*num)
return NULL;
- res = odr_malloc (eh->o, *num * sizeof(*res));
+ res = (Z_QueryTypeDetails **)odr_malloc (eh->o, *num * sizeof(*res));
i = 0;
for (n = c->child; n; n = n->next)
{
if (is_numeric_tag(eh, n) == 519)
{
- res[i] = odr_malloc (eh->o, sizeof(**res));
+ res[i] = (Z_QueryTypeDetails *)odr_malloc (eh->o, sizeof(**res));
res[i]->which = Z_QueryTypeDetails_rpn;
res[i]->u.rpn = f_rpnCapabilities (eh, n);
i++;
static Z_AccessInfo *f_accessInfo(ExpHandle *eh, data1_node *n)
{
- Z_AccessInfo *res = odr_malloc(eh->o, sizeof(*res));
+ Z_AccessInfo *res = (Z_AccessInfo *)odr_malloc(eh->o, sizeof(*res));
data1_node *c;
res->num_queryTypesSupported = 0;
static int *f_recordCount(ExpHandle *eh, data1_node *c, int *which)
{
- int *r= odr_malloc(eh->o, sizeof(*r));
+ int *r= (int *)odr_malloc(eh->o, sizeof(*r));
int *wp = which;
char intbuf[64];
if (!i)
return NULL;
- res = odr_malloc (eh->o, sizeof(*res));
+ res = (Z_DatabaseList *)odr_malloc (eh->o, sizeof(*res));
res->num_databases = i;
- res->databases = odr_malloc (eh->o, sizeof(*res->databases) * i);
+ res->databases = (char **)odr_malloc (eh->o, sizeof(*res->databases) * i);
i = 0;
for (c = n->child; c; c = c->next)
{
static Z_TargetInfo *f_targetInfo(ExpHandle *eh, data1_node *n)
{
- Z_TargetInfo *res = odr_malloc(eh->o, sizeof(*res));
+ Z_TargetInfo *res = (Z_TargetInfo *)odr_malloc(eh->o, sizeof(*res));
data1_node *c;
res->commonInfo = 0;
}
if (res->num_nicknames)
res->nicknames =
- odr_malloc (eh->o, res->num_nicknames
+ (char **)odr_malloc (eh->o, res->num_nicknames
* sizeof(*res->nicknames));
for (n = c->child; n; n = n->next)
{
}
if (res->num_dbCombinations)
res->dbCombinations =
- odr_malloc (eh->o, res->num_dbCombinations
+ (Z_DatabaseList **)odr_malloc (eh->o, res->num_dbCombinations
* sizeof(*res->dbCombinations));
for (n = c->child; n; n = n->next)
{
static Z_DatabaseInfo *f_databaseInfo(ExpHandle *eh, data1_node *n)
{
- Z_DatabaseInfo *res = odr_malloc(eh->o, sizeof(*res));
+ Z_DatabaseInfo *res = (Z_DatabaseInfo *)odr_malloc(eh->o, sizeof(*res));
data1_node *c;
res->commonInfo = 0;
}
if (res->num_nicknames)
res->nicknames =
- odr_malloc (eh->o, res->num_nicknames
+ (char **)odr_malloc (eh->o, res->num_nicknames
* sizeof(*res->nicknames));
for (n = c->child; n; n = n->next)
{
}
if (res->num_keywords)
res->keywords =
- odr_malloc (eh->o, res->num_keywords
+ (Z_HumanString **)odr_malloc (eh->o, res->num_keywords
* sizeof(*res->keywords));
for (n = c->child; n; n = n->next)
{
int select, ODR o)
{
ExpHandle eh;
- Z_ExplainRecord *res = odr_malloc(o, sizeof(*res));
+ Z_ExplainRecord *res = (Z_ExplainRecord *)odr_malloc(o, sizeof(*res));
eh.dh = dh;
eh.select = select;
eh.o = o;
- eh.false_value = odr_malloc(eh.o, sizeof(eh.false_value));
+ eh.false_value = (int *)odr_malloc(eh.o, sizeof(eh.false_value));
*eh.false_value = 0;
- eh.true_value = odr_malloc(eh.o, sizeof(eh.true_value));
+ eh.true_value = (int *)odr_malloc(eh.o, sizeof(eh.true_value));
*eh.true_value = 1;
assert(n->which == DATA1N_root);
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_grs.c,v $
- * Revision 1.12 1997-11-24 11:33:56 adam
+ * Revision 1.13 1998-02-11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.12 1997/11/24 11:33:56 adam
* Using function odr_nullval() instead of global ODR_NULLVAL when
* appropriate.
*
static Z_ElementMetaData *get_ElementMetaData(ODR o)
{
- Z_ElementMetaData *r = odr_malloc(o, sizeof(*r));
+ Z_ElementMetaData *r = (Z_ElementMetaData *)odr_malloc(o, sizeof(*r));
r->seriesOrder = 0;
r->usageRight = 0;
*/
static Z_Variant *make_variant(data1_node *n, int num, ODR o)
{
- Z_Variant *v = odr_malloc(o, sizeof(*v));
+ Z_Variant *v = (Z_Variant *)odr_malloc(o, sizeof(*v));
data1_node *p;
v->globalVariantSetId = 0;
v->num_triples = num;
- v->triples = odr_malloc(o, sizeof(Z_Triple*) * num);
+ v->triples = (Z_Triple **)odr_malloc(o, sizeof(Z_Triple*) * num);
/*
* cycle back up through the tree of variants
Z_Triple *t;
assert(p->which == DATA1N_variant);
- t = v->triples[num] = odr_malloc(o, sizeof(*t));
+ t = v->triples[num] = (Z_Triple *)odr_malloc(o, sizeof(*t));
t->variantSetId = 0;
- t->zclass = odr_malloc(o, sizeof(int));
+ t->zclass = (int *)odr_malloc(o, sizeof(int));
*t->zclass = p->u.variant.type->zclass->zclass;
- t->type = odr_malloc(o, sizeof(int));
+ t->type = (int *)odr_malloc(o, sizeof(int));
*t->type = p->u.variant.type->type;
switch (p->u.variant.type->datatype)
{
case DATA1K_string:
t->which = Z_Triple_internationalString;
- t->value.internationalString = odr_malloc(o,
+ t->value.internationalString = (char *)odr_malloc(o,
strlen(p->u.variant.value)+1);
strcpy(t->value.internationalString, p->u.variant.value);
break;
if (c->which == DATA1N_data && level)
{
if (!m->supportedVariants)
- m->supportedVariants = odr_malloc(o, sizeof(Z_Variant*) *
+ m->supportedVariants = (Z_Variant **)odr_malloc(o, sizeof(Z_Variant*) *
D1_VARIANTARRAY);
else if (m->num_supportedVariants >= D1_VARIANTARRAY)
{
int select, int leaf,
ODR o, int *len)
{
- Z_ElementData *res = odr_malloc(o, sizeof(*res));
+ Z_ElementData *res = (Z_ElementData *)odr_malloc(o, sizeof(*res));
if (!n)
{
{
case DATA1I_num:
res->which = Z_ElementData_numeric;
- res->u.numeric = odr_malloc(o, sizeof(int));
+ res->u.numeric = (int *)odr_malloc(o, sizeof(int));
*res->u.numeric = atoi(n->u.data.data);
*len += 4;
break;
if (p->u.tag.get_bytes > 0 && p->u.tag.get_bytes < toget)
toget = p->u.tag.get_bytes;
res->which = Z_ElementData_string;
- res->u.string = odr_malloc(o, toget+1);
+ res->u.string = (char *)odr_malloc(o, toget+1);
memcpy(res->u.string, n->u.data.data, toget);
res->u.string[toget] = '\0';
*len += toget;
int select, ODR o,
int *len)
{
- Z_TaggedElement *res = odr_malloc(o, sizeof(*res));
+ Z_TaggedElement *res = (Z_TaggedElement *)odr_malloc(o, sizeof(*res));
data1_tag *tag = 0;
data1_node *data;
int leaf;
return 0;
}
- res->tagType = odr_malloc(o, sizeof(int));
+ res->tagType = (int *)odr_malloc(o, sizeof(int));
*res->tagType = (tag && tag->tagset) ? tag->tagset->type : 3;
- res->tagValue = odr_malloc(o, sizeof(Z_StringOrNumeric));
+ res->tagValue = (Z_StringOrNumeric *)odr_malloc(o, sizeof(Z_StringOrNumeric));
if (tag && tag->which == DATA1T_numeric)
{
res->tagValue->which = Z_StringOrNumeric_numeric;
- res->tagValue->u.numeric = odr_malloc(o, sizeof(int));
+ res->tagValue->u.numeric = (int *)odr_malloc(o, sizeof(int));
*res->tagValue->u.numeric = tag->value.numeric;
}
else
tagstr = n->u.tag.tag;
res->tagValue->which = Z_StringOrNumeric_string;
- res->tagValue->u.string = odr_malloc(o, strlen(tagstr)+1);
+ res->tagValue->u.string = (char *)odr_malloc(o, strlen(tagstr)+1);
strcpy(res->tagValue->u.string, tagstr);
}
res->tagOccurrence = 0;
}
if (n->which == DATA1N_tag && n->u.tag.no_data_requested)
{
- res->content = odr_malloc(o, sizeof(*res->content));
+ res->content = (Z_ElementData *)odr_malloc(o, sizeof(*res->content));
res->content->which = Z_ElementData_noDataRequested;
res->content->u.noDataRequested = odr_nullval();
}
Z_GenericRecord *data1_nodetogr(data1_handle dh, data1_node *n,
int select, ODR o, int *len)
{
- Z_GenericRecord *res = odr_malloc(o, sizeof(*res));
+ Z_GenericRecord *res = (Z_GenericRecord *)odr_malloc(o, sizeof(*res));
data1_node *c;
int num_children = 0;
for (c = n->child; c; c = c->next)
num_children++;
- res->elements = odr_malloc(o, sizeof(Z_TaggedElement *) * num_children);
+ res->elements = (Z_TaggedElement **)odr_malloc(o, sizeof(Z_TaggedElement *) * num_children);
res->num_elements = 0;
for (c = n->child; c; c = c->next)
{
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_handle.c,v $
- * Revision 1.2 1997-09-30 11:50:04 adam
+ * Revision 1.3 1998-02-11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.2 1997/09/30 11:50:04 adam
* Added handler data1_get_map_buf that is used by data1_nodetomarc.
*
* Revision 1.1 1997/09/17 12:28:24 adam
data1_handle data1_create (void)
{
- data1_handle p = xmalloc (sizeof(*p));
+ data1_handle p = (data1_handle)xmalloc (sizeof(*p));
if (!p)
return NULL;
p->tab_path = NULL;
}
if (p)
{
- dp->tab_path = xmalloc (strlen(p)+1);
+ dp->tab_path = (char *)xmalloc (strlen(p)+1);
strcpy (dp->tab_path, p);
}
}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_map.c,v $
- * Revision 1.12 1997-11-18 09:51:09 adam
+ * Revision 1.13 1998-02-11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.12 1997/11/18 09:51:09 adam
* Removed element num_children from data1_node. Minor changes in
* data1 to Explain.
*
data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
{
NMEM mem = data1_nmem_get (dh);
- data1_maptab *res = nmem_malloc(mem, sizeof(*res));
+ data1_maptab *res = (data1_maptab *)nmem_malloc(mem, sizeof(*res));
FILE *f;
int argc;
char *argv[50], line[512];
file);
continue;
}
- res->target_absyn_name = nmem_malloc(mem, strlen(argv[1])+1);
+ res->target_absyn_name = (char *)nmem_malloc(mem, strlen(argv[1])+1);
strcpy(res->target_absyn_name, argv[1]);
}
else if (!yaz_matchstr(argv[0], "localnumeric"))
file);
continue;
}
- res->name = nmem_malloc(mem, strlen(argv[1])+1);
+ res->name = (char *)nmem_malloc(mem, strlen(argv[1])+1);
strcpy(res->name, argv[1]);
}
else if (!strcmp(argv[0], "map"))
file);
continue;
}
- *mapp = nmem_malloc(mem, sizeof(**mapp));
+ *mapp = (data1_mapunit *)nmem_malloc(mem, sizeof(**mapp));
(*mapp)->next = 0;
if (argc > 3 && !data1_matchstr(argv[3], "nodata"))
(*mapp)->no_data = 1;
else
(*mapp)->no_data = 0;
- (*mapp)->source_element_name = nmem_malloc(mem, strlen(argv[1])+1);
+ (*mapp)->source_element_name = (char *)nmem_malloc(mem, strlen(argv[1])+1);
strcpy((*mapp)->source_element_name, argv[1]);
mtp = &(*mapp)->target_path;
if (*path == '/')
fclose(f);
return 0;
}
- *mtp = nmem_malloc(mem, sizeof(**mtp));
+ *mtp = (data1_maptag *)nmem_malloc(mem, sizeof(**mtp));
(*mtp)->next = 0;
(*mtp)->type = type;
if (np > 2 && !data1_matchstr(parm, "new"))
else
{
(*mtp)->which = D1_MAPTAG_string;
- (*mtp)->value.string = nmem_malloc(mem, strlen(valstr)+1);
+ (*mtp)->value.string = (char *)nmem_malloc(mem, strlen(valstr)+1);
strcpy((*mtp)->value.string, valstr);
}
mtp = &(*mtp)->next;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_marc.c,v $
- * Revision 1.10 1997-09-30 11:50:04 adam
+ * Revision 1.11 1998-02-11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.10 1997/09/30 11:50:04 adam
* Added handler data1_get_map_buf that is used by data1_nodetomarc.
*
* Revision 1.9 1997/09/24 13:35:45 adam
{
FILE *f;
NMEM mem = data1_nmem_get (dh);
- data1_marctab *res = nmem_malloc(mem, sizeof(*res));
+ data1_marctab *res = (data1_marctab *)nmem_malloc(mem, sizeof(*res));
char line[512], *argv[50];
int argc;
}
if (!*buf)
- *buf = xmalloc(*size = len);
+ *buf = (char *)xmalloc(*size = len);
else if (*size <= len)
- *buf = xrealloc(*buf, *size = len);
+ *buf = (char *)xrealloc(*buf, *size = len);
op = *buf;
memint (op, len, 5);
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_read.c,v $
- * Revision 1.19 1997-12-09 16:17:09 adam
+ * Revision 1.20 1998-02-11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.19 1997/12/09 16:17:09 adam
* Fix bug regarding variants. Tags with prefix "var" was incorrectly
* interpreted as "start of variants". Now, only "var" indicates such
* start.
{
data1_node *r;
- r = nmem_malloc(m, sizeof(*r));
+ r = (data1_node *)nmem_malloc(m, sizeof(*r));
r->next = r->child = r->last_child = r->parent = 0;
r->destroy = 0;
return r;
int line = 0;
if (!*buf)
- *buf = xmalloc(*size = 4096);
+ *buf = (char *)xmalloc(*size = 4096);
for (;;)
{
- if (rd + 4096 > *size && !(*buf =xrealloc(*buf, *size *= 2)))
+ if (rd + 4096 > *size && !(*buf =(char *)xrealloc(*buf, *size *= 2)))
abort();
if ((res = (*rf)(fh, *buf + rd, 4096)) <= 0)
{
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_sumout.c,v $
- * Revision 1.2 1997-09-17 12:10:38 adam
+ * Revision 1.3 1998-02-11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.2 1997/09/17 12:10:38 adam
* YAZ version 1.4.
*
* Revision 1.1 1996/06/10 08:56:03 quinn
if (!c->child || c->child->which != DATA1N_data ||
c->child->u.data.len > 63)
return 0;
- r = odr_malloc(o, sizeof(*r));
+ r = (int *)odr_malloc(o, sizeof(*r));
sprintf(intbuf, "%.*s", 63, c->child->u.data.data);
*r = atoi(intbuf);
return r;
if (!c->child || c->child->which != DATA1N_data)
return 0;
- r = odr_malloc(o, c->child->u.data.len+1);
+ r = (char *)odr_malloc(o, c->child->u.data.len+1);
memcpy(r, c->child->u.data.data, c->child->u.data.len);
r[c->child->u.data.len] = '\0';
return r;
Z_BriefBib *data1_nodetosummary (data1_handle dh, data1_node *n,
int select, ODR o)
{
- Z_BriefBib *res = odr_malloc(o, sizeof(*res));
+ Z_BriefBib *res = (Z_BriefBib *)odr_malloc(o, sizeof(*res));
data1_node *c;
assert(n->which == DATA1N_root);
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_tagset.c,v $
- * Revision 1.6 1997-09-17 12:10:38 adam
+ * Revision 1.7 1998-02-11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.6 1997/09/17 12:10:38 adam
* YAZ version 1.4.
*
* Revision 1.5 1997/09/05 09:50:57 adam
return 0;
}
- res = nmem_malloc(mem, sizeof(*res));
+ res = (data1_tagset *)nmem_malloc(mem, sizeof(*res));
res->name = 0;
res->type = 0;
res->tags = 0;
fclose(f);
return 0;
}
- rr = *tagp = nmem_malloc(mem, sizeof(*rr));
+ rr = *tagp = (data1_tag *)nmem_malloc(mem, sizeof(*rr));
rr->tagset = res;
rr->next = 0;
rr->which = DATA1T_numeric;
{
char *e;
- *npp = nmem_malloc(mem, sizeof(**npp));
+ *npp = (data1_name *)nmem_malloc(mem, sizeof(**npp));
if ((e = strchr(nm, '/')))
*(e++) = '\0';
(*npp)->name = nmem_strdup(mem, nm);
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_varset.c,v $
- * Revision 1.6 1997-09-17 12:10:39 adam
+ * Revision 1.7 1998-02-11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.6 1997/09/17 12:10:39 adam
* YAZ version 1.4.
*
* Revision 1.5 1997/09/05 09:50:58 adam
data1_varset *data1_read_varset (data1_handle dh, const char *file)
{
NMEM mem = data1_nmem_get (dh);
- data1_varset *res = nmem_malloc(mem, sizeof(*res));
+ data1_varset *res = (data1_varset *)nmem_malloc(mem, sizeof(*res));
data1_varclass **classp = &res->classes, *zclass = 0;
data1_vartype **typep = 0;
FILE *f;
fclose(f);
return 0;
}
- *classp = r = zclass = nmem_malloc(mem, sizeof(*r));
+ *classp = r = zclass = (data1_varclass *)nmem_malloc(mem, sizeof(*r));
r->set = res;
r->zclass = atoi(argv[1]);
r->name = nmem_strdup(mem, argv[2]);
fclose(f);
return 0;
}
- *typep = r = nmem_malloc(mem, sizeof(*r));
+ *typep = r = (data1_vartype *)nmem_malloc(mem, sizeof(*r));
r->name = nmem_strdup(mem, argv[2]);
r->zclass = zclass;
r->type = atoi(argv[1]);
# Copyright (C) 1994, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.9 1996-05-22 08:35:58 adam Exp $
+# $Id: Makefile,v 1.10 1998-02-11 11:53:35 adam Exp $
SHELL=/bin/sh
INCLUDE=-I../include -I. -I../../xtimosi/src
depend2:
$(CPP) $(INCLUDE) -M *.c >.depend
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif
+#ifeq (.depend,$(wildcard .depend))
+#include .depend
+#endif
#Depend --- DOT NOT DELETE THIS LINE
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: eventl.c,v $
- * Revision 1.25 1998-01-29 13:30:23 adam
+ * Revision 1.26 1998-02-11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.25 1998/01/29 13:30:23 adam
* Better event handle system for NT/Unix.
*
* Revision 1.24 1997/09/04 14:19:13 adam
{
IOCHAN new_iochan;
- if (!(new_iochan = xmalloc(sizeof(*new_iochan))))
+ if (!(new_iochan = (IOCHAN)xmalloc(sizeof(*new_iochan))))
return 0;
new_iochan->destroyed = 0;
new_iochan->fd = fd;
else
{
/* Destroy the first member in the chain, and try again */
- association *assoc = iochan_getdata(*iochans);
+ association *assoc = (association *)iochan_getdata(*iochans);
COMSTACK conn = assoc->client_link;
cs_close(conn);
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: requestq.c,v $
- * Revision 1.5 1998-02-10 11:03:56 adam
+ * Revision 1.6 1998-02-11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.5 1998/02/10 11:03:56 adam
* Added support for extended handlers in backend server interface.
*
* Revision 1.4 1997/10/27 13:55:03 adam
q->list = r->next;
else
{
- if (!(r = xmalloc(sizeof(*r))))
+ if (!(r = (request *)xmalloc(sizeof(*r))))
abort();
r->response = 0;
r->size_response = 0;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: seshigh.c,v $
- * Revision 1.71 1998-02-10 11:03:57 adam
+ * Revision 1.72 1998-02-11 11:53:35 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.71 1998/02/10 11:03:57 adam
* Added support for extended handlers in backend server interface.
*
* Revision 1.70 1998/01/29 13:15:35 adam
if (!control_block)
control_block = statserv_getcontrol();
- if (!(anew = xmalloc(sizeof(*anew))))
+ if (!(anew = (association *)xmalloc(sizeof(*anew))))
return 0;
anew->client_chan = channel;
anew->client_link = link;
void ir_session(IOCHAN h, int event)
{
int res;
- association *assoc = iochan_getdata(h);
+ association *assoc = (association *)iochan_getdata(h);
COMSTACK conn = assoc->client_link;
request *req;
*/
void backend_response(IOCHAN i, int event)
{
- association *assoc = iochan_getdata(i);
+ association *assoc = (association *)iochan_getdata(i);
request *req = request_head(&assoc->incoming);
Z_APDU *res;
int fd;
}
assoc->backend = binitres->handle;
- if ((assoc->bend_sort = binitreq.bend_sort))
+ if ((assoc->bend_sort = (int (*)())binitreq.bend_sort))
logf (LOG_DEBUG, "Sort handler installed");
- if ((assoc->bend_search = binitreq.bend_search))
+ if ((assoc->bend_search = (int (*)())binitreq.bend_search))
logf (LOG_DEBUG, "Search handler installed");
- if ((assoc->bend_present = binitreq.bend_present))
- logf (LOG_DEBUG, "Present handler installed");
+ if ((assoc->bend_present = (int (*)())binitreq.bend_present))
+ logf (LOG_DEBUG, "Present handler installed");
resp->referenceId = req->referenceId;
*options = '\0';
/* let's tell the client what we can do */
static Z_Records *diagrec(association *assoc, int error, char *addinfo)
{
int oid[OID_SIZE];
- Z_Records *rec = odr_malloc (assoc->encode, sizeof(*rec));
+ Z_Records *rec = (Z_Records *)odr_malloc (assoc->encode, sizeof(*rec));
oident bib1;
- int *err = odr_malloc (assoc->encode, sizeof(*err));
- Z_DiagRec *drec = odr_malloc (assoc->encode, sizeof(*drec));
- Z_DefaultDiagFormat *dr = odr_malloc (assoc->encode, sizeof(*dr));
+ int *err = (int *)odr_malloc (assoc->encode, sizeof(*err));
+ Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec));
+ Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)odr_malloc (assoc->encode, sizeof(*dr));
bib1.proto = assoc->proto;
bib1.oclass = CLASS_DIAGSET;
int error, char *addinfo)
{
int oid[OID_SIZE];
- Z_NamePlusRecord *rec = odr_malloc (assoc->encode, sizeof(*rec));
- int *err = odr_malloc (assoc->encode, sizeof(*err));
+ Z_NamePlusRecord *rec = (Z_NamePlusRecord *)odr_malloc (assoc->encode, sizeof(*rec));
+ int *err = (int *)odr_malloc (assoc->encode, sizeof(*err));
oident bib1;
- Z_DiagRec *drec = odr_malloc (assoc->encode, sizeof(*drec));
- Z_DefaultDiagFormat *dr = odr_malloc (assoc->encode, sizeof(*dr));
+ Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec));
+ Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)odr_malloc (assoc->encode, sizeof(*dr));
bib1.proto = assoc->proto;
bib1.oclass = CLASS_DIAGSET;
static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo)
{
int oid[OID_SIZE];
- Z_DiagRecs *recs = odr_malloc (assoc->encode, sizeof(*recs));
- int *err = odr_malloc (assoc->encode, sizeof(*err));
+ Z_DiagRecs *recs = (Z_DiagRecs *)odr_malloc (assoc->encode, sizeof(*recs));
+ int *err = (int *)odr_malloc (assoc->encode, sizeof(*err));
oident bib1;
- Z_DiagRec **recp = odr_malloc (assoc->encode, sizeof(*recp));
- Z_DiagRec *drec = odr_malloc (assoc->encode, sizeof(*drec));
- Z_DefaultDiagFormat *rec = odr_malloc (assoc->encode, sizeof(*rec));
+ Z_DiagRec **recp = (Z_DiagRec **)odr_malloc (assoc->encode, sizeof(*recp));
+ Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec));
+ Z_DefaultDiagFormat *rec = (Z_DefaultDiagFormat *)odr_malloc (assoc->encode, sizeof(*rec));
logf(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo);
bib1.proto = assoc->proto;
{
int oid[OID_SIZE];
int recno, total_length = 0, toget = *num, dumped_records = 0;
- Z_Records *records = odr_malloc (a->encode, sizeof(*records));
- Z_NamePlusRecordList *reclist = odr_malloc (a->encode, sizeof(*reclist));
- Z_NamePlusRecord **list = odr_malloc (a->encode, sizeof(*list) * toget);
+ Z_Records *records = (Z_Records *)odr_malloc (a->encode, sizeof(*records));
+ Z_NamePlusRecordList *reclist = (Z_NamePlusRecordList *)odr_malloc (a->encode, sizeof(*reclist));
+ Z_NamePlusRecord **list = (Z_NamePlusRecord **)odr_malloc (a->encode, sizeof(*list) * toget);
oident recform;
records->which = Z_Records_DBOSD;
continue;
}
}
- if (!(thisrec = odr_malloc(a->encode, sizeof(*thisrec))))
+ if (!(thisrec = (Z_NamePlusRecord *)odr_malloc(a->encode, sizeof(*thisrec))))
return 0;
- if (!(thisrec->databaseName = odr_malloc(a->encode,
+ if (!(thisrec->databaseName = (char *)odr_malloc(a->encode,
strlen(fres->basename) + 1)))
return 0;
strcpy(thisrec->databaseName, fres->basename);
thisrec->which = Z_NamePlusRecord_databaseRecord;
- if (!(thisrec->u.databaseRecord = thisext = odr_malloc(a->encode,
+ if (!(thisrec->u.databaseRecord = thisext = (Z_External *)odr_malloc(a->encode,
sizeof(Z_DatabaseRecord))))
return 0;
recform.proto = a->proto;
}
else if (fres->format == VAL_SUTRS) /* SUTRS is a single-ASN.1-type */
{
- Odr_oct *sutrs = odr_malloc(a->encode, sizeof(*sutrs));
+ Odr_oct *sutrs = (Odr_oct *)odr_malloc(a->encode, sizeof(*sutrs));
thisext->which = Z_External_sutrs;
thisext->u.sutrs = sutrs;
- sutrs->buf = odr_malloc(a->encode, fres->len);
+ sutrs->buf = (unsigned char *)odr_malloc(a->encode, fres->len);
sutrs->len = sutrs->size = fres->len;
memcpy(sutrs->buf, fres->record, fres->len);
}
else /* octet-aligned record. */
{
thisext->which = Z_External_octet;
- if (!(thisext->u.octet_aligned = odr_malloc(a->encode,
+ if (!(thisext->u.octet_aligned = (Odr_oct *)odr_malloc(a->encode,
sizeof(Odr_oct))))
return 0;
- if (!(thisext->u.octet_aligned->buf = odr_malloc(a->encode,
+ if (!(thisext->u.octet_aligned->buf = (unsigned char *)odr_malloc(a->encode,
fres->len)))
return 0;
memcpy(thisext->u.octet_aligned->buf, fres->record, fres->len);
int *fd)
{
Z_SearchRequest *req = reqb->request->u.searchRequest;
- bend_search_rr *bsrr = nmem_malloc (reqb->request_mem, sizeof(*bsrr));
+ bend_search_rr *bsrr = (bend_search_rr *)nmem_malloc (reqb->request_mem, sizeof(*bsrr));
logf(LOG_LOG, "Got SearchRequest.");
-
save_referenceId (reqb, req->referenceId);
/* store ref id in request */
bsrr->fd = fd;
bsrr->errcode = 0;
bsrr->hits = 0;
bsrr->errstring = NULL;
- (*assoc->bend_search)(assoc->backend, bsrr);
+ ((int (*)(void *, bend_search_rr *))(assoc->bend_search))(assoc->backend, bsrr);
if (!bsrr->request)
return 0;
}
bend_search_rr *bsrt, int *fd)
{
Z_SearchRequest *req = reqb->request->u.searchRequest;
- Z_APDU *apdu = odr_malloc (assoc->encode, sizeof(*apdu));
- Z_SearchResponse *resp = odr_malloc (assoc->encode, sizeof(*resp));
- int *nulint = odr_malloc (assoc->encode, sizeof(*nulint));
- bool_t *sr = odr_malloc (assoc->encode, sizeof(*sr));
- int *next = odr_malloc (assoc->encode, sizeof(*next));
- int *none = odr_malloc (assoc->encode, sizeof(*none));
+ Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+ Z_SearchResponse *resp = (Z_SearchResponse *)odr_malloc (assoc->encode, sizeof(*resp));
+ int *nulint = (int *)odr_malloc (assoc->encode, sizeof(*nulint));
+ bool_t *sr = (bool_t *)odr_malloc (assoc->encode, sizeof(*sr));
+ int *next = (int *)odr_malloc (assoc->encode, sizeof(*next));
+ int *none = (int *)odr_malloc (assoc->encode, sizeof(*none));
*nulint = 0;
*sr = 1;
}
else
{
- int *toget = odr_malloc (assoc->encode, sizeof(*toget));
- int *presst = odr_malloc (assoc->encode, sizeof(*presst));
+ int *toget = (int *)odr_malloc (assoc->encode, sizeof(*toget));
+ int *presst = (int *)odr_malloc (assoc->encode, sizeof(*presst));
Z_RecordComposition comp, *compp = 0;
*toget = 0;
form = prefformat->value;
if (assoc->bend_present)
{
- bend_present_rr *bprr = nmem_malloc (reqb->request_mem, sizeof(*bprr));
+ bend_present_rr *bprr = (bend_present_rr *)nmem_malloc (reqb->request_mem, sizeof(*bprr));
bprr->setname = req->resultSetId;
bprr->start = *req->resultSetStartPoint;
bprr->number = *req->numberOfRecordsRequested;
bprr->association = assoc;
bprr->errcode = 0;
bprr->errstring = NULL;
- (*assoc->bend_present)(assoc->backend, bprr);
+ ((int (*)(void *, bend_present_rr *))(*assoc->bend_present))(assoc->backend, bprr);
if (!bprr->request)
return 0;
}
- apdu = odr_malloc (assoc->encode, sizeof(*apdu));
- resp = odr_malloc (assoc->encode, sizeof(*resp));
- presst = odr_malloc (assoc->encode, sizeof(*presst));
- next = odr_malloc (assoc->encode, sizeof(*next));
- num = odr_malloc (assoc->encode, sizeof(*num));
+ apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+ resp = (Z_PresentResponse *)odr_malloc (assoc->encode, sizeof(*resp));
+ presst = (int *)odr_malloc (assoc->encode, sizeof(*presst));
+ next = (int *)odr_malloc (assoc->encode, sizeof(*next));
+ num = (int *)odr_malloc (assoc->encode, sizeof(*num));
*presst = 0;
*next = 0;
*num = *req->numberOfRecordsRequested;
static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
{
Z_ScanRequest *req = reqb->request->u.scanRequest;
- Z_APDU *apdu = odr_malloc (assoc->encode, sizeof(*apdu));
- Z_ScanResponse *res = odr_malloc (assoc->encode, sizeof(*res));
- int *scanStatus = odr_malloc (assoc->encode, sizeof(*scanStatus));
+ Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+ Z_ScanResponse *res = (Z_ScanResponse *)odr_malloc (assoc->encode, sizeof(*res));
+ int *scanStatus = (int *)odr_malloc (assoc->encode, sizeof(*scanStatus));
int *numberOfEntriesReturned =
- odr_malloc (assoc->encode, sizeof(*numberOfEntriesReturned));
- Z_ListEntries *ents = odr_malloc (assoc->encode, sizeof(*ents));
+ (int *)odr_malloc (assoc->encode, sizeof(*numberOfEntriesReturned));
+ Z_ListEntries *ents = (Z_ListEntries *)odr_malloc (assoc->encode, sizeof(*ents));
oident *attent;
bend_scanrequest srq;
bend_scanresult *srs;
else
{
int i;
- Z_Entries *list = odr_malloc (assoc->encode, sizeof(*list));
- Z_Entry **tab = odr_malloc (assoc->encode,
+ Z_Entries *list = (Z_Entries *)odr_malloc (assoc->encode, sizeof(*list));
+ Z_Entry **tab = (Z_Entry **)odr_malloc (assoc->encode,
sizeof(*tab) * srs->num_entries);
if (srs->status == BEND_SCAN_PARTIAL)
Z_TermInfo *t;
Odr_oct *o;
- list->entries[i] = e = odr_malloc(assoc->encode, sizeof(*e));
+ list->entries[i] = e = (Z_Entry *)odr_malloc(assoc->encode, sizeof(*e));
e->which = Z_Entry_termInfo;
- e->u.termInfo = t = odr_malloc(assoc->encode, sizeof(*t));
+ e->u.termInfo = t = (Z_TermInfo *)odr_malloc(assoc->encode, sizeof(*t));
t->suggestedAttributes = 0;
t->displayTerm = 0;
t->alternativeTerm = 0;
t->byAttributes = 0;
t->otherTermInfo = 0;
t->globalOccurrences = &srs->entries[i].occurrences;
- t->term = odr_malloc(assoc->encode, sizeof(*t->term));
+ t->term = (Z_Term *)odr_malloc(assoc->encode, sizeof(*t->term));
t->term->which = Z_Term_general;
- t->term->u.general = o = odr_malloc(assoc->encode,
+ t->term->u.general = o = (Odr_oct *)odr_malloc(assoc->encode,
sizeof(Odr_oct));
- o->buf = odr_malloc(assoc->encode, o->len = o->size =
+ o->buf = (unsigned char *)odr_malloc(assoc->encode, o->len = o->size =
strlen(srs->entries[i].term));
memcpy(o->buf, srs->entries[i].term, o->len);
logf(LOG_DEBUG, " term #%d: '%s' (%d)", i,
int *fd)
{
Z_SortRequest *req = reqb->request->u.sortRequest;
- Z_SortResponse *res = odr_malloc (assoc->encode, sizeof(*res));
- bend_sort_rr *bsrr = odr_malloc (assoc->encode, sizeof(*bsrr));
+ Z_SortResponse *res = (Z_SortResponse *)odr_malloc (assoc->encode, sizeof(*res));
+ bend_sort_rr *bsrr = (bend_sort_rr *)odr_malloc (assoc->encode, sizeof(*bsrr));
- Z_APDU *apdu = odr_malloc (assoc->encode, sizeof(*apdu));
+ Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
logf(LOG_LOG, "Got SortRequest.");
bsrr->errcode = 0;
bsrr->errstring = 0;
- (*assoc->bend_sort)(assoc->backend, bsrr);
+ ((int (*)(void *, bend_sort_rr *))(*assoc->bend_sort))(assoc->backend, bsrr);
res->referenceId = req->referenceId;
- res->sortStatus = odr_malloc (assoc->encode, sizeof(*res->sortStatus));
+ res->sortStatus = (int *)odr_malloc (assoc->encode, sizeof(*res->sortStatus));
*res->sortStatus = bsrr->sort_status;
res->resultSetStatus = 0;
if (bsrr->errcode)
if (refid)
{
reqb->len_refid = refid->len;
- reqb->refid = nmem_malloc (reqb->request_mem, refid->len);
+ reqb->refid = (char *)nmem_malloc (reqb->request_mem, refid->len);
memcpy (reqb->refid, refid->buf, refid->len);
}
else
Z_ReferenceId *id;
if (!req->refid)
return 0;
- id = odr_malloc (odr, sizeof(*odr));
- id->buf = odr_malloc (odr, req->len_refid);
+ id = (Odr_oct *)odr_malloc (odr, sizeof(*odr));
+ id->buf = (unsigned char *)odr_malloc (odr, req->len_refid);
id->len = id->size = req->len_refid;
memcpy (id->buf, req->refid, req->len_refid);
return id;
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: session.h,v $
- * Revision 1.14 1998-02-10 11:03:57 adam
+ * Revision 1.15 1998-02-11 11:53:36 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.14 1998/02/10 11:03:57 adam
* Added support for extended handlers in backend server interface.
*
* Revision 1.13 1998/01/29 13:30:23 adam
#include <sys/types.h>
#include "eventl.h"
+typedef enum {
+ REQUEST_IDLE, /* the request is just sitting in the queue */
+ REQUEST_PENDING /* operation pending (b'end processing or network I/O*/
+ /* this list will have more elements when acc/res control is added */
+} request_state;
+
typedef struct request
{
int len_refid; /* length of referenceid */
char *refid; /* referenceid */
- enum {
- REQUEST_IDLE, /* the request is just sitting in the queue */
- REQUEST_PENDING /* operation pending (b'end processing or network I/O*/
- /* this list will have more elements when acc/res control is added */
- } state;
+ request_state state;
Z_APDU *request; /* Current request */
NMEM request_mem; /* memory handle for request */
/*
* association state.
*/
+typedef enum
+{
+ ASSOC_NEW, /* not initialized yet */
+ ASSOC_UP, /* normal operation */
+ ASSOC_DEAD /* dead. Close if input arrives */
+} association_state;
+
typedef struct association
{
IOCHAN client_chan; /* event-loop control */
void *backend; /* backend handle */
request_q incoming; /* Q of incoming PDUs */
request_q outgoing; /* Q of outgoing data buffers (enc. PDUs) */
- enum
- {
- ASSOC_NEW, /* not initialized yet */
- ASSOC_UP, /* normal operation */
- ASSOC_DEAD /* dead. Close if input arrives */
- } state;
+ association_state state;
/* session parameters */
int preferredMessageSize;
void request_enq(request_q *q, request *r);
request *request_head(request_q *q);
request *request_deq(request_q *q);
+request *request_deq_x(request_q *q, request *r);
void request_initq(request_q *q);
void request_delq(request_q *q);
request *request_get(request_q *q);
* Chas Woodfield, Fretwell Downing Datasystems.
*
* $Log: statserv.c,v $
- * Revision 1.47 1998-02-10 10:28:57 adam
+ * Revision 1.48 1998-02-11 11:53:36 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.47 1998/02/10 10:28:57 adam
* Added app_name, service_dependencies, service_display_name and
* options_func. options_func allows us to specify a different function
* to interogate the command line arguments. The other members allow us
{
if (pp != h)
{
- COMSTACK l = iochan_getdata(pp);
+ COMSTACK l = (COMSTACK)iochan_getdata(pp);
cs_close(l);
iochan_destroy(pp);
}
/* close our half of the listener socket */
for (pp = pListener; pp; pp = iochan_getnext(pp))
{
- COMSTACK l = iochan_getdata(pp);
+ COMSTACK l = (COMSTACK)iochan_getdata(pp);
cs_close(l);
iochan_destroy(pp);
}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: marcdump.c,v $
- * Revision 1.6 1997-12-12 06:32:33 adam
+ * Revision 1.7 1998-02-11 11:53:36 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.6 1997/12/12 06:32:33 adam
* Added include of string.h.
*
* Revision 1.5 1997/09/24 13:29:40 adam
prog, arg, strerror (errno));
exit (1);
}
- buf = xmalloc (file_size);
+ buf = (char *)xmalloc (file_size);
if (!buf)
{
fprintf (stderr, "%s: cannot xmalloc: %s\n",
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: nmem.c,v $
- * Revision 1.6 1997-10-31 12:20:09 adam
+ * Revision 1.7 1998-02-11 11:53:36 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.6 1997/10/31 12:20:09 adam
* Improved memory debugging for xmalloc/nmem.c. References to NMEM
* instead of ODR in n ESPEC-1 handling in source d1_espec.c.
* Bug fix: missing fclose in data1_read_espec1.
if (get < size)
get = size;
- r = xmalloc(sizeof(*r));
- r->buf = xmalloc(r->size = get);
+ r = (nmem_block *)xmalloc(sizeof(*r));
+ r->buf = (char *)xmalloc(r->size = get);
}
r->top = 0;
return r;
if (r)
cfreelist = cfreelist->next;
else
- r = xmalloc(sizeof(*r));
+ r = (nmem_control *)xmalloc(sizeof(*r));
NMEM_LEAVE;
#if NMEM_DEBUG
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: nmemsdup.c,v $
- * Revision 1.1 1997-09-17 12:10:42 adam
+ * Revision 1.2 1998-02-11 11:53:36 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.1 1997/09/17 12:10:42 adam
* YAZ version 1.4.
*
*/
char *nmem_strdup (NMEM mem, const char *src)
{
- char *dst = nmem_malloc (mem, strlen(src)+1);
+ char *dst = (char *)nmem_malloc (mem, strlen(src)+1);
strcpy (dst, src);
return dst;
}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: pquery.c,v $
- * Revision 1.17 1997-11-24 11:33:57 adam
+ * Revision 1.18 1998-02-11 11:53:36 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.17 1997/11/24 11:33:57 adam
* Using function odr_nullval() instead of global ODR_NULLVAL when
* appropriate.
*
Odr_oct *term_octet;
Z_Term *term;
- zapt = odr_malloc (o, sizeof(*zapt));
- term_octet = odr_malloc (o, sizeof(*term_octet));
- term = odr_malloc (o, sizeof(*term));
+ zapt = (Z_AttributesPlusTerm *)odr_malloc (o, sizeof(*zapt));
+ term_octet = (Odr_oct *)odr_malloc (o, sizeof(*term_octet));
+ term = (Z_Term *)odr_malloc (o, sizeof(*term));
zapt->num_attributes = num_attr;
if (num_attr)
int i;
int *attr_tmp;
- zapt->attributeList = odr_malloc (o, num_attr *
+ zapt->attributeList = (Z_AttributeElement**)odr_malloc (o, num_attr *
sizeof(*zapt->attributeList));
- attr_tmp = odr_malloc (o, num_attr * 2 * sizeof(int));
+ attr_tmp = (int *)odr_malloc (o, num_attr * 2 * sizeof(int));
memcpy (attr_tmp, attr_list, num_attr * 2 * sizeof(int));
for (i = 0; i < num_attr; i++)
{
zapt->attributeList[i] =
- odr_malloc (o,sizeof(**zapt->attributeList));
+ (Z_AttributeElement*)odr_malloc (o,sizeof(**zapt->attributeList));
zapt->attributeList[i]->attributeType = &attr_tmp[2*i];
#ifdef Z_95
if (attr_set[i] == VAL_NONE)
}
}
else
- zapt->attributeList = odr_nullval();
+ zapt->attributeList = (Z_AttributeElement**)odr_nullval();
zapt->term = term;
term->which = Z_Term_general;
term->u.general = term_octet;
- term_octet->buf = odr_malloc (o, li->lex_len);
+ term_octet->buf = (unsigned char *)odr_malloc (o, li->lex_len);
term_octet->size = term_octet->len = li->lex_len;
memcpy (term_octet->buf, li->lex_buf, li->lex_len);
return zapt;
{
Z_Operand *zo;
- zo = odr_malloc (o, sizeof(*zo));
+ zo = (Z_Operand *)odr_malloc (o, sizeof(*zo));
switch (li->query_look)
{
case 't':
if (!li->query_look)
return NULL;
zo->which = Z_Operand_resultSetId;
- zo->u.resultSetId = odr_malloc (o, li->lex_len+1);
+ zo->u.resultSetId = (char *)odr_malloc (o, li->lex_len+1);
memcpy (zo->u.resultSetId, li->lex_buf, li->lex_len);
zo->u.resultSetId[li->lex_len] = '\0';
lex (li);
static Z_ProximityOperator *rpn_proximity (struct lex_info *li, ODR o)
{
- Z_ProximityOperator *p = odr_malloc (o, sizeof(*p));
+ Z_ProximityOperator *p = (Z_ProximityOperator *)odr_malloc (o, sizeof(*p));
if (!lex (li))
return NULL;
if (*li->lex_buf == '1')
{
- p->exclusion = odr_malloc (o, sizeof(*p->exclusion));
+ p->exclusion = (int *)odr_malloc (o, sizeof(*p->exclusion));
*p->exclusion = 1;
}
else if (*li->lex_buf == '0')
{
- p->exclusion = odr_malloc (o, sizeof(*p->exclusion));
+ p->exclusion = (int *)odr_malloc (o, sizeof(*p->exclusion));
*p->exclusion = 0;
}
else
if (!lex (li))
return NULL;
- p->distance = odr_malloc (o, sizeof(*p->distance));
+ p->distance = (int *)odr_malloc (o, sizeof(*p->distance));
*p->distance = atoi (li->lex_buf);
if (!lex (li))
return NULL;
- p->ordered = odr_malloc (o, sizeof(*p->ordered));
+ p->ordered = (int *)odr_malloc (o, sizeof(*p->ordered));
*p->ordered = atoi (li->lex_buf);
if (!lex (li))
return NULL;
- p->relationType = odr_malloc (o, sizeof(*p->relationType));
+ p->relationType = (int *)odr_malloc (o, sizeof(*p->relationType));
*p->relationType = atoi (li->lex_buf);
if (!lex (li))
if (!lex (li))
return NULL;
- p->proximityUnitCode = odr_malloc (o, sizeof(*p->proximityUnitCode));
+ p->proximityUnitCode = (int *)odr_malloc (o, sizeof(*p->proximityUnitCode));
*p->proximityUnitCode = atoi (li->lex_buf);
return p;
Z_Complex *zc;
Z_Operator *zo;
- zc = odr_malloc (o, sizeof(*zc));
- zo = odr_malloc (o, sizeof(*zo));
+ zc = (Z_Complex *)odr_malloc (o, sizeof(*zc));
+ zo = (Z_Operator *)odr_malloc (o, sizeof(*zo));
zc->roperator = zo;
switch (li->query_look)
{
Z_RPNStructure *sz;
const char *cp;
- sz = odr_malloc (o, sizeof(*sz));
+ sz = (Z_RPNStructure *)odr_malloc (o, sizeof(*sz));
switch (li->query_look)
{
case 'a':
oident oset;
int oid[OID_SIZE];
- zq = odr_malloc (o, sizeof(*zq));
+ zq = (Z_RPNQuery *)odr_malloc (o, sizeof(*zq));
lex (li);
if (li->query_look == 'r')
{
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: wrbuf.c,v $
- * Revision 1.3 1997-05-01 15:08:15 adam
+ * Revision 1.4 1998-02-11 11:53:36 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.3 1997/05/01 15:08:15 adam
* Added log_mask_str_x routine.
*
* Revision 1.2 1995/11/01 13:55:06 quinn
{
WRBUF n;
- if (!(n = xmalloc(sizeof(*n))))
+ if (!(n = (WRBUF)xmalloc(sizeof(*n))))
abort();
n->buf = 0;
n->size = 0;
togrow = b->size;
if (togrow < minsize)
togrow = minsize;
- if (b->size && !(b->buf =xrealloc(b->buf, b->size += togrow)))
+ if (b->size && !(b->buf =(char *)xrealloc(b->buf, b->size += togrow)))
abort();
- else if (!b->size && !(b->buf = xmalloc(b->size = togrow)))
+ else if (!b->size && !(b->buf = (char *)xmalloc(b->size = togrow)))
abort();
return 0;
}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: xmalloc.c,v $
- * Revision 1.5 1997-10-31 12:20:09 adam
+ * Revision 1.6 1998-02-11 11:53:36 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.5 1997/10/31 12:20:09 adam
* Improved memory debugging for xmalloc/nmem.c. References to NMEM
* instead of ODR in n ESPEC-1 handling in source d1_espec.c.
* Bug fix: missing fclose in data1_read_espec1.
char *xstrdup_f (const char *s, char *file, int line)
{
- char *p = xmalloc (strlen(s)+1);
+ char *p = (char *)xmalloc (strlen(s)+1);
#if TRACE_XMALLOC
logf (LOG_DEBUG, "%s:%d: xstrdup(s=%d) %p", file, line, strlen(s)+1, p);
#endif
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-ccl.c,v $
- * Revision 1.11 1997-11-24 11:33:57 adam
+ * Revision 1.12 1998-02-11 11:53:36 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.11 1997/11/24 11:33:57 adam
* Using function odr_nullval() instead of global ODR_NULLVAL when
* appropriate.
*
Odr_oct *term_octet;
Z_Term *term;
- zapt = odr_malloc (o, sizeof(*zapt));
+ zapt = (Z_AttributesPlusTerm *)odr_malloc (o, sizeof(*zapt));
assert (zapt);
- term_octet = odr_malloc (o, sizeof(*term_octet));
+ term_octet = (Odr_oct *)odr_malloc (o, sizeof(*term_octet));
assert (term_octet);
- term = odr_malloc (o, sizeof(*term));
+ term = (Z_Term *)odr_malloc (o, sizeof(*term));
assert(term);
for (attr = p->u.t.attr_list; attr; attr = attr->next)
if (num)
{
int i = 0;
- zapt->attributeList = odr_malloc (o, num*sizeof(*zapt->attributeList));
+ zapt->attributeList = (Z_AttributeElement **)odr_malloc (o, num*sizeof(*zapt->attributeList));
assert (zapt->attributeList);
for (attr = p->u.t.attr_list; attr; attr = attr->next, i++)
{
zapt->attributeList[i] =
- odr_malloc (o, sizeof(**zapt->attributeList));
+ (Z_AttributeElement *)odr_malloc (o, sizeof(**zapt->attributeList));
assert (zapt->attributeList[i]);
zapt->attributeList[i]->attributeType =
- odr_malloc(o, sizeof(int));
+ (int *)odr_malloc(o, sizeof(int));
*zapt->attributeList[i]->attributeType = attr->type;
zapt->attributeList[i]->attributeSet = 0;
zapt->attributeList[i]->which = Z_AttributeValue_numeric;
zapt->attributeList[i]->value.numeric =
- odr_malloc (o, sizeof(int));
+ (int *)odr_malloc (o, sizeof(int));
*zapt->attributeList[i]->value.numeric = attr->value;
}
}
else
- zapt->attributeList = odr_nullval();
+ zapt->attributeList = (Z_AttributeElement**)odr_nullval();
zapt->term = term;
term->which = Z_Term_general;
term->u.general = term_octet;
term_octet->len = term_octet->size = strlen (p->u.t.term);
- term_octet->buf = odr_malloc (o, term_octet->len+1);
+ term_octet->buf = (unsigned char *)odr_malloc (o, term_octet->len+1);
strcpy ((char*) term_octet->buf, p->u.t.term);
return zapt;
}
{
Z_Operand *zo;
- zo = odr_malloc (o, sizeof(*zo));
+ zo = (Z_Operand *)odr_malloc (o, sizeof(*zo));
assert (zo);
switch (p->kind)
Z_Complex *zc;
Z_Operator *zo;
- zc = odr_malloc (o, sizeof(*zc));
+ zc = (Z_Complex *)odr_malloc (o, sizeof(*zc));
assert (zc);
- zo = odr_malloc (o, sizeof(*zo));
+ zo = (Z_Operator *)odr_malloc (o, sizeof(*zo));
assert (zo);
zc->roperator = zo;
{
Z_RPNStructure *zs;
- zs = odr_malloc (o, sizeof(*zs));
+ zs = (Z_RPNStructure *)odr_malloc (o, sizeof(*zs));
assert (zs);
switch (p->kind)
{
{
Z_RPNQuery *zq;
- zq = odr_malloc (o, sizeof(*zq));
+ zq = (Z_RPNQuery *)odr_malloc (o, sizeof(*zq));
assert (zq);
zq->attributeSetId = NULL;
zq->RPNStructure = ccl_rpn_structure (o, p);
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: read-grs.c,v $
- * Revision 1.1 1997-09-01 08:55:53 adam
+ * Revision 1.2 1998-02-11 11:53:36 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.1 1997/09/01 08:55:53 adam
* New windows NT/95 port using MSV5.0. Test server ztest now in
* separate directory. When using NT, this test server may operate
* as an NT service. Note that the service.[ch] should be part of
return 0;
if (!r)
{
- r = odr_malloc(o, sizeof(*r));
- r->elements = odr_malloc(o, sizeof(Z_TaggedElement*) *
+ r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r));
+ r->elements = (Z_TaggedElement **)odr_malloc(o, sizeof(Z_TaggedElement*) *
GRS_MAX_FIELDS);
r->num_elements = 0;
}
- r->elements[r->num_elements] = t = odr_malloc(o,
+ r->elements[r->num_elements] = t = (Z_TaggedElement *)odr_malloc(o,
sizeof(Z_TaggedElement));
- t->tagType = odr_malloc(o, sizeof(int));
+ t->tagType = (int *)odr_malloc(o, sizeof(int));
*t->tagType = type;
- t->tagValue = odr_malloc(o, sizeof(Z_StringOrNumeric));
+ t->tagValue = (Z_StringOrNumeric *)odr_malloc(o, sizeof(Z_StringOrNumeric));
if ((ivalue = atoi(value)))
{
t->tagValue->which = Z_StringOrNumeric_numeric;
- t->tagValue->u.numeric = odr_malloc(o, sizeof(int));
+ t->tagValue->u.numeric = (int *)odr_malloc(o, sizeof(int));
*t->tagValue->u.numeric = ivalue;
}
else
{
t->tagValue->which = Z_StringOrNumeric_string;
- t->tagValue->u.string = odr_malloc(o, strlen(value)+1);
+ t->tagValue->u.string = (char *)odr_malloc(o, strlen(value)+1);
strcpy(t->tagValue->u.string, value);
}
t->tagOccurrence = 0;
t->metaData = 0;
t->appliedVariant = 0;
- t->content = c = odr_malloc(o, sizeof(Z_ElementData));
+ t->content = c = (Z_ElementData *)odr_malloc(o, sizeof(Z_ElementData));
if (*buf == '{')
{
c->which = Z_ElementData_subtree;
{
c->which = Z_ElementData_string;
buf[strlen(buf)-1] = '\0';
- c->u.string = odr_malloc(o, strlen(buf)+1);
+ c->u.string = (char *)odr_malloc(o, strlen(buf)+1);
strcpy(c->u.string, buf);
}
r->num_elements++;
* Chas Woodfield, Fretwell Downing Datasystems.
*
* $Log: ztest.c,v $
- * Revision 1.7 1998-02-10 11:03:57 adam
+ * Revision 1.8 1998-02-11 11:53:36 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.7 1998/02/10 11:03:57 adam
* Added support for extended handlers in backend server interface.
*
* Revision 1.6 1998/01/29 13:16:02 adam
bend_initresult *bend_init(bend_initrequest *q)
{
- bend_initresult *r = odr_malloc (q->stream, sizeof(*r));
+ bend_initresult *r = (bend_initresult *) odr_malloc (q->stream, sizeof(*r));
static char *dummy = "Hej fister";
r->errcode = 0;
size = atoin (length_str, 5);
if (size <= 6)
return NULL;
- if (!(buf = xmalloc (size+1)))
+ if (!(buf = (char*) xmalloc (size+1)))
return NULL;
if (fread (buf+5, 1, size-5, inf) != (size-5))
{
xfree(buf);
if (num == 98)
{
- assert(buf = xmalloc(2101));
+ assert(buf = (char*) xmalloc(2101));
memset(buf, 'A', 2100);
buf[2100] = '\0';
break;
bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num)
{
- bend_fetchresult *r = odr_malloc (q->stream, sizeof(*r));
+ bend_fetchresult *r = (bend_fetchresult *)
+ odr_malloc (q->stream, sizeof(*r));
static char *bbb = 0;
r->errstring = 0;
char buf[100];
sprintf(buf, "This is dummy SUTRS record number %d\n", q->number);
- assert(r->record = bbb = xmalloc(strlen(buf)+1));
+ assert(r->record = bbb = (char*) xmalloc(strlen(buf)+1));
strcpy(bbb, buf);
r->len = strlen(buf);
}
*/
bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num)
{
- bend_scanresult *r = odr_malloc (q->stream, sizeof(*r));
+ bend_scanresult *r = (bend_scanresult *) odr_malloc (q->stream, sizeof(*r));
static FILE *f = 0;
static struct scan_entry list[200];
static char entries[200][80];
projects / yaz-moved-to-github.git / commitdiff