summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Vesely <jan.vesely@rutgers.edu>2014-11-30 12:53:18 -0500
committerJan Vesely <jan.vesely@rutgers.edu>2015-02-10 15:25:28 -0500
commitde8532dd8359dfdaba839ff61fc9e2f05eaf57d3 (patch)
tree1e360fd714028ed930971921f2db23533e2bf46f
parent6ce06202ddcb979db47b67a508db96ed049f0768 (diff)
Fix gcc -Wextra warnings
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> Reviewed-by: Ian Romanick <idr@freedesktop.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
-rw-r--r--tests/vbltest/vbltest.c3
-rw-r--r--xf86drm.c4
-rw-r--r--xf86drmMode.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/tests/vbltest/vbltest.c b/tests/vbltest/vbltest.c
index cdc1ef6b..6e13c57c 100644
--- a/tests/vbltest/vbltest.c
+++ b/tests/vbltest/vbltest.c
@@ -104,7 +104,8 @@ static void usage(char *name)
int main(int argc, char **argv)
{
- int i, c, fd, ret;
+ unsigned i;
+ int c, fd, ret;
char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "exynos", "omapdrm", "tilcdc", "msm", "tegra" };
drmVBlank vbl;
drmEventContext evctx;
diff --git a/xf86drm.c b/xf86drm.c
index 345325a3..fb673b58 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -303,7 +303,7 @@ static int chown_check_return(const char *path, uid_t owner, gid_t group)
* special file node with the major and minor numbers specified by \p dev and
* parent directory if necessary and was called by root.
*/
-static int drmOpenDevice(long dev, int minor, int type)
+static int drmOpenDevice(dev_t dev, int minor, int type)
{
stat_t st;
const char *dev_name;
@@ -2213,7 +2213,7 @@ int drmGetClient(int fd, int idx, int *auth, int *pid, int *uid,
int drmGetStats(int fd, drmStatsT *stats)
{
drm_stats_t s;
- int i;
+ unsigned i;
if (drmIoctl(fd, DRM_IOCTL_GET_STATS, &s))
return -errno;
diff --git a/xf86drmMode.c b/xf86drmMode.c
index 60ce3699..e3e599bd 100644
--- a/xf86drmMode.c
+++ b/xf86drmMode.c
@@ -854,7 +854,7 @@ int drmHandleEvent(int fd, drmEventContextPtr evctx)
len = read(fd, buffer, sizeof buffer);
if (len == 0)
return 0;
- if (len < sizeof *e)
+ if (len < (int)sizeof *e)
return -1;
i = 0;