External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

virStringListLength: Ensure const correctness

Browse Source 
The virStringListLength function does not ever modify the passed
string list. It merely counts the items in it. Make sure that we
reflect this bit in the function header.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

(crobinso: fix up spacing and squash in sheepdog bit suggested
 by Andrea)
This commit is contained in:
Michal Privoznik 2016-02-09 18:18:49 +01:00 committed by Cole Robinson
parent 129c35326a
commit d1a7102389
8 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lxc/lxc_native.c
View File

@ -611,7 +611,7 @@ lxcNetworkWalkCallback(const char *name, virConfValuePtr value, void *data)
family = AF_INET6;
ipparts = virStringSplit(value->str, "/", 2);
if (virStringListLength(ipparts) != 2 ||
if (virStringListLength((const char * const *)ipparts) != 2 ||
virSocketAddrParse(&ip->address, ipparts[0], family) < 0 ||
virStrToLong_ui(ipparts[1], NULL, 10, &ip->prefix) < 0) {

3
src/storage/storage_backend_sheepdog.c
View File

@ -167,7 +167,8 @@ virStorageBackendSheepdogRefreshAllVol(virConnectPtr conn ATTRIBUTE_UNUSED,
cells = virStringSplit(line, " ", 0);
if (cells != NULL && virStringListLength(cells) > 2) {
if (cells != NULL &&
virStringListLength((const char * const *)cells) > 2) {
if (virStorageBackendSheepdogAddVolume(conn, pool, cells[1]) < 0)
goto cleanup;
}

2
src/storage/storage_driver.c
View File

@ -3209,7 +3209,7 @@ virStorageAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
if (!(tokens = virStringSplit(def->src->srcpool->volume, ":", 0)))
goto cleanup;
if (virStringListLength(tokens) != 4) {
if (virStringListLength((const char * const *)tokens) != 4) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected iscsi volume name '%s'"),
def->src->srcpool->volume);

2
src/util/virprocess.c
View File

@ -965,7 +965,7 @@ int virProcessGetStartTime(pid_t pid,
tokens = virStringSplit(tmp, " ", 0);
if (virStringListLength(tokens) < 20) {
if (virStringListLength((const char * const *)tokens) < 20) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Cannot find start time in %s"),
filename);

2
src/util/virstoragefile.c
View File

@ -1283,7 +1283,7 @@ virStorageFileParseChainIndex(const char *diskTarget,
if (name && diskTarget)
strings = virStringSplit(name, "[", 2);
if (virStringListLength(strings) != 2)
if (virStringListLength((const char * const *)strings) != 2)
goto cleanup;
if (virStrToLong_uip(strings[1], &suffix, 10, &idx) < 0 ||

2
src/util/virstring.c
View File

@ -765,7 +765,7 @@ virStrndup(char **dest,
}
size_t virStringListLength(char **strings)
size_t virStringListLength(const char * const *strings)
{
size_t i = 0;

2
src/util/virstring.h
View File

@ -201,7 +201,7 @@ int virVasprintfInternal(bool report, int domcode, const char *filename,
# define VIR_STRNDUP_QUIET(dst, src, n) virStrndup(&(dst), src, n, false, \
0, NULL, NULL, 0)
size_t virStringListLength(char **strings);
size_t virStringListLength(const char * const *strings);
/**
* virVasprintf

4
tests/virstringtest.c
View File

@ -336,10 +336,10 @@ testStringSearch(const void *opaque)
goto cleanup;
}
if (virStringListLength(matches) != nmatches) {
if (virStringListLength((const char * const *)matches) != nmatches) {
fprintf(stderr, "expected %zu matches on %s but got %zd matches\n",
data->expectNMatches, data->str,
virStringListLength(matches));
virStringListLength((const char * const *)matches));
goto cleanup;
}