XBUG #6560: XIElib: XiePointer should be used as generic pointer, not char *

7 files changed, 74 insertions, 68 deletions

diff --git a/xc/lib/XIE/XIElib.h b/xc/lib/XIE/XIElib.h
index d5cd4b634..319948b48 100644
--- a/xc/lib/XIE/XIElib.h
+++ b/xc/lib/XIE/XIElib.h
@@ -1,4 +1,4 @@
-/* $XConsortium: XIElib.h,v 1.5 94/01/12 19:44:01 rws Exp $ */
+/* $XConsortium: XIElib.h,v 1.6 94/02/22 17:41:18 mor Exp $ */
 /******************************************************************************
 Copyright 1993 by the Massachusetts Institute of Technology,
 
@@ -131,6 +131,12 @@ typedef unsigned long	XieLTriplet[3];
 
 typedef unsigned  	XieWhiteAdjustTechnique;
 
+#if NeedFunctionPrototypes
+typedef void *XiePointer;
+#else
+typedef char *XiePointer;
+#endif
+
 
 /*--------------------------------------------------------------------------*
  * 			  Extension information				    *
@@ -180,7 +186,7 @@ typedef struct {
 	    XieLevels		levels;
 	    Bool		notify;
 	    XieDecodeTechnique	decode_tech;
-	    char		*decode_param;
+	    XiePointer		decode_param;
 	} ImportClientPhoto;
 	
 	struct {
@@ -277,7 +283,7 @@ typedef struct {
 	    XiePhototag			src;
 	    XieLevels			levels;
 	    XieConstrainTechnique	constrain_tech;
-	    char			*constrain_param;
+	    XiePointer			constrain_param;
 	} Constrain;
 	
 	struct {
@@ -290,7 +296,7 @@ typedef struct {
 	struct {
 	    XiePhototag		src;
 	    XieColorspace	color_space;
-	    char		*color_param;
+	    XiePointer		color_param;
 	} ConvertFromRGB;
 	
 	struct {
@@ -299,13 +305,13 @@ typedef struct {
 	    XieColorList		color_list;
 	    Bool			notify;
 	    XieColorAllocTechnique	color_alloc_tech;
-	    char			*color_alloc_param;
+	    XiePointer			color_alloc_param;
 	} ConvertToIndex;
 	
 	struct {
 	    XiePhototag		src;
 	    XieColorspace	color_space;
-	    char		*color_param;
+	    XiePointer		color_param;
 	} ConvertToRGB;
 	
 	struct {
@@ -315,7 +321,7 @@ typedef struct {
 	    int				kernel_size;
 	    unsigned int		band_mask;
 	    XieConvolveTechnique	convolve_tech;
-	    char			*convolve_param;
+	    XiePointer			convolve_param;
 	} Convolve;
 	
 	struct {
@@ -323,7 +329,7 @@ typedef struct {
 	    XieLevels		levels;
 	    unsigned int	band_mask;
 	    XieDitherTechnique	dither_tech;
-	    char		*dither_param;
+	    XiePointer		dither_param;
 	} Dither;
 	
 	struct {
@@ -334,7 +340,7 @@ typedef struct {
 	    XieConstant			constant;
 	    unsigned int		band_mask;
 	    XieGeometryTechnique	sample_tech;
-	    char			*sample_param;
+	    XiePointer			sample_param;
 	} Geometry;
 	
 	struct {
@@ -350,7 +356,7 @@ typedef struct {
 	    XiePhototag		src;
 	    XieProcessDomain	domain;
 	    XieHistogramShape	shape;
-	    char		*shape_param;
+	    XiePointer		shape_param;
 	} MatchHistogram;
 	
 	struct {
@@ -401,7 +407,7 @@ typedef struct {
 	    XiePhototag		src;
 	    XieExportNotify	notify;
 	    XieEncodeTechnique	encode_tech;
-	    char		*encode_param;
+	    XiePointer		encode_param;
 	} ExportClientPhoto;
 	
 	struct {
@@ -436,7 +442,7 @@ typedef struct {
 	    XiePhototag		src;
 	    XiePhotomap		photomap;
 	    XieEncodeTechnique	encode_tech;
-	    char		*encode_param;
+	    XiePointer		encode_param;
 	} ExportPhotomap;
 	
 	struct {
@@ -475,7 +481,7 @@ typedef struct {
 typedef struct {
     XieMatrix			matrix;
     XieWhiteAdjustTechnique	white_adjust_tech;
-    char			*white_adjust_param;
+    XiePointer			white_adjust_param;
 } XieRGBToCIELabParam, XieRGBToCIEXYZParam;
 
 typedef struct {
@@ -500,9 +506,9 @@ typedef struct {
 typedef struct {
     XieMatrix			matrix;
     XieWhiteAdjustTechnique	white_adjust_tech;
-    char			*white_adjust_param;
+    XiePointer			white_adjust_param;
     XieGamutTechnique		gamut_tech;
-    char			*gamut_param;
+    XiePointer			gamut_param;
 } XieCIELabToRGBParam, XieCIEXYZToRGBParam;
 
 typedef struct {
@@ -512,7 +518,7 @@ typedef struct {
     float		luma_blue;
     XieConstant		bias;
     XieGamutTechnique	gamut_tech;
-    char		*gamut_param;
+    XiePointer		gamut_param;
 } XieYCbCrToRGBParam;
 
 typedef struct {
@@ -522,7 +528,7 @@ typedef struct {
     float		luma_blue;
     float		scale;
     XieGamutTechnique	gamut_tech;
-    char		*gamut_param;
+    XiePointer		gamut_param;
 } XieYCCToRGBParam;
 
 /* Constrain */
