cbfs: Rename the result variable

At present the result variable in the cbfs_priv is called 'result' as is
the local variable in a few functions. Change the latter to 'ret' which is
more common in U-Boot and avoids confusion.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2020-05-24 17:38:12 -06:00 committed by Bin Meng
parent 30cf2ba7c6
commit ea38ee93ef

View file

@ -145,18 +145,18 @@ static void file_cbfs_fill_cache(struct cbfs_priv *priv, u8 *start, u32 size,
priv->file_cache = NULL; priv->file_cache = NULL;
while (size >= align) { while (size >= align) {
int result; int ret;
u32 used; u32 used;
new_node = (struct cbfs_cachenode *) new_node = (struct cbfs_cachenode *)
malloc(sizeof(struct cbfs_cachenode)); malloc(sizeof(struct cbfs_cachenode));
result = file_cbfs_next_file(priv, start, size, align, new_node, ret = file_cbfs_next_file(priv, start, size, align, new_node,
&used); &used);
if (result < 0) { if (ret < 0) {
free(new_node); free(new_node);
return; return;
} else if (result == 0) { } else if (ret == 0) {
free(new_node); free(new_node);
break; break;
} }
@ -341,15 +341,15 @@ const struct cbfs_cachenode *file_cbfs_find_uncached(uintptr_t end_of_rom,
align = priv->header.align; align = priv->header.align;
while (size >= align) { while (size >= align) {
int result; int ret;
u32 used; u32 used;
result = file_cbfs_next_file(priv, start, size, align, &node, ret = file_cbfs_next_file(priv, start, size, align, &node,
&used); &used);
if (result < 0) if (ret < 0)
return NULL; return NULL;
else if (result == 0) else if (ret == 0)
break; break;
if (!strcmp(name, node.name)) if (!strcmp(name, node.name))