~ubuntu-branches/ubuntu/lucid/libx11/lucid

« back to all changes in this revision

Viewing changes to src/GetPntMap.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-01-17 16:34:54 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090117163454-gaey3cd32xyavueo
Tags: 2:1.1.99.2-1build1
Fakesync with Debian, all previous Ubuntu changes are included
in the new upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
67
67
    _XRead (dpy, (char *)mapping, nbytes);
68
68
    /* don't return more data than the user asked for. */
69
69
    if (rep.nElts) {
70
 
            memcpy ((char *) map, (char *) mapping, 
 
70
            memcpy ((char *) map, (char *) mapping,
71
71
                MIN((int)rep.nElts, nmaps) );
72
72
        }
73
73
 
74
 
    if (remainder) 
 
74
    if (remainder)
75
75
        _XEatData(dpy, (unsigned long)remainder);
76
76
 
77
77
    UnlockDisplay(dpy);