diff options
Diffstat (limited to 'nx-X11/lib/src/xcms/cmsInt.c')
| -rw-r--r-- | nx-X11/lib/src/xcms/cmsInt.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nx-X11/lib/src/xcms/cmsInt.c b/nx-X11/lib/src/xcms/cmsInt.c index f4aef04ff..059b7d583 100644 --- a/nx-X11/lib/src/xcms/cmsInt.c +++ b/nx-X11/lib/src/xcms/cmsInt.c @@ -41,6 +41,7 @@ #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" +#include "reallocarray.h" #ifndef XCMSCOMPPROC # define XCMSCOMPPROC XcmsTekHVCClipC @@ -82,7 +83,7 @@ _XcmsCopyPointerArray( for (tmp = pap, n = 0; *tmp != NULL; tmp++, n++); n++; /* add 1 to include the NULL pointer */ - if ((newArray = Xmalloc(n * sizeof(XPointer)))) { + if ((newArray = Xmallocarray(n, sizeof(XPointer)))) { memcpy((char *)newArray, (char *)pap, (unsigned)(n * sizeof(XPointer))); } @@ -141,7 +142,7 @@ _XcmsPushPointerArray( /* add 2: 1 for the new pointer and another for the NULL pointer */ n += 2; - if ((newArray = Xmalloc(n * sizeof(XPointer)))) { + if ((newArray = Xmallocarray(n, sizeof(XPointer)))) { memcpy((char *)(newArray+1),(char *)pap, (unsigned)((n-1) * sizeof(XPointer))); *newArray = p; @@ -224,7 +225,7 @@ _XcmsFreeDefaultCCCs( /* * DESCRIPTION * This routine frees the default XcmsCCC's associated with - * each screen and its associated substructures as neccessary. + * each screen and its associated substructures as necessary. * * RETURNS * void @@ -296,7 +297,7 @@ _XcmsInitScrnInfo( /* * Check if the XcmsCCC's for each screen has been created. - * Really dont need to be created until some routine uses the Xcms + * Really don't need to be created until some routine uses the Xcms * API routines. */ if ((XcmsCCC)dpy->cms.defaultCCCs == NULL) { |