shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-27 18:03:50 +03:00
Code Releases Activity

storagefile: Rename qcow2GetExtensions 'format' argument

Browse Source 
To backingFormat, which makes it more clear. Move it to the end of
the argument list which will scale nicer with future patches

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2019-10-04 18:47:24 -04:00
parent 125dbad3af
commit c87784be89
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/virstoragefile.c
View File

@ -427,9 +427,9 @@ cowGetBackingStore(char **res,
static int static int
qcow2GetExtensions(int *format, qcow2GetExtensions(const char *buf,
const char *buf, size_t buf_size,
size_t buf_size) int *backingFormat)
{ {
size_t offset; size_t offset;
size_t extension_start; size_t extension_start;
@ -509,8 +509,8 @@ qcow2GetExtensions(int *format,
case QCOW2_HDR_EXTENSION_BACKING_FORMAT: case QCOW2_HDR_EXTENSION_BACKING_FORMAT:
if (buf[offset+len] != '\0') if (buf[offset+len] != '\0')
break; break;
*format = virStorageFileFormatTypeFromString(buf+offset); *backingFormat = virStorageFileFormatTypeFromString(buf+offset);
if (*format <= VIR_STORAGE_FILE_NONE) if (*backingFormat <= VIR_STORAGE_FILE_NONE)
return -1; return -1;
} }
@ -561,7 +561,7 @@ qcowXGetBackingStore(char **res,
memcpy(*res, buf + offset, size); memcpy(*res, buf + offset, size);
(*res)[size] = '\0'; (*res)[size] = '\0';
if (qcow2GetExtensions(format, buf, buf_size) < 0) if (qcow2GetExtensions(buf, buf_size, format) < 0)
return BACKING_STORE_INVALID; return BACKING_STORE_INVALID;
return BACKING_STORE_OK; return BACKING_STORE_OK;