From 0706c14e7cc5f1d996bb1c3c526f877c4f8fc215 Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Fri, 27 Feb 2015 12:47:46 -0500 Subject: Fix unused, and unused-but-set variables warnings Signed-off-by: Jan Vesely Reviewed-by: Emil Velikov --- xf86drm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'xf86drm.c') diff --git a/xf86drm.c b/xf86drm.c index 34728bec..051ed5d5 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -313,10 +313,13 @@ static int drmOpenDevice(dev_t dev, int minor, int type) char buf[64]; int fd; mode_t devmode = DRM_DEV_MODE, serv_mode; + gid_t serv_group; +#if !defined(UDEV) int isroot = !geteuid(); uid_t user = DRM_DEV_UID; - gid_t group = DRM_DEV_GID, serv_group; - + gid_t group = DRM_DEV_GID; +#endif + switch (type) { case DRM_NODE_PRIMARY: dev_name = DRM_DEV_NAME; @@ -338,7 +341,6 @@ static int drmOpenDevice(dev_t dev, int minor, int type) drm_server_info->get_perms(&serv_group, &serv_mode); devmode = serv_mode ? serv_mode : DRM_DEV_MODE; devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH); - group = (serv_group >= 0) ? serv_group : DRM_DEV_GID; } #if !defined(UDEV) @@ -359,6 +361,7 @@ static int drmOpenDevice(dev_t dev, int minor, int type) } if (drm_server_info) { + group = (serv_group >= 0) ? serv_group : DRM_DEV_GID; chown_check_return(buf, user, group); chmod(buf, devmode); } -- cgit v1.2.3