309. Add Xasprintf() to the server, providing a cleaner mechanism for

      printing into (X-)allocated memory (David Dawes).

5 files changed, 18 insertions, 6 deletions

diff --git a/config/cf/FreeBSD.cf b/config/cf/FreeBSD.cf
index 3e23ef23c..c0a197d13 100644
--- a/config/cf/FreeBSD.cf
+++ b/config/cf/FreeBSD.cf
@@ -1,4 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/FreeBSD.cf,v 3.151 2005/01/31 04:34:29 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/FreeBSD.cf,v 3.152 2005/01/31 23:57:36 dawes Exp $
 
 /*
  * Copyright (c) 1994-2004 by The XFree86 Project, Inc.
@@ -90,6 +90,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define HasNdbm			YES
 #define HasPutenv		YES
 #define HasSnprintf		YES
+#define HasAsprintf		YES
 #if OSMajorVersion == 3 && OSMinorVersion >= 3 || OSMajorVersion > 3
 # define HasStrlcat		YES
 #endif
diff --git a/config/cf/Imake.tmpl b/config/cf/Imake.tmpl
index 59e6c361c..8118a9978 100644
--- a/config/cf/Imake.tmpl
+++ b/config/cf/Imake.tmpl
@@ -1,6 +1,6 @@
 XCOMM ----------------------------------------------------------------------
 XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE
-XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.166 2004/06/23 17:04:13 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.167 2004/10/12 14:45:53 dawes Exp $
 XCOMM ----------------------------------------------------------------------
 /*
  * Copyright (c) 1994-2004 by The XFree86 Project, Inc.
@@ -466,6 +466,9 @@ XCOMM the platform-specific parameters - edit site.def to change
 #ifndef HasSnprintf
 #define HasSnprintf		NO	/* assume not */
 #endif
+#ifndef HasAsprintf
+#define HasAsprintf		NO	/* assume not */
+#endif
 #ifndef HasStrlcat
 #define HasStrlcat		NO	/* assume not */
 #endif
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG
index d253d9619..32ff83a0b 100644
--- a/programs/Xserver/hw/xfree86/CHANGELOG
+++ b/programs/Xserver/hw/xfree86/CHANGELOG
@@ -1,4 +1,6 @@
 XFree86 4.4.99.23 (xx January 2005)
+ 309. Add Xasprintf() to the server, providing a cleaner mechanism for
+      printing into (X-)allocated memory (David Dawes).
  308. Update the bindist/installer to handle platforms that don't use /etc/X11
       equally well as those that do (David Dawes).
  307. Add extra fontset records into XLC_LOCALE. It fixes the problem with the
@@ -19351,7 +19353,7 @@ XFree86 3.0a (28 April 1994)
 XFree86 3.0 (26 April 1994)
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3417 2005/02/02 14:38:36 pascal Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3418 2005/02/02 21:56:18 dawes Exp $
 
 
 
diff --git a/programs/Xserver/hw/xfree86/loader/dixsym.c b/programs/Xserver/hw/xfree86/loader/dixsym.c
index 125ead62e..f5ecac8a2 100644
--- a/programs/Xserver/hw/xfree86/loader/dixsym.c
+++ b/programs/Xserver/hw/xfree86/loader/dixsym.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.66 2005/01/13 15:51:19 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.67 2005/01/26 05:31:49 dawes Exp $ */
 
 /*
  * Copyright 1995-1998 by Metro Link, Inc.
@@ -336,6 +336,7 @@ LOOKUP dixLookupTab[] = {
     /* utils.c */
     SYMFUNC(Xstrdup)
     SYMFUNC(XNFstrdup)
+    SYMFUNC(Xasprintf)
     SYMVAR(Must_have_memory)
     SYMFUNC(AdjustWaitForDelay)
     SYMVAR(noTestExtensions)
diff --git a/programs/Xserver/os/Imakefile b/programs/Xserver/os/Imakefile
index 86855a1f4..08da03a5a 100644
--- a/programs/Xserver/os/Imakefile
+++ b/programs/Xserver/os/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.42 2004/03/31 16:37:10 tsi Exp $
+XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.43 2004/06/02 22:43:06 dawes Exp $
 /*
  * Copyright (c) 1996-2004 by The XFree86 Project, Inc.
  * All rights reserved.
@@ -132,6 +132,10 @@ SNPRINTF_SRCS = snprintf.c
 SNPRINTF_OBJS = snprintf.o
 #endif
 
+#if HasAsprintf
+ASPRINTF_DEFINES = -DHAS_ASPRINTF
+#endif
+
 #if !HasStrlcat
 STRLCAT_SRCS = strlcat.c strlcpy.c
 STRLCAT_OBJS = strlcat.o strlcpy.o
@@ -185,7 +189,8 @@ STRLCAT_DEFINES = -DNEED_STRLCAT
         DEFINES = -DXSERV_t -DTRANS_SERVER $(CONNECTION_FLAGS) $(MEM_DEFINES) \
 		  $(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) \
 		  $(KRB5_DEFINES) $(RGB_DEFINES) $(GETPEEREID_DEFINES) \
-		  $(STRLCAT_DEFINES) $(RANDOM_DEFINES) $(TINY_DEFINES)
+		  $(STRLCAT_DEFINES) $(RANDOM_DEFINES) $(TINY_DEFINES) \
+		  $(ASPRINTF_DEFINES)
        INCLUDES = -I$(SERVERSRC)/os -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
 		  -I$(EXTINCSRC) \
 		  -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \