/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: proto.c,v $
- * Revision 1.20 1995-05-15 11:55:25 quinn
+ * Revision 1.21 1995-05-16 08:50:24 quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.20 1995/05/15 11:55:25 quinn
* Smallish.
*
* Revision 1.19 1995/04/11 11:58:35 quinn
int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
return
odr_visiblestring(o, &(*p)->user, 0) &&
odr_visiblestring(o, &(*p)->password, 0) &&
int z_IdPass(ODR o, Z_IdPass **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
return
odr_implicit(o, odr_visiblestring, &(*p)->groupId, ODR_CONTEXT, 0, 0) &&
odr_implicit(o, odr_visiblestring, &(*p)->userId, ODR_CONTEXT, 1, 0) &&
odr_constructed_end(o))
return 1;
*p = 0;
- return opt && !o->error;
+ return opt && odr_ok(o);
}
int z_Operand(ODR o, Z_Operand **p, int opt)
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
return 1;
*p = 0;
- return opt && !o->error;
+ return opt && odr_ok(o);
}
int z_RPNStructure(ODR o, Z_RPNStructure **p, int opt);
int z_Complex(ODR o, Z_Complex **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
return
z_RPNStructure(o, &(*p)->s1, 0) &&
z_RPNStructure(o, &(*p)->s2, 0) &&
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
return 1;
*p = 0;
- return opt && !o->error;
+ return opt && odr_ok(o);
}
int z_RPNQuery(ODR o, Z_RPNQuery **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
return
odr_oid(o, &(*p)->attributeSetId, 0) &&
z_RPNStructure(o, &(*p)->RPNStructure, 0) &&
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
return 1;
*p = 0;
- return opt && !o->error;
+ return opt && odr_ok(o);
}
int z_SearchRequest(ODR o, Z_SearchRequest **p, int opt)
Z_SearchRequest *pp;
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
pp = *p;
return
z_ReferenceId(o, &pp->referenceId, 1) &&
int z_DiagRec(ODR o, Z_DiagRec **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
return
odr_oid(o, &(*p)->diagnosticSetId, 1) && /* SHOULD NOT BE OPT */
odr_integer(o, &(*p)->condition, 0) &&
};
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
return
odr_implicit(o, z_DatabaseName, &(*p)->databaseName, ODR_CONTEXT,
0, 1) &&
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
return 1;
*p = 0;
- return opt && !o->error;
+ return opt && odr_ok(o);
}
/* ------------------------ SCAN SERVICE -------------------- */
&(*p)->num_attributes))
return 1;
*p = 0;
- return opt && !o->error;
+ return opt && odr_ok(o);
}
/*
if (!odr_constructed_begin(o, p, ODR_CONTEXT, 4))
{
o->t_class = -1;
- return opt;
+ return opt && odr_ok(o);
}
if (!odr_constructed_begin(o, p, ODR_CONTEXT, 1))
return 0;
else if (!*p)
{
o->t_class = -1;
- return opt;
+ return opt && odr_ok(o);
}
if (odr_sequence_of(o, z_AttributesPlusTerm, &(*p)->terms,
int z_OccurrenceByAttributes(ODR o, Z_OccurrenceByAttributes **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
return
odr_explicit(o, z_AttributeList, &(*p)->attributes, ODR_CONTEXT, 1, 1)&&
odr_explicit(o, odr_integer, &(*p)->global, ODR_CONTEXT, 2, 1) &&
int z_TermInfo(ODR o, Z_TermInfo **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
return
(willow_scan ?
odr_implicit(o, z_Term, &(*p)->term, ODR_CONTEXT, 1, 0) :
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
return 1;
*p = 0;
- return opt && !o->error;
+ return opt && odr_ok(o);
}
int z_Entries(ODR o, Z_Entries **p, int opt)
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
return 1;
*p = 0;
- return opt && !o->error;
+ return opt && odr_ok(o);
}
int z_ScanRequest(ODR o, Z_ScanRequest **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
willow_scan = 0;
return
z_ReferenceId(o, &(*p)->referenceId, 1) &&
int z_ScanResponse(ODR o, Z_ScanResponse **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
return
z_ReferenceId(o, &(*p)->referenceId, 1) &&
odr_implicit(o, odr_integer, &(*p)->stepSize, ODR_CONTEXT, 3, 1) &&
Z_SearchResponse *pp;
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
pp = *p;
return
z_ReferenceId(o, &pp->referenceId, 1) &&
Z_PresentRequest *pp;
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
pp = *p;
return
z_ReferenceId(o, &pp->referenceId, 1) &&
Z_PresentResponse *pp;
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
pp = *p;
return
z_ReferenceId(o, &pp->referenceId, 1) &&
{
if (o->direction == ODR_DECODE)
*p = 0;
- return opt && !o->error;
+ return opt && odr_ok(o);
}
return 1;
}