d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the lib/expat tree for the new v2.0.1 expat import. The bsdxml.h

Browse Source 
header is now in two parts: bsdxml.h and bsdxml_external.h, representing
the expat.h and expat_external.h headers. Updated the info on the man
page as well. Also, fixed a type-error in a printf in
sbin/ifconfig/regdomain.c that would cause a compiler warning.

Approved by:	sam, phk
This commit is contained in:
Coleman Kane 2008-05-08 14:01:42 +00:00
parent b53e922121
commit c4ca06b9b3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=178852
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libexpat/Makefile
View File

@ -6,22 +6,28 @@ LIB= bsdxml
SHLIBDIR?= /lib SHLIBDIR?= /lib
SHLIB_MAJOR= 3 SHLIB_MAJOR= 3
SRCS= xmlparse.c xmlrole.c xmltok.c SRCS= xmlparse.c xmlrole.c xmltok.c
INCS= bsdxml.h INCS= bsdxml.h bsdxml_external.h
MAN= libbsdxml.3 MAN= libbsdxml.3
.PATH: ${EXPAT}/lib .PATH: ${EXPAT}/lib
CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR} -DHAVE_EXPAT_CONFIG_H
CLEANFILES= bsdxml.h CLEANFILES= bsdxml.h bsdxml_external.h
# OK, so it is not entirely unadultered: we ammend the COPYING # OK, so it is not entirely unadultered: we ammend the COPYING
# to point people to the right place, get rid of some VMS stuff # to point people to the right place, get rid of some VMS stuff
# and use FreeBSD style indempotency #ifndefs. # and use FreeBSD style indempotency #ifndefs. We also want to
# point it at the new bsdxml_external.h rather than the old
# expat_external.h file.
# #
bsdxml.h: expat.h bsdxml.h: expat.h
unifdef -U__VMS < ${.ALLSRC} | \ unifdef -U__VMS < ${.ALLSRC} | \
sed -e 's/XmlParse_INCLUDED/_BSD_XML_H_/' \ sed -e 's/XmlParse_INCLUDED/_BSD_XML_H_/' \
-e 's/COPYING/src\/contrib\/expat\/COPYING/' \ -e 's/COPYING/src\/contrib\/expat\/COPYING/' \
-e 's/expat_external/bsdxml_external/' \
> ${.TARGET} > ${.TARGET}
bsdxml_external.h: expat_external.h
cp ${.ALLSRC} ${.TARGET}
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
lib/libexpat/libbsdxml.3
View File

@ -25,7 +25,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\"/ .\"/
.Dd October 4, 2002 .Dd May 5, 2008
.Dt LIBBSDXML 3 .Dt LIBBSDXML 3
.Os .Os
.Sh NAME .Sh NAME
@ -36,7 +36,7 @@
.Sh DESCRIPTION .Sh DESCRIPTION
The The
.Nm .Nm
library is a verbatim copy of the eXpat XML library version 1.95.5. library is a verbatim copy of the eXpat XML library version 2.0.1.
.Pp .Pp
To avoid version and autoconfiguration issues, the library has been To avoid version and autoconfiguration issues, the library has been
renamed to renamed to

2
sbin/ifconfig/regdomain.c
View File

@ -403,7 +403,7 @@ lib80211_regdomain_readconfig(struct regdata *rdp, const void *p, size_t len)
XML_SetElementHandler(parser, start_element, end_element); XML_SetElementHandler(parser, start_element, end_element);
XML_SetCharacterDataHandler(parser, char_data); XML_SetCharacterDataHandler(parser, char_data);
if (XML_Parse(parser, p, len, 1) != XML_STATUS_OK) { if (XML_Parse(parser, p, len, 1) != XML_STATUS_OK) {
warnx("%s: %s at line %d", __func__, warnx("%s: %s at line %ld", __func__,
XML_ErrorString(XML_GetErrorCode(parser)), XML_ErrorString(XML_GetErrorCode(parser)),
XML_GetCurrentLineNumber(parser)); XML_GetCurrentLineNumber(parser));
return -1; return -1;