* OF THIS SOFTWARE.
*
* $Log: proto.h,v $
- * Revision 1.16 1995-06-15 07:45:06 quinn
+ * Revision 1.21 1995-08-15 12:00:11 quinn
+ * Updated External
+ *
+ * Revision 1.20 1995/08/10 08:54:35 quinn
+ * Added Explain.
+ *
+ * Revision 1.19 1995/06/19 12:38:28 quinn
+ * Reorganized include-files. Added small features.
+ *
+ * Revision 1.18 1995/06/16 13:16:05 quinn
+ * Fixed Defaultdiagformat.
+ *
+ * Revision 1.17 1995/06/15 15:42:05 quinn
+ * Fixed some v3 bugs
+ *
+ * Revision 1.16 1995/06/15 07:45:06 quinn
* Moving to v3.
*
* Revision 1.15 1995/06/14 15:26:43 quinn
/* ----------------- GLOBAL AUXILIARY DEFS ----------------*/
+struct Z_External;
+typedef struct Z_External Z_External;
+
typedef Odr_oct Z_ReferenceId;
typedef char Z_DatabaseName;
typedef char Z_ResultSetId;
{
char *characterInfo;
Odr_oct *binaryInfo;
- Odr_external *externallyDefinedInfo;
+ Z_External *externallyDefinedInfo;
Odr_oid *oid;
} information;
} Z_OtherInformationUnit;
Z_Unit *unitUsed;
} Z_IntUnit;
+typedef Odr_oct Z_SUTRS;
+
/* ----------------- INIT SERVICE ----------------*/
typedef struct
char *open;
Z_IdPass *idPass;
Odr_null *anonymous;
- Odr_external *other;
+ Z_External *other;
} u;
} Z_IdAuthentication;
char *implementationId; /* OPTIONAL */
char *implementationName; /* OPTIONAL */
char *implementationVersion; /* OPTIONAL */
- Odr_external *userInformationField; /* OPTIONAL */
+ Z_External *userInformationField; /* OPTIONAL */
#ifdef Z_95
Z_OtherInformation *otherInfo; /* OPTIONAL */
#endif
char *implementationId; /* OPTIONAL */
char *implementationName; /* OPTIONAL */
char *implementationVersion; /* OPTIONAL */
- Odr_external *userInformationField; /* OPTIONAL */
+ Z_External *userInformationField; /* OPTIONAL */
#ifdef Z_95
Z_OtherInformation *otherInfo; /* OPTIONAL */
#endif
char *characterString;
Odr_oid *oid;
char *dateTime;
- Odr_external *external;
+ Z_External *external;
/* Z_IntUnit *integerAndUnit; */
Odr_null *null;
} u;
/* ------------------------ RECORD -------------------------- */
-typedef Odr_external Z_DatabaseRecord;
+typedef Z_External Z_DatabaseRecord;
#ifdef Z_95
{
Odr_oid *diagnosticSetId; /* This is opt'l to interwork with bad targets */
int *condition;
+ /* until the whole character set issue becomes more definite,
+ * you can probably ignore this on input. */
+ enum
+ {
+ Z_DiagForm_v2AddInfo,
+ Z_DiagForm_v3AddInfo
+ } which;
char *addinfo;
} Z_DefaultDiagFormat;
union
{
Z_DefaultDiagFormat *defaultFormat;
- Odr_external *externallyDefined;
+ Z_External *externallyDefined;
} u;
} Z_DiagRec;
#endif
-typedef struct Z_DiagRecList
+typedef struct Z_DiagRecs
{
- int num;
- Z_DiagRec **list;
-} Z_DiagRecList;
+ int num_diagRecs;
+ Z_DiagRec **diagRecs;
+} Z_DiagRecs;
typedef struct Z_NamePlusRecord
{
enum
{
Z_NamePlusRecord_databaseRecord,
- Z_NamePlusRecord_surrogateDiagnostic,
- Z_NamePlusRecord_multipleNonSurDiagnostics
+ Z_NamePlusRecord_surrogateDiagnostic
}
which;
union
{
Z_DatabaseRecord *databaseRecord;
Z_DiagRec *surrogateDiagnostic;
- Z_DiagRecList *multipleNonSurDiagnostics;
} u;
} Z_NamePlusRecord;
{
Z_NamePlusRecordList *databaseOrSurDiagnostics;
Z_DiagRec *nonSurrogateDiagnostic;
- Z_DiagRecList *multipleNonSurDiagnostics;
+ Z_DiagRecs *multipleNonSurDiagnostics;
} u;
} Z_Records;
union
{
char *elementSetName;
- Odr_external *externalSpec;
+ Z_External *externalSpec;
} u;
} Z_ElementSpec;
{
Z_ReferenceId *referenceId; /* OPTIONAL */
bool_t *suspendedFlag; /* OPTIONAL */
- Odr_external *resourceReport; /* OPTIONAL */
+ Z_External *resourceReport; /* OPTIONAL */
int *partialResultsAvailable; /* OPTIONAL */
#define Z_ResourceControlRequest_subset 1
#define Z_ResourceControlRequest_interim 2
union
{
Odr_oct *simpleForm;
- Odr_external *externallyDefined;
+ Z_External *externallyDefined;
} u;
#ifdef Z_95
Z_OtherInformation *otherInfo; /* OPTIONAL */
union
{
Odr_oct *simpleForm;
- Odr_external *externallyDefined;
+ Z_External *externallyDefined;
} u;
Z_DiagRec *diagnostic; /* OPTIONAL */
#ifdef Z_95
Z_Entry **entries;
} Z_Entries;
-typedef struct Z_DiagRecs
-{
- int num_diagRecs;
- Z_DiagRec **diagRecs;
-} Z_DiagRecs;
-
typedef struct Z_ListEntries
{
enum
#define Z_Close_unspecified 9
char *diagnosticInformation; /* OPTIONAL */
Odr_oid *resourceReportFormat; /* OPTIONAL */
- Odr_external *resourceReport; /* OPTIONAL */
+ Z_External *resourceReport; /* OPTIONAL */
#ifdef Z_95
Z_OtherInformation *otherInfo; /* OPTIONAL */
#endif
} Z_APDU;
int z_APDU(ODR o, Z_APDU **p, int opt);
+int z_SUTRS(ODR o, Odr_oct **p, int opt);
Z_InitRequest *zget_InitRequest(ODR o);
Z_InitResponse *zget_InitResponse(ODR o);
Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o);
Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o);
Z_Close *zget_Close(ODR o);
+int z_InternationalString(ODR o, char **p, int opt);
+int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt);
+int z_ElementSetName(ODR o, char **p, int opt);
+int z_IntUnit(ODR o, Z_IntUnit **p, int opt);
+int z_Unit(ODR o, Z_Unit **p, int opt);
+int z_DatabaseName(ODR o, Z_DatabaseName **p, int opt);
+int z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt);
+int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt);
+int z_Term(ODR o, Z_Term **p, int opt);
+int z_Specification(ODR o, Z_Specification **p, int opt);
Z_APDU *zget_APDU(ODR o, enum Z_APDU_which which);
#include <prt-rsc.h>
#include <prt-acc.h>
+#include <prt-exp.h>
+#include <prt-ext.h>
#endif