Minor cleanups of __func__ module, suggested by Eric Blake <ebb9@byu.net>.

diff --git a/ChangeLog b/ChangeLog
index 7b9fa0282aa395a6ac5bb05fb4732edb4117b4cb..16caed62cbb3f4074ac819cf510d46c913419db9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-06  Simon Josefsson  <simon@josefsson.org>
+
+       * doc/gnulib.texi (__func__): Use C99 terminology when talking
+       about __func__.  Make example self-contained.  Suggested by Eric
+       Blake <ebb9@byu.net>.
+
+       * tests/test-__func__.c (main): Avoid extraneous () around __func.
+       Suggested by Eric Blake <ebb9@byu.net>.
+
 2008-03-05  Simon Josefsson  <simon@josefsson.org>
 
        * modules/byteswap (License): Re-license as LGPLv2+.

diff --git a/doc/gnulib.texi b/doc/gnulib.texi
index 31f51df92da312409663dfdfeffc8a50eef703ac..8de6d8ee59f12e318acf5e05f140ecb59bcd84ab 100644 (file)
--- a/doc/gnulib.texi
+++ b/doc/gnulib.texi
@@ -5829,15 +5829,19 @@ generated automatically.
 @node __func__
 @section __func__
 
-The @code{__func__} module makes sure that you can use the
-@code{__func__} variable as defined by C99 in your code.
+The @code{__func__} module makes sure that you can use the predefined
+identifier @code{__func__} as defined by C99 in your code.
 
 A small example is:
 
 @smallexample
 #include <config.h>
-...
-printf ("%s: something happened\n", __func__);
+#include <stdio.h> /* for printf */
+
+int main (void)
+@{
+    printf ("%s: hello world\n", __func__);
+@}
 @end smallexample
 
 @node GNU Free Documentation License

diff --git a/tests/test-__func__.c b/tests/test-__func__.c
index afa6159a2a4adb35efe5d10690c3ea2b9d35d246..7b49026728ab4127bf0667f4deb24c93711ae138 100644 (file)
--- a/tests/test-__func__.c
+++ b/tests/test-__func__.c
@@ -36,6 +36,6 @@
 int
 main ()
 {
-  ASSERT (strlen (__func__) + 1 == sizeof (__func__));
+  ASSERT (strlen (__func__) + 1 == sizeof __func__);
   return 0;
 }