frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jamey Sharp 2010-04-26 18:04:25 -07:00
parent da02178919
commit eeb8454755
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/vfb/InitOutput.c
View File

@ -77,7 +77,6 @@ from The Open Group.
typedef struct typedef struct
{ {
int scrnum;
int width; int width;
int paddedBytesWidth; int paddedBytesWidth;
int paddedWidth; int paddedWidth;
@ -141,7 +140,6 @@ vfbInitializeDefaultScreens(void)
for (i = 0; i < MAXSCREENS; i++) for (i = 0; i < MAXSCREENS; i++)
{ {
vfbScreens[i].scrnum = i;
vfbScreens[i].width = VFB_DEFAULT_WIDTH; vfbScreens[i].width = VFB_DEFAULT_WIDTH;
vfbScreens[i].height = VFB_DEFAULT_HEIGHT; vfbScreens[i].height = VFB_DEFAULT_HEIGHT;
vfbScreens[i].depth = VFB_DEFAULT_DEPTH; vfbScreens[i].depth = VFB_DEFAULT_DEPTH;
@ -598,7 +596,7 @@ vfbAllocateMmappedFramebuffer(vfbScreenInfoPtr pvfb)
char dummyBuffer[DUMMY_BUFFER_SIZE]; char dummyBuffer[DUMMY_BUFFER_SIZE];
int currentFileSize, writeThisTime; 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))) if (-1 == (pvfb->mmap_fd = open(pvfb->mmap_file, O_CREAT|O_RDWR, 0666)))
{ {
perror("open"); perror("open");
@ -671,7 +669,7 @@ vfbAllocateSharedMemoryFramebuffer(vfbScreenInfoPtr pvfb)
return; 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 */ #endif /* HAS_SHM */