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

security_dac: annotate some functions with ATTRIBUTE_NONNULL

Browse Source 
Annotate some static function parameters with ATTRIBUTE_NONNULL
and remove checks for NULL inputs.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Jim Fehlig 2014-05-13 15:38:00 -06:00
parent 3931ba2d44
commit e1ce6d836e
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/security/security_dac.c
View File

@ -81,10 +81,9 @@ virSecurityDACSetDynamicOwnership(virSecurityManagerPtr mgr,
/* returns 1 if label isn't found, 0 on success, -1 on error */ /* returns 1 if label isn't found, 0 on success, -1 on error */
static int static int
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
virSecurityDACParseIds(virDomainDefPtr def, uid_t *uidPtr, gid_t *gidPtr) virSecurityDACParseIds(virDomainDefPtr def, uid_t *uidPtr, gid_t *gidPtr)
{ {
uid_t uid;
gid_t gid;
virSecurityLabelDefPtr seclabel; virSecurityLabelDefPtr seclabel;
if (def == NULL) if (def == NULL)
@ -96,18 +95,14 @@ virSecurityDACParseIds(virDomainDefPtr def, uid_t *uidPtr, gid_t *gidPtr)
return 1; return 1;
} }
if (virParseOwnershipIds(seclabel->label, &uid, &gid) < 0) if (virParseOwnershipIds(seclabel->label, uidPtr, gidPtr) < 0)
return -1; return -1;
if (uidPtr)
*uidPtr = uid;
if (gidPtr)
*gidPtr = gid;
return 0; return 0;
} }
static int static int
ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4)
virSecurityDACGetIds(virDomainDefPtr def, virSecurityDACDataPtr priv, virSecurityDACGetIds(virDomainDefPtr def, virSecurityDACDataPtr priv,
uid_t *uidPtr, gid_t *gidPtr, uid_t *uidPtr, gid_t *gidPtr,
gid_t **groups, int *ngroups) gid_t **groups, int *ngroups)
@ -136,10 +131,8 @@ virSecurityDACGetIds(virDomainDefPtr def, virSecurityDACDataPtr priv,
return -1; return -1;
} }
if (uidPtr) *uidPtr = priv->user;
*uidPtr = priv->user; *gidPtr = priv->group;
if (gidPtr)
*gidPtr = priv->group;
return 0; return 0;
} }
@ -147,11 +140,10 @@ virSecurityDACGetIds(virDomainDefPtr def, virSecurityDACDataPtr priv,
/* returns 1 if label isn't found, 0 on success, -1 on error */ /* returns 1 if label isn't found, 0 on success, -1 on error */
static int static int
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
virSecurityDACParseImageIds(virDomainDefPtr def, virSecurityDACParseImageIds(virDomainDefPtr def,
uid_t *uidPtr, gid_t *gidPtr) uid_t *uidPtr, gid_t *gidPtr)
{ {
uid_t uid;
gid_t gid;
virSecurityLabelDefPtr seclabel; virSecurityLabelDefPtr seclabel;
if (def == NULL) if (def == NULL)
@ -163,18 +155,14 @@ virSecurityDACParseImageIds(virDomainDefPtr def,
return 1; return 1;
} }
if (virParseOwnershipIds(seclabel->imagelabel, &uid, &gid) < 0) if (virParseOwnershipIds(seclabel->imagelabel, uidPtr, gidPtr) < 0)
return -1; return -1;
if (uidPtr)
*uidPtr = uid;
if (gidPtr)
*gidPtr = gid;
return 0; return 0;
} }
static int static int
ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4)
virSecurityDACGetImageIds(virDomainDefPtr def, virSecurityDACDataPtr priv, virSecurityDACGetImageIds(virDomainDefPtr def, virSecurityDACDataPtr priv,
uid_t *uidPtr, gid_t *gidPtr) uid_t *uidPtr, gid_t *gidPtr)
{ {
@ -197,10 +185,8 @@ virSecurityDACGetImageIds(virDomainDefPtr def, virSecurityDACDataPtr priv,
return -1; return -1;
} }
if (uidPtr) *uidPtr = priv->user;
*uidPtr = priv->user; *gidPtr = priv->group;
if (gidPtr)
*gidPtr = priv->group;
return 0; return 0;
} }