@@ -1174,7 +1180,7 @@ extern void XieFloImportClientPhoto (
     XieLevels		/* levels */,
     Bool		/* notify */,
     XieDecodeTechnique	/* decode_tech */,
-    char *		/* decode_param */
+    XiePointer		/* decode_param */
 #endif
 );
 
@@ -1305,7 +1311,7 @@ extern void XieFloConstrain (
     XiePhototag			/* src */,
     XieLevels			/* levels */,
     XieConstrainTechnique	/* constrain_tech */,
-    char *			/* constrain_param */
+    XiePointer			/* constrain_param */
 #endif
 );
 
@@ -1324,7 +1330,7 @@ extern void XieFloConvertFromRGB (
     XiePhotoElement *	/* element */,
     XiePhototag		/* src */,
     XieColorspace	/* color_space */,
-    char *		/* color_param */
+    XiePointer		/* color_param */
 #endif
 );
 
@@ -1336,7 +1342,7 @@ extern void XieFloConvertToIndex (
     XieColorList		/* color_list */,
     Bool			/* notify */,
     XieColorAllocTechnique 	/* color_alloc_tech */,
-    char *			/* color_alloc_param */
+    XiePointer			/* color_alloc_param */
 #endif
 );
 
@@ -1345,7 +1351,7 @@ extern void XieFloConvertToRGB (
     XiePhotoElement *	/* element */,
     XiePhototag		/* src */,
     XieColorspace	/* color_space */,
-    char *		/* color_param */
+    XiePointer		/* color_param */
 #endif
 );
 
@@ -1358,7 +1364,7 @@ extern void XieFloConvolve (
     int				/* kernel_size */,
     unsigned int		/* band_mask */,
     XieConvolveTechnique	/* convolve_tech */,
-    char *			/* convolve_param */
+    XiePointer			/* convolve_param */
 #endif
 );
 
@@ -1369,7 +1375,7 @@ extern void XieFloDither (
     unsigned int		/* band_mask */,
     XieLevels			/* levels */,
     XieDitherTechnique		/* dither_tech */,
-    char *			/* dither_param */
+    XiePointer			/* dither_param */
 #endif
 );
 
@@ -1383,7 +1389,7 @@ extern void XieFloGeometry (
     XieConstant			/* constant */,
     unsigned int		/* band_mask */,
     XieGeometryTechnique	/* sample_tech */,
-    char *			/* sample_param */
+    XiePointer			/* sample_param */
 #endif
 );
 
@@ -1405,7 +1411,7 @@ extern void XieFloMatchHistogram (
     XiePhototag		/* src */,
     XieProcessDomain *	/* domain */,
     XieHistogramShape	/* shape */,
-    char *		/* shape_param */
+    XiePointer		/* shape_param */
 #endif
 );
 
@@ -1473,7 +1479,7 @@ extern void XieFloExportClientPhoto (
     XiePhototag		/* src */,
     XieExportNotify	/* notify */,
     XieEncodeTechnique	/* encode_tech */,
-    char *		/* encode_param */
+    XiePointer		/* encode_param */
 #endif
 );
 
@@ -1523,7 +1529,7 @@ extern void XieFloExportPhotomap (
     XiePhototag		/* src */,
     XiePhotomap		/* photomap */,
     XieEncodeTechnique	/* encode_tech */,
-    char *		/* encode_param */
+    XiePointer		/* encode_param */
 #endif
 );
 
@@ -1561,7 +1567,7 @@ extern XieRGBToCIELabParam *XieTecRGBToCIELab (
 #if NeedFunctionPrototypes
     XieMatrix			/* matrix */,
     XieWhiteAdjustTechnique	/* white_adjust_tech */,
-    char *			/* white_adjust_param */
+    XiePointer			/* white_adjust_param */
 #endif
 );
 
@@ -1569,7 +1575,7 @@ extern XieRGBToCIEXYZParam *XieTecRGBToCIEXYZ (
 #if NeedFunctionPrototypes
     XieMatrix			/* matrix */,
     XieWhiteAdjustTechnique	/* white_adjust_tech */,
-    char *			/* white_adjust_param */
+    XiePointer			/* white_adjust_param */
 #endif
 );
 
@@ -1597,9 +1603,9 @@ extern XieCIELabToRGBParam *XieTecCIELabToRGB (
 #if NeedFunctionPrototypes
     XieMatrix			/* matrix */,
     XieWhiteAdjustTechnique	/* white_adjust_tech */,
-    char *			/* white_adjust_param */,
+    XiePointer			/* white_adjust_param */,
     XieGamutTechnique		/* gamut_tech */,
-    char *			/* gamut_param */
+    XiePointer			/* gamut_param */
 #endif
 );
 
@@ -1607,9 +1613,9 @@ extern XieCIEXYZToRGBParam *XieTecCIEXYZToRGB (
 #if NeedFunctionPrototypes
     XieMatrix			/* matrix */,
     XieWhiteAdjustTechnique	/* white_adjust_tech */,
-    char *			/* white_adjust_param */,
+    XiePointer			/* white_adjust_param */,
     XieGamutTechnique		/* gamut_tech */,
-    char *			/* gamut_param */
+    XiePointer			/* gamut_param */
 #endif
 );
 
@@ -1621,7 +1627,7 @@ extern XieYCbCrToRGBParam *XieTecYCbCrToRGB (
     double		/* luma_blue */,
     XieConstant		/* bias */,
     XieGamutTechnique	/* gamut_tech */,
-    char *		/* gamut_param */
+    XiePointer		/* gamut_param */
 #endif
 );
 
@@ -1633,7 +1639,7 @@ extern XieYCCToRGBParam *XieTecYCCToRGB (
     double		/* luma_blue */,
     double		/* scale */,
     XieGamutTechnique	/* gamut_tech */,
-    char *		/* gamut_param */
+    XiePointer		/* gamut_param */
 #endif
 );
 
diff --git a/xc/lib/XIE/clientdata.c b/xc/lib/XIE/clientdata.c
index 7cfc5c732..c2ba2762f 100644
--- a/xc/lib/XIE/clientdata.c
+++ b/xc/lib/XIE/clientdata.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: clientdata.c,v 1.1 93/07/19 11:39:13 mor Exp $ */
 
 /******************************************************************************
 Copyright 1993 by the Massachusetts Institute of Technology
@@ -104,7 +104,7 @@ unsigned     	*nbytes_ret;
 	SYNC_HANDLE (display);
 
    	*nbytes_ret = 0;
-	*data_ret = 0;
+	*data_ret = NULL;
 
 	return (0);
     }
diff --git a/xc/lib/XIE/colorlist.c b/xc/lib/XIE/colorlist.c
index c1a9a4d7e..bcbc33995 100644
--- a/xc/lib/XIE/colorlist.c
+++ b/xc/lib/XIE/colorlist.c
@@ -1,4 +1,4 @@
-/* $XConsortium: colorlist.c,v 1.1 93/07/19 11:39:14 mor Exp $ */
+/* $XConsortium: colorlist.c,v 1.2 93/07/26 19:00:52 mor Exp $ */
 
 /******************************************************************************
 Copyright 1993 by the Massachusetts Institute of Technology
@@ -133,7 +133,7 @@ unsigned long  	**colors_ret;
 
 	*colormap_ret = 0;
 	*ncolors_ret = 0;
-	*colors_ret = 0;
+	*colors_ret = NULL;
 
 	return (0);
     }
diff --git a/xc/lib/XIE/conven.c b/xc/lib/XIE/conven.c
index 87a13e068..864ac429d 100644
--- a/xc/lib/XIE/conven.c
+++ b/xc/lib/XIE/conven.c
@@ -1,4 +1,4 @@
-/* $XConsortium: conven.c,v 1.5 93/10/28 15:17:48 mor Exp $ */
+/* $XConsortium: conven.c,v 1.6 94/01/12 19:44:12 rws Exp $ */
 
 /******************************************************************************
 Copyright 1993 by the Massachusetts Institute of Technology
@@ -55,7 +55,7 @@ XieLTriplet		height;
 XieLevels		levels;
 Bool			notify;
 XieDecodeTechnique	decode_tech;
-char			*decode_param;
+XiePointer		decode_param;
 
 {
     element->elemType				 = xieElemImportClientPhoto;
@@ -318,7 +318,7 @@ XiePhotoElement		*element;
 XiePhototag		src;
 XieLevels		levels;
 XieConstrainTechnique	constrain_tech;
-char			*constrain_param;
+XiePointer		constrain_param;
 
 {
     element->elemType			    = xieElemConstrain;
@@ -355,7 +355,7 @@ XieFloConvertFromRGB (element, src, color_space, color_param)
 XiePhotoElement	*element;
 XiePhototag	src;
 XieColorspace	color_space;
-char	      	*color_param;
+XiePointer     	color_param;
 
 {
     element->elemType			     = xieElemConvertFromRGB;
@@ -375,7 +375,7 @@ Colormap		colormap;
 XieColorList		color_list;
 Bool	    		notify;
 XieColorAllocTechnique	color_alloc_tech;
-char			*color_alloc_param;
+XiePointer		color_alloc_param;
 
 {
     element->elemType				   = xieElemConvertToIndex;
@@ -394,7 +394,7 @@ XieFloConvertToRGB (element, src, color_space, color_param)
 XiePhotoElement	*element;
 XiePhototag	src;
 XieColorspace	color_space;
-char		*color_param;
+XiePointer	color_param;
 
 {
     element->elemType			   = xieElemConvertToRGB;
@@ -415,7 +415,7 @@ float			*kernel;
 int			kernel_size;
 unsigned int		band_mask;
 XieConvolveTechnique	convolve_tech;
-char			*convolve_param;
+XiePointer		convolve_param;
 
 {
     unsigned size;
@@ -444,7 +444,7 @@ XiePhototag		src;
 unsigned int		band_mask;
 XieLevels		levels;
 XieDitherTechnique	dither_tech;
-char			*dither_param;
+XiePointer		dither_param;
 
 {
     element->elemType		      = xieElemDither;
@@ -470,7 +470,7 @@ float			coefficients[6];
 XieConstant		constant;
 unsigned int		band_mask;
 XieGeometryTechnique	sample_tech;
-char			*sample_param;
+XiePointer		sample_param;
 
 {
     element->elemType			   = xieElemGeometry;
@@ -525,7 +525,7 @@ XiePhotoElement		*element;
 XiePhototag		src;
 XieProcessDomain	*domain;
 XieHistogramShape	shape;
-char			*shape_param;
+XiePointer		shape_param;
 
 {
     element->elemType				 = xieElemMatchHistogram;
@@ -667,7 +667,7 @@ XiePhotoElement		*element;
 XiePhototag		src;
 XieExportNotify		notify;
 XieEncodeTechnique	encode_tech;
-char			*encode_param;
+XiePointer		encode_param;
 
 {
     element->elemType                            = xieElemExportClientPhoto;
@@ -761,7 +761,7 @@ XiePhotoElement		*element;
 XiePhototag		src;
 XiePhotomap		photomap;
 XieEncodeTechnique	encode_tech;
-char			*encode_param;
+XiePointer		encode_param;
 
 {
     element->elemType                         = xieElemExportPhotomap;
@@ -843,7 +843,7 @@ XieTecRGBToCIELab (matrix, white_adjust_tech, white_adjust_param)
 
 XieMatrix		matrix;
 XieWhiteAdjustTechnique	white_adjust_tech;
-char			*white_adjust_param;
+XiePointer		white_adjust_param;
 
 {
     XieRGBToCIELabParam *param = (XieRGBToCIELabParam *)
@@ -862,7 +862,7 @@ XieTecRGBToCIEXYZ (matrix, white_adjust_tech, white_adjust_param)
 
 XieMatrix		matrix;
 XieWhiteAdjustTechnique	white_adjust_tech;
-char			*white_adjust_param;
+XiePointer		white_adjust_param;
 
 {
     XieRGBToCIEXYZParam *param = (XieRGBToCIEXYZParam *)
@@ -934,9 +934,9 @@ XieTecCIELabToRGB (matrix, white_adjust_tech, white_adjust_param,
 
 XieMatrix		matrix;
 XieWhiteAdjustTechnique	white_adjust_tech;
-char			*white_adjust_param;
+XiePointer		white_adjust_param;
 XieGamutTechnique	gamut_tech;
-char			*gamut_param;
+XiePointer		gamut_param;
 
 {
     XieCIELabToRGBParam *param = (XieCIELabToRGBParam *)
@@ -958,9 +958,9 @@ XieTecCIEXYZToRGB (matrix, white_adjust_tech, white_adjust_param,
 
 XieMatrix		matrix;
 XieWhiteAdjustTechnique	white_adjust_tech;
-char			*white_adjust_param;
+XiePointer		white_adjust_param;
 XieGamutTechnique	gamut_tech;
-char			*gamut_param;
+XiePointer		gamut_param;
 
 {
     XieCIEXYZToRGBParam *param = (XieCIEXYZToRGBParam *)
@@ -986,7 +986,7 @@ double			luma_green;
 double			luma_blue;
 XieConstant		bias;
 XieGamutTechnique	gamut_tech;
-char			*gamut_param;
+XiePointer		gamut_param;
 
 {
     XieYCbCrToRGBParam *param = (XieYCbCrToRGBParam *)
@@ -1018,7 +1018,7 @@ double			luma_green;
 double			luma_blue;
 double			scale;
 XieGamutTechnique	gamut_tech;
-char			*gamut_param;
+XiePointer		gamut_param;
 
 {
     XieYCCToRGBParam *param = (XieYCCToRGBParam *)
diff --git a/xc/lib/XIE/init.c b/xc/lib/XIE/init.c
index 47dd4a380..1c6e0606f 100644
--- a/xc/lib/XIE/init.c
+++ b/xc/lib/XIE/init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: init.c,v 1.6 93/10/30 14:56:24 rws Exp $ */
+/* $XConsortium: init.c,v 1.7 93/10/30 15:09:12 rws Exp $ */
 
 /******************************************************************************
 Copyright 1993 by the Massachusetts Institute of Technology
@@ -209,7 +209,7 @@ XieTechnique		**techniques_ret;
 	SYNC_HANDLE (display);
 
 	*ntechniques_ret = 0;
-	*techniques_ret = 0;
+	*techniques_ret = NULL;
 
 	return (0);
     }
diff --git a/xc/lib/XIE/photoflo.c b/xc/lib/XIE/photoflo.c
index f2dd9df77..294a5457a 100644
--- a/xc/lib/XIE/photoflo.c
+++ b/xc/lib/XIE/photoflo.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: photoflo.c,v 1.1 93/07/19 11:39:28 mor Exp $ */
 
 /******************************************************************************
 Copyright 1993 by the Massachusetts Institute of Technology
@@ -254,9 +254,9 @@ unsigned int    	*navailable_ret;
 
 	*state_ret = 0;
 	*nexpected_ret = 0;
-	*data_expected_ret = 0;
+	*data_expected_ret = NULL;
 	*navailable_ret = 0;
-	*data_available_ret = 0;
+	*data_available_ret = NULL;
 	
 	return (0);
     }
diff --git a/xc/lib/XIE/technique.c b/xc/lib/XIE/technique.c
index 712cdd0f6..340077213 100644
--- a/xc/lib/XIE/technique.c
+++ b/xc/lib/XIE/technique.c
@@ -1,4 +1,4 @@
-/* $XConsortium: technique.c,v 1.4 93/10/28 15:17:57 mor Exp $ */
+/* $XConsortium: technique.c,v 1.5 94/01/12 19:44:45 rws Exp $ */
 
 /******************************************************************************
 Copyright 1993 by the Massachusetts Institute of Technology
@@ -27,7 +27,7 @@ _XieTechniqueLength (group, technique, param)
 
 int group;
 int technique;
-char *param;
+XiePointer param;
 
 {
     XieTechFuncPtr techfunc = _XieLookupTechFunc (group, technique);
@@ -48,7 +48,7 @@ _XieEncodeTechnique (bufDest, group, technique, param)
 char **bufDest;
 int  group;
 int  technique;
-char *param;
+XiePointer param;
 
 {
     XieTechFuncPtr techfunc = _XieLookupTechFunc (group, technique);