if (cp_value_end != cp_value_start &&
strchr(" \t\r\n", cp_value_end[-1]))
cp_value_end--;
if (cp_value_end != cp_value_start &&
strchr(" \t\r\n", cp_value_end[-1]))
cp_value_end--;
- *pp = malloc (sizeof(**pp));
- (*pp)->pattern = malloc (cp_pattern_end - line + 1);
+ *pp = (struct cql_prop_entry *) malloc (sizeof(**pp));
+ (*pp)->pattern = (char *) malloc (cp_pattern_end - line + 1);
memcpy ((*pp)->pattern, line, cp_pattern_end - line);
(*pp)->pattern[cp_pattern_end-line] = 0;
memcpy ((*pp)->pattern, line, cp_pattern_end - line);
(*pp)->pattern[cp_pattern_end-line] = 0;
if (cp_value_start != cp_value_end)
memcpy ((*pp)->value, cp_value_start, cp_value_end-cp_value_start);
(*pp)->value[cp_value_end - cp_value_start] = 0;
if (cp_value_start != cp_value_end)
memcpy ((*pp)->value, cp_value_start, cp_value_end-cp_value_start);
(*pp)->value[cp_value_end - cp_value_start] = 0;
- if (cn->u.bool.prefixes && prefix_level < 20)
- prefix_ar[prefix_level++] = cn->u.bool.prefixes;
+ if (cn->u.boolean.prefixes && prefix_level < 20)
+ prefix_ar[prefix_level++] = cn->u.boolean.prefixes;
- cql_transform_r(ct, cn->u.bool.left, pr, client_data,
+ cql_transform_r(ct, cn->u.boolean.left, pr, client_data,
- cql_transform_r(ct, cn->u.bool.right, pr, client_data,
+ cql_transform_r(ct, cn->u.boolean.right, pr, client_data,