diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2018-11-05 22:16:25 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-09 15:36:31 +0100 |
| commit | 49607e93f53c7d15c8d18b36763e855ecb42a496 (patch) | |
| tree | d5ba7a097214845b8e4c82b6c56ed4c854f3a49a /nx-X11/programs/Xserver/Xext/shm.c | |
| parent | fccef5fc5794c3aab5c28dbe354c3dc3a86cc07b (diff) | |
| download | nx-libs-49607e93f53c7d15c8d18b36763e855ecb42a496.tar.gz nx-libs-49607e93f53c7d15c8d18b36763e855ecb42a496.tar.bz2 nx-libs-49607e93f53c7d15c8d18b36763e855ecb42a496.zip | |
Lift Xext to xorg 1.4.2
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/shm.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/shm.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c index ca1ff9a7f..8e99b1047 100644 --- a/nx-X11/programs/Xserver/Xext/shm.c +++ b/nx-X11/programs/Xserver/Xext/shm.c @@ -758,10 +758,10 @@ CreatePmap: if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) { if (size < width * height) return BadAlloc; - /* thankfully, offset is unsigned */ - if (stuff->offset + size < size) - return BadAlloc; } + /* thankfully, offset is unsigned */ + if (stuff->offset + size < size) + return BadAlloc; VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client); @@ -820,8 +820,8 @@ static int ProcShmPutImage(client) register ClientPtr client; { - register GCPtr pGC; - register DrawablePtr pDraw; + GCPtr pGC; + DrawablePtr pDraw; long length; ShmDescPtr shmdesc; REQUEST(xShmPutImageReq); @@ -933,7 +933,7 @@ static int ProcShmGetImage(client) register ClientPtr client; { - register DrawablePtr pDraw; + DrawablePtr pDraw; long lenPer = 0, length; Mask plane = 0; xShmGetImageReply xgi; @@ -1070,7 +1070,7 @@ ProcShmCreatePixmap(client) register ClientPtr client; { PixmapPtr pMap; - register DrawablePtr pDraw; + DrawablePtr pDraw; DepthPtr pDepth; register int i; ShmDescPtr shmdesc; @@ -1112,9 +1112,9 @@ CreatePmap: if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) { if (size < width * height) return BadAlloc; - /* thankfully, offset is unsigned */ - if (stuff->offset + size < size) - return BadAlloc; + /* thankfully, offset is unsigned */ + if (stuff->offset + size < size) + return BadAlloc; } VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client); |