getLAnglebracket(in);
f->type = parseType(in,NULL, unnamed_types, named_types);
- /* Those will be set later by preset_field_type_size */
- f->fixed_root = FIELD_UNKNOWN;
- f->fixed_parent = FIELD_UNKNOWN;
- f->fixed_size = FIELD_UNKNOWN;
-
if(tag) {
getLAnglebracket(in);
getForwardslash(in);
getForwardslash(in);
getRAnglebracket(in); //<array size=n>
- getLAnglebracket(in); //<subtype>
+ //getLAnglebracket(in); //<subtype>
/* subfield */
f = (field_t *)memAlloc(sizeof(field_t));
sequence_push(&(t->fields),f);
//getForwardslash(in);
getRAnglebracket(in); //<sequence>
- getLAnglebracket(in); //<sequence size type>
+ //getLAnglebracket(in); //<sequence size type>
/* subfield */
f = (field_t *)memAlloc(sizeof(field_t));
sequence_push(&(t->fields),f);
parseFields(in, f, unnamed_types, named_types, 0);
- getLAnglebracket(in); //<subtype>
+ //getLAnglebracket(in); //<subtype>
/* subfield */
f = (field_t *)memAlloc(sizeof(field_t));
sequence_push(&(t->fields),f);
type_descriptor_t *t;
t = table_find(named_types,name);
- if(t == NULL) {
- t = (type_descriptor_t *)memAlloc(sizeof(type_descriptor_t));
- t->type_name = allocAndCopy(name);
- t->type = NONE;
- t->fmt = NULL;
- table_insert(named_types,t->type_name,t);
- // table_insert(named_types,allocAndCopy(name),t);
- }
+
return t;
-}
+}
+
+type_descriptor_t * create_named_type(char *name, table_t * named_types)
+{
+ type_descriptor_t *t;
+
+ t = (type_descriptor_t *)memAlloc(sizeof(type_descriptor_t));
+ t->type_name = allocAndCopy(name);
+ t->type = NONE;
+ t->fmt = NULL;
+ table_insert(named_types,t->type_name,t);
+ // table_insert(named_types,allocAndCopy(name),t);
+ return t;
+}
/*****************************************************************************
*Function name
token = getNameAttribute(in);
if(token == NULL) in->error(in, "Type has empty name");
- t = find_named_type(token, named_types);
+ t = create_named_type(token, named_types);
if(t->type != NONE) in->error(in,"redefinition of named type");
getRAnglebracket(in); //<type name=type_name>
****************************************************************************/
void generateChecksum(char* facName,
- unsigned long * checksum, sequence_t * events)
+ unsigned int * checksum, sequence_t * events)
{
unsigned long crc ;
int pos;
flag = 1;
break;
case ARRAY:
- sprintf(buf,"%llu", type->size);
+ sprintf(buf,"%zu", type->size);
str = appendString("array ",buf);
flag = 1;
break;
case SEQUENCE:
- sprintf(buf,"%llu", type->size);
+ sprintf(buf,"%zu", type->size);
str = appendString("sequence ",buf);
flag = 1;
break;
if(type->fmt) crc = partial_crc32(type->fmt,crc);
- if(type->type == ARRAY || type->type == SEQUENCE){
- crc = getTypeChecksum(crc,type->nested_type);
- }else if(type->type == STRUCT || type->type == UNION){
+ if(type->type == ARRAY){
+ crc = getTypeChecksum(crc,((field_t*)type->fields.array[0])->type);
+ } else if(type->type ==SEQUENCE) {
+ crc = getTypeChecksum(crc,((field_t*)type->fields.array[0])->type);
+ crc = getTypeChecksum(crc,((field_t*)type->fields.array[1])->type);
+ } else if(type->type == STRUCT || type->type == UNION){
for(pos =0; pos < type->fields.position; pos++){
fld = (field_t *) type->fields.array[pos];
crc = partial_crc32(fld->name,crc);