[PATCH] Fix pdf build failure wrt documentation of is*_l functions

Thomas Preudhomme thomas.preudhomme@foss.arm.com
Wed Aug 17 16:05:00 GMT 2016


Hi Corinna,

make pdf on arm-none-eabi targets fails to build after the reorganization in 
baf0c9fcb56e5cf8f54357bf8d8646b51b236886 to fold is*_l documentation in their 
is* counterpart. This is due two issues:

1) newlib/libc/ctype/ctype.tex still including the def file for the long versions
2) missing angle brackets in .c files for some of is*_l functions

This patch fixes the issues and allows make pdf to succeeds.


diff --git a/newlib/libc/ctype/ctype.tex b/newlib/libc/ctype/ctype.tex
index 
b18f496fae321625024e161cce0b21d34152b4e5..e30c885108e27108bba6953615e00425edc670b3 
100644
--- a/newlib/libc/ctype/ctype.tex
+++ b/newlib/libc/ctype/ctype.tex
@@ -79,197 +79,98 @@ The header file @file{ctype.h} defines the macros.
  @include ctype/isalnum.def

  @page
-@include ctype/isalnum_l.def
-
-@page
  @include ctype/isalpha.def

  @page
-@include ctype/isalpha_l.def
-
-@page
  @include ctype/isascii.def

  @page
-@include ctype/isascii_l.def
-
-@page
  @include ctype/isblank.def

  @page
-@include ctype/isblank_l.def
-
-@page
  @include ctype/iscntrl.def

  @page
-@include ctype/iscntrl_l.def
-
-@page
  @include ctype/isdigit.def

  @page
-@include ctype/isdigit_l.def
-
-@page
  @include ctype/islower.def

  @page
-@include ctype/islower_l.def
-
-@page
  @include ctype/isprint.def

  @page
-@include ctype/isprint_l.def
-
-@page
  @include ctype/ispunct.def

  @page
-@include ctype/ispunct_l.def
-
-@page
  @include ctype/isspace.def

  @page
-@include ctype/isspace_l.def
-
-@page
  @include ctype/isupper.def

  @page
-@include ctype/isupper_l.def
-
-@page
  @include ctype/isxdigit.def

  @page
-@include ctype/isxdigit_l.def
-
-@page
  @include ctype/toascii.def

  @page
-@include ctype/toascii_l.def
-
-@page
  @include ctype/tolower.def

  @page
-@include ctype/tolower_l.def
-
-@page
  @include ctype/toupper.def

  @page
-@include ctype/toupper_l.def
-
-@page
  @include ctype/iswalnum.def

  @page
-@include ctype/iswalnum_l.def
-
-@page
  @include ctype/iswalpha.def

  @page
-@include ctype/iswalpha_l.def
-
-@page
  @include ctype/iswcntrl.def

  @page
-@include ctype/iswcntrl_l.def
-
-@page
  @include ctype/iswblank.def

  @page
-@include ctype/iswblank_l.def
-
-@page
  @include ctype/iswdigit.def

  @page
-@include ctype/iswdigit_l.def
-
-@page
  @include ctype/iswgraph.def

  @page
-@include ctype/iswgraph_l.def
-
-@page
  @include ctype/iswlower.def

  @page
-@include ctype/iswlower_l.def
-
-@page
  @include ctype/iswprint.def

  @page
-@include ctype/iswprint_l.def
-
-@page
  @include ctype/iswpunct.def

  @page
-@include ctype/iswpunct_l.def
-
-@page
  @include ctype/iswspace.def

  @page
-@include ctype/iswspace_l.def
-
-@page
  @include ctype/iswupper.def

  @page
-@include ctype/iswupper_l.def
-
-@page
  @include ctype/iswxdigit.def

  @page
-@include ctype/iswxdigit_l.def
-
-@page
  @include ctype/iswctype.def

  @page
-@include ctype/iswctype_l.def
-
-@page
  @include ctype/wctype.def

  @page
-@include ctype/wctype_l.def
-
-@page
  @include ctype/towlower.def

  @page
-@include ctype/towlower_l.def
-
-@page
  @include ctype/towupper.def

  @page
-@include ctype/towupper_l.def
-
-@page
  @include ctype/towctrans.def

  @page
-@include ctype/towctrans_l.def
-
-@page
  @include ctype/wctrans.def

-@page
-@include ctype/wctrans_l.def
-
diff --git a/newlib/libc/ctype/isalpha.c b/newlib/libc/ctype/isalpha.c
index 
221263c2d7a3ccb6fa174a5cfefa644ad74bdf4e..59511e18e7cf3cc123f8d1aef786bdc86c5e99f3 
100644
--- a/newlib/libc/ctype/isalpha.c
+++ b/newlib/libc/ctype/isalpha.c
@@ -1,6 +1,6 @@
  /*
  FUNCTION
-	<<isalpha>>, <isalpha_l>>---alphabetic character predicate
+	<<isalpha>>, <<isalpha_l>>---alphabetic character predicate

  INDEX
  	isalpha
diff --git a/newlib/libc/ctype/isprint.c b/newlib/libc/ctype/isprint.c
index 
1ad34c8f9ce2bbeffc4844d3be1e44962686e337..21fdf5b1d33bfd7367747c9026f9a7787dbabb26 
100644
--- a/newlib/libc/ctype/isprint.c
+++ b/newlib/libc/ctype/isprint.c
@@ -47,8 +47,8 @@ undefining either macro using `<<#undef isprint>>' or 
`<<#undef isgraph>>',
  or `<<#undef isprint_l>>' or `<<#undef isgraph_l>>'.

  RETURNS
-<<isprint>>,<isprint_l> return non-zero if <[c]> is a printing character.
-<<isgraph>>, <<isgraph_l> return non-zero if <[c]> is a printing character
+<<isprint>>, <<isprint_l>> return non-zero if <[c]> is a printing character.
+<<isgraph>>, <<isgraph_l>> return non-zero if <[c]> is a printing character
  except spaces.

  PORTABILITY
diff --git a/newlib/libc/stdlib/strtoul.c b/newlib/libc/stdlib/strtoul.c
index 
062606f4e7890046a3321febb8d30f134058ab50..aa5897e13d2231d660147ed0ab82aceda41a3753 
100644
--- a/newlib/libc/stdlib/strtoul.c
+++ b/newlib/libc/stdlib/strtoul.c
@@ -85,10 +85,10 @@ The alternate function <<_strtoul_r>> is a reentrant 
version.  The
  extra argument <[reent]> is a pointer to a reentrancy structure.

  RETURNS
-<<strtoul>>, <strtoul_l>> return the converted value, if any. If no
+<<strtoul>>, <<strtoul_l>> return the converted value, if any. If no
  conversion was made, <<0>> is returned.

-<<strtoul>>, <strtoul_l>> return <<ULONG_MAX>> if the magnitude of the
+<<strtoul>>, <<strtoul_l>> return <<ULONG_MAX>> if the magnitude of the
  converted value is too large, and sets <<errno>> to <<ERANGE>>.

  PORTABILITY



Is this ok for trunk?

Best regards,

Thomas



More information about the Newlib mailing list