External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

util: Add virFileReadValueUllongQuiet

Browse Source 
Use function virFileReadValueUllongQuiet to read unsigned long
long value without error report.

Signed-off-by: Yang Fei <yangfei85@huawei.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Yang Fei 2021-07-22 16:05:00 +08:00 committed by Michal Privoznik
parent d2ce164ee2
commit b8674109ee
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libvirt_private.syms
View File

@ -2244,6 +2244,7 @@ virFileReadValueScaledInt;
virFileReadValueString; virFileReadValueString;
virFileReadValueUint; virFileReadValueUint;
virFileReadValueUllong; virFileReadValueUllong;
virFileReadValueUllongQuiet;
virFileRelLinkPointsTo; virFileRelLinkPointsTo;
virFileRemove; virFileRemove;
virFileRemoveLastComponent; virFileRemoveLastComponent;

24
src/util/virfile.c
View File

@ -4065,6 +4065,30 @@ virFileReadValueUllong(unsigned long long *value, const char *format, ...)
return 0; return 0;
} }
int
virFileReadValueUllongQuiet(unsigned long long *value, const char *format, ...)
{
g_autofree char *str = NULL;
g_autofree char *path = NULL;
va_list ap;
va_start(ap, format);
path = g_strdup_vprintf(format, ap);
va_end(ap);
if (!virFileExists(path))
return -2;
if (virFileReadAllQuiet(path, VIR_INT64_STR_BUFLEN, &str) < 0)
return -1;
virStringTrimOptionalNewline(str);
if (virStrToLong_ullp(str, NULL, 10, value) < 0)
return -1;
return 0;
}
/** /**
* virFileReadValueScaledInt: * virFileReadValueScaledInt:

2
src/util/virfile.h
View File

@ -339,6 +339,8 @@ int virFileReadValueUint(unsigned int *value, const char *format, ...)
G_GNUC_PRINTF(2, 3); G_GNUC_PRINTF(2, 3);
int virFileReadValueUllong(unsigned long long *value, const char *format, ...) int virFileReadValueUllong(unsigned long long *value, const char *format, ...)
G_GNUC_PRINTF(2, 3); G_GNUC_PRINTF(2, 3);
int virFileReadValueUllongQuiet(unsigned long long *value, const char *format, ...)
G_GNUC_PRINTF(2, 3);
int virFileReadValueBitmap(virBitmap **value, const char *format, ...) int virFileReadValueBitmap(virBitmap **value, const char *format, ...)
G_GNUC_PRINTF(2, 3); G_GNUC_PRINTF(2, 3);
int virFileReadValueScaledInt(unsigned long long *value, const char *format, ...) int virFileReadValueScaledInt(unsigned long long *value, const char *format, ...)