aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Vesely2015-02-27 11:47:46 -0600
committerJan Vesely2015-03-14 16:02:06 -0500
commit0706c14e7cc5f1d996bb1c3c526f877c4f8fc215 (patch)
treeece8b3813bb5c3a660df0d41221e7871a568a383 /xf86drm.c
parent13e34308b70a9e0e7682ae7ced29a4aa0c3ad281 (diff)
downloadexternal-libdrm-0706c14e7cc5f1d996bb1c3c526f877c4f8fc215.tar.gz
external-libdrm-0706c14e7cc5f1d996bb1c3c526f877c4f8fc215.tar.xz
external-libdrm-0706c14e7cc5f1d996bb1c3c526f877c4f8fc215.zip
Fix unused, and unused-but-set variables warnings
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> Reviewed-by: Emil Velikov <eil.l.velikov@gmail.com>
Diffstat (limited to 'xf86drm.c')
-rw-r--r--xf86drm.c9
1 files changed, 6 insertions, 3 deletions
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)
313 char buf[64]; 313 char buf[64];
314 int fd; 314 int fd;
315 mode_t devmode = DRM_DEV_MODE, serv_mode; 315 mode_t devmode = DRM_DEV_MODE, serv_mode;
316 gid_t serv_group;
317#if !defined(UDEV)
316 int isroot = !geteuid(); 318 int isroot = !geteuid();
317 uid_t user = DRM_DEV_UID; 319 uid_t user = DRM_DEV_UID;
318 gid_t group = DRM_DEV_GID, serv_group; 320 gid_t group = DRM_DEV_GID;
319 321#endif
322
320 switch (type) { 323 switch (type) {
321 case DRM_NODE_PRIMARY: 324 case DRM_NODE_PRIMARY:
322 dev_name = DRM_DEV_NAME; 325 dev_name = DRM_DEV_NAME;
@@ -338,7 +341,6 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
338 drm_server_info->get_perms(&serv_group, &serv_mode); 341 drm_server_info->get_perms(&serv_group, &serv_mode);
339 devmode = serv_mode ? serv_mode : DRM_DEV_MODE; 342 devmode = serv_mode ? serv_mode : DRM_DEV_MODE;
340 devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH); 343 devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
341 group = (serv_group >= 0) ? serv_group : DRM_DEV_GID;
342 } 344 }
343 345
344#if !defined(UDEV) 346#if !defined(UDEV)
@@ -359,6 +361,7 @@ static int drmOpenDevice(dev_t dev, int minor, int type)
359 } 361 }
360 362
361 if (drm_server_info) { 363 if (drm_server_info) {
364 group = (serv_group >= 0) ? serv_group : DRM_DEV_GID;
362 chown_check_return(buf, user, group); 365 chown_check_return(buf, user, group);
363 chmod(buf, devmode); 366 chmod(buf, devmode);
364 } 367 }