diff options
| author | Pauli Nieminen <suokkos@gmail.com> | 2009-07-20 21:37:54 +0300 |
|---|---|---|
| committer | Pauli Nieminen <suokkos@gmail.com> | 2009-08-25 02:50:07 +0300 |
| commit | 8b4f4916216fe0a5327aa6ddafd06d8727f199e9 (patch) | |
| tree | bfb96b60aac0a8a0e2967fa37fb65fa7dfc3807e | |
| parent | 94e744d1857223e9b78ce14f22ed8b1621a5bc2b (diff) | |
libdrm/tests: Fix compiler warnings in drmstat.c.
| -rw-r--r-- | tests/drmstat.c | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/tests/drmstat.c b/tests/drmstat.c index ed2aeb61..cea97dbe 100644 --- a/tests/drmstat.c +++ b/tests/drmstat.c @@ -28,6 +28,7 @@ * */ +#include <alloca.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -69,13 +70,15 @@ static void getversion(int fd) printf( "No driver available\n" ); } } - -void handler(int fd, void *oldctx, void *newctx) + +#if 0 +static void handler(int fd, void *oldctx, void *newctx) { printf("Got fd %d\n", fd); } +#endif -void process_sigio(char *device) +static void process_sigio(char *device) { int fd; @@ -89,6 +92,13 @@ void process_sigio(char *device) for (;;) sleep(60); } +#define system(command) \ + do { \ + int rv = system(command); \ + if (rv == 0) \ + exit(1); \ + } while(0); + int main(int argc, char **argv) { int c; @@ -104,6 +114,7 @@ int main(int argc, char **argv) int loops; char buf[1024]; int i; + unsigned int j; drmBufInfoPtr info; drmBufMapPtr bufs; drmLockPtr lock; @@ -115,7 +126,10 @@ int main(int argc, char **argv) case 'F': count = strtoul(optarg, NULL, 0); if (!fork()) { - dup(fd); + if (dup(fd) != -1) + { + exit(1); + } sleep(count); } close(fd); @@ -278,7 +292,7 @@ int main(int argc, char **argv) drmError(r, argv[0]); return 1; } - printf("0x%04lx byte shm added at 0x%08lx\n", size, handle); + printf("0x%04lx byte shm added at 0x%08lx\n", size, (unsigned long)handle); sprintf(buf, "cat /proc/dri/0/vm"); system(buf); break; @@ -326,9 +340,9 @@ int main(int argc, char **argv) printf("\n"); if (c == 'w') { printf("===== WRITING =====\n"); - for (i = 0; i < size; i+=2) { - ((char *)address)[i] = i & 0xff; - ((char *)address)[i+1] = i & 0xff; + for (j = 0; j < size; j+=2) { + ((char *)address)[j] = j & 0xff; + ((char *)address)[j+1] = j & 0xff; } } printf("===== READING =====\n"); @@ -414,6 +428,9 @@ int main(int argc, char **argv) return r; } +void +xf86VDrvMsgVerb(int scrnIndex, int type, int verb, const char *format, + va_list args) __attribute__((format(printf, 4, 0))); void xf86VDrvMsgVerb(int scrnIndex, int type, int verb, const char *format, |