DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

blob: refactor attr parsing into separate function

Browse source 
Making blob_parse easier to review.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
This commit is contained in:
Petr Štetiar 2019-12-09 13:53:27 +01:00
parent 833d25797b
commit 6d27336e4a
1 changed files with 37 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
blob.c
View file

@ -217,6 +217,41 @@ blob_check_type(const void *ptr, unsigned int len, int type)
return true; return true;
} }
static int
blob_parse_attr(struct blob_attr *attr, struct blob_attr **data, const struct blob_attr_info *info, int max)
{
int found = 0;
int id = blob_id(attr);
size_t len = blob_len(attr);
if (id >= max)
return 0;
if (info) {
int type = info[id].type;
if (type < BLOB_ATTR_LAST) {
if (!blob_check_type(blob_data(attr), len, type))
return 0;
}
if (info[id].minlen && len < info[id].minlen)
return 0;
if (info[id].maxlen && len > info[id].maxlen)
return 0;
if (info[id].validate && !info[id].validate(&info[id], attr))
return 0;
}
if (!data[id])
found++;
data[id] = attr;
return found;
}
int int
blob_parse(struct blob_attr *attr, struct blob_attr **data, const struct blob_attr_info *info, int max) blob_parse(struct blob_attr *attr, struct blob_attr **data, const struct blob_attr_info *info, int max)
{ {
@ -226,35 +261,9 @@ blob_parse(struct blob_attr *attr, struct blob_attr **data, const struct blob_at
memset(data, 0, sizeof(struct blob_attr *) * max); memset(data, 0, sizeof(struct blob_attr *) * max);
blob_for_each_attr(pos, attr, rem) { blob_for_each_attr(pos, attr, rem) {
int id = blob_id(pos); found += blob_parse_attr(pos, data, info, max);
size_t len = blob_len(pos);
if (id >= max)
continue;
if (info) {
int type = info[id].type;
if (type < BLOB_ATTR_LAST) {
if (!blob_check_type(blob_data(pos), len, type))
continue;
}
if (info[id].minlen && len < info[id].minlen)
continue;
if (info[id].maxlen && len > info[id].maxlen)
continue;
if (info[id].validate && !info[id].validate(&info[id], pos))
continue;
}
if (!data[id])
found++;
data[id] = pos;
} }
return found; return found;
} }