summaryrefslogtreecommitdiff
path: root/debugger
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-01-19 22:11:47 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-01-19 22:11:47 +0100
commitae57cd7dc7db8a9a72d8ee764f72cd8fd9e75a76 (patch)
tree8d401f13e084a95167371b18151aee5e466ff538 /debugger
parent862de5636f545a071f29f60ae0a4ab1370f5cf8b (diff)
debugger: avoid global variable shadowing
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'debugger')
-rw-r--r--debugger/eudb.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/debugger/eudb.c b/debugger/eudb.c
index 228a143f..ff77e422 100644
--- a/debugger/eudb.c
+++ b/debugger/eudb.c
@@ -418,7 +418,7 @@ static int
wait_for_scratch_bo(void) {
struct sockaddr_un addr;
uint32_t version;
- int fd, ret, handle = -1;
+ int fd, ret, dh_handle = -1;
assert(sizeof(version) == sizeof(dh.version));
@@ -478,7 +478,7 @@ wait_for_scratch_bo(void) {
perror("write ack");
goto loop_out;
}
- handle = dh.flink_handle;
+ dh_handle = dh.flink_handle;
if (debug > 0) {
printf("Handshake completed successfully\n"
"\tprotocol version = %d\n"
@@ -494,7 +494,7 @@ wait_for_scratch_bo(void) {
done:
close(fd);
- return handle;
+ return dh_handle;
}
static void
@@ -552,7 +552,7 @@ int main(int argc, char* argv[]) {
* non-blocking versions of the functions.
*/
if (!clear_waits) {
- int handle;
+ int dh_handle;
drm_fd = drm_open_any();
bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
@@ -560,13 +560,13 @@ int main(int argc, char* argv[]) {
/* We are probably root, make files world friendly */
umask(0);
- handle = wait_for_scratch_bo();
- if (handle == -1) {
+ dh_handle = wait_for_scratch_bo();
+ if (dh_handle == -1) {
printf("No handle from mesa, please enter manually: ");
- if (fscanf(stdin, "%1d", &handle) == 0)
+ if (fscanf(stdin, "%1d", &dh_handle) == 0)
exit(1);
}
- scratch_bo = intel_bo_gem_create_from_name(bufmgr, "scratch", handle);
+ scratch_bo = intel_bo_gem_create_from_name(bufmgr, "scratch", dh_handle);
if (scratch_bo == NULL) {
fprintf(stderr, "Couldn't flink buffer\n");
abort();