svn commit: r240714 - in projects/mtree: include lib/libc/gen

[Brooks Davis]

Author: brooks
Date: Wed Sep 19 22:26:05 2012
New Revision: 240714
URL: http://svn.freebsd.org/changeset/base/240714

Log:
  Switch to redefining the value of VIS_* flags to preseve FreeBSD's ABI
  rather than using wrapper functions.  The added merge cost is minimal.
  
  Suggested by:	jilles

Deleted:
  projects/mtree/lib/libc/gen/vis-compat.c
Modified:
  projects/mtree/include/vis.h
  projects/mtree/lib/libc/gen/Makefile.inc
  projects/mtree/lib/libc/gen/Symbol.map

Modified: projects/mtree/include/vis.h
==============================================================================
--- projects/mtree/include/vis.h	Wed Sep 19 22:24:09 2012	(r240713)
+++ projects/mtree/include/vis.h	Wed Sep 19 22:26:05 2012	(r240714)
@@ -55,14 +55,14 @@
 /*
  * other
  */
-#define	VIS_NOSLASH	0x040	/* inhibit printing '\' */
-#define	VIS_HTTP1808	0x080	/* http-style escape % hex hex */
-#define	VIS_HTTPSTYLE	0x080	/* http-style escape % hex hex */
-#define	VIS_MIMESTYLE	0x100	/* mime-style escape = HEX HEX */
-#define	VIS_HTTP1866	0x200	/* http-style &#num; or &string; */
-#define	VIS_NOESCAPE	0x400	/* don't decode `\' */
-#define	_VIS_END	0x800	/* for unvis */
-#define	VIS_GLOB	0x1000	/* encode glob(3) magics */
+#define	VIS_NOSLASH	0x0040	/* inhibit printing '\' */
+#define	VIS_HTTP1808	0x0080	/* http-style escape % hex hex */
+#define	VIS_HTTPSTYLE	0x0080	/* http-style escape % hex hex */
+#define	VIS_GLOB	0x0100	/* encode glob(3) magics */
+#define	VIS_MIMESTYLE	0x0200	/* mime-style escape = HEX HEX */
+#define	VIS_HTTP1866	0x0400	/* http-style &#num; or &string; */
+#define	VIS_NOESCAPE	0x0800	/* don't decode `\' */
+#define	_VIS_END	0x1000	/* for unvis */
 
 /*
  * unvis return codes

Modified: projects/mtree/lib/libc/gen/Makefile.inc
==============================================================================
--- projects/mtree/lib/libc/gen/Makefile.inc	Wed Sep 19 22:24:09 2012	(r240713)
+++ projects/mtree/lib/libc/gen/Makefile.inc	Wed Sep 19 22:26:05 2012	(r240714)
@@ -33,7 +33,7 @@ SRCS+=  __getosreldate.c __xuname.c \
 	sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \
 	syslog.c telldir.c termios.c time.c times.c timezone.c tls.c \
 	ttyname.c ttyslot.c ualarm.c ulimit.c uname.c unvis.c unvis-compat.c \
-	usleep.c utime.c utxdb.c valloc.c vis.c vis-compat.c \
+	usleep.c utime.c utxdb.c valloc.c vis.c \
 	wait.c wait3.c waitpid.c \
 	wordexp.c
 

Modified: projects/mtree/lib/libc/gen/Symbol.map
==============================================================================
--- projects/mtree/lib/libc/gen/Symbol.map	Wed Sep 19 22:24:09 2012	(r240713)
+++ projects/mtree/lib/libc/gen/Symbol.map	Wed Sep 19 22:26:05 2012	(r240714)
@@ -301,6 +301,9 @@ FBSD_1.0 {
 	usleep;
 	utime;
 	valloc;
+	vis;
+	strvis;
+	strvisx;
 	wait;
 	wait3;
 	waitpid;
@@ -396,12 +399,9 @@ FBSD_1.3 {
 	strsnvisx;
 	strsvis;
 	strsvisx;
-	strvis;
-	strvisx;
 	svis;
 	uid_from_user;
 	unvis;
-	vis;
 };
 
 FBSDprivate_1.0 {