diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-04-26 18:04:25 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-04-27 10:14:05 -0700 |
| commit | eeb84547556b943af2acff207e034823205c7dfe (patch) | |
| tree | 0d3a6ceaca43b2c83913825d18abc793408845b2 | |
| parent | da0217891904bc48d5f0b7ea5c62c8ea0e9b95f9 (diff) | |
Delete redundant scrnum field from Xvfb private screen-info struct.
The screen number can be inferred from the position in the vfbScreens
array, and it was only used in two places, so it was hardly important.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
| -rw-r--r-- | hw/vfb/InitOutput.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index b2baa197f..6d827eb1a 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -77,7 +77,6 @@ from The Open Group. typedef struct { - int scrnum; int width; int paddedBytesWidth; int paddedWidth; @@ -141,7 +140,6 @@ vfbInitializeDefaultScreens(void) for (i = 0; i < MAXSCREENS; i++) { - vfbScreens[i].scrnum = i; vfbScreens[i].width = VFB_DEFAULT_WIDTH; vfbScreens[i].height = VFB_DEFAULT_HEIGHT; vfbScreens[i].depth = VFB_DEFAULT_DEPTH; @@ -598,7 +596,7 @@ vfbAllocateMmappedFramebuffer(vfbScreenInfoPtr pvfb) char dummyBuffer[DUMMY_BUFFER_SIZE]; int currentFileSize, writeThisTime; - sprintf(pvfb->mmap_file, "%s/Xvfb_screen%d", pfbdir, pvfb->scrnum); + sprintf(pvfb->mmap_file, "%s/Xvfb_screen%d", pfbdir, (int) (pvfb - vfbScreens)); if (-1 == (pvfb->mmap_fd = open(pvfb->mmap_file, O_CREAT|O_RDWR, 0666))) { perror("open"); @@ -671,7 +669,7 @@ vfbAllocateSharedMemoryFramebuffer(vfbScreenInfoPtr pvfb) return; } - ErrorF("screen %d shmid %d\n", pvfb->scrnum, pvfb->shmid); + ErrorF("screen %d shmid %d\n", (int) (pvfb - vfbScreens), pvfb->shmid); } #endif /* HAS_SHM */ |