38-fyi-cleanups.patch

[Akim Demaille]

While looking for a good module for gp2/autotest.texi, I fell onto
this.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * modules/stdlib.c, modules/times.c: Misc cleanups.

Index: modules/stdlib.c
--- modules/stdlib.c Thu, 30 Aug 2001 15:53:29 +0200 akim
+++ modules/stdlib.c Wed, 05 Sep 2001 16:58:01 +0200 akim
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 #include <pwd.h>
 #include <stdlib.h>
 #include <unistd.h>
-#ifdef TM_IN_SYS_TIME
+#if TM_IN_SYS_TIME
 #  include <sys/time.h>
 #else
 #  include <time.h>
@@ -67,7 +67,6 @@

   { 0, 0, FALSE, FALSE },
 };
-
 
 /**
  * getcwd()
@@ -80,10 +79,10 @@
   if (m4_bad_argc (argv[0], argc, 1, 1))
     return;

-  bp = getcwd(buf, sizeof buf);
+  bp = getcwd (buf, sizeof buf);

   if (bp != NULL)              /* in case of error return null string */
-    m4_shipout_string (obs, buf, 0 , FALSE);
+    m4_shipout_string (obs, buf, 0, FALSE);
 }

 /**
@@ -96,7 +95,7 @@
   if (m4_bad_argc (argv[0], argc, 2, 2))
     return;

-  env = getenv((char*)M4ARG(1));
+  env = getenv (M4ARG (1));

   if (env != NULL)
     m4_shipout_string (obs, env, 0, FALSE);
@@ -113,19 +112,19 @@
     return;

   if (argc == 4)
-    if (!m4_numeric_arg(argv[0], (char*)M4ARG(3), &overwrite))
+    if (!m4_numeric_arg (argv[0], M4ARG (3), &overwrite))
       return;

-#ifdef HAVE_SETENV
-  setenv((char*)M4ARG(1), (char*)M4ARG(2), overwrite);
+#if HAVE_SETENV
+  setenv (M4ARG (1), M4ARG (2), overwrite);
 #else
-#ifdef HAVE_PUTENV
-  if (!overwrite && getenv ((char*)M4ARG(1)) != NULL)
+#if HAVE_PUTENV
+  if (!overwrite && getenv (M4ARG (1)) != NULL)
     return;

-  obstack_grow (obs, (char*)M4ARG(1), strlen ((char*)M4ARG(1)));
+  obstack_grow (obs, M4ARG (1), strlen (M4ARG (1)));
   obstack_1grow (obs, '=');
-  obstack_grow (obs, (char*)M4ARG(2), strlen ((char*)M4ARG(2)));
+  obstack_grow (obs, M4ARG (2), strlen (M4ARG (2)));
   obstack_1grow (obs, '\0');

   {
@@ -144,8 +143,8 @@
   if (m4_bad_argc (argv[0], argc, 2, 2))
     return;

-#ifdef HAVE_UNSETENV
-  unsetenv ((char*)M4ARG(1));
+#if HAVE_UNSETENV
+  unsetenv (M4ARG (1));
 #endif /* HAVE_UNSETENV */
 }

@@ -173,7 +172,7 @@
   if (m4_bad_argc (argv[0], argc, 1, 1))
     return;

-  m4_shipout_int(obs, getpid());
+  m4_shipout_int (obs, getpid ());
 }

 /**
@@ -184,7 +183,7 @@
   if (m4_bad_argc (argv[0], argc, 1, 1))
     return;

-  m4_shipout_int(obs, getppid());
+  m4_shipout_int (obs, getppid ());
 }

 /**
@@ -197,7 +196,7 @@
   if (m4_bad_argc (argv[0], argc, 2, 2))
     return;

-  pw = getpwnam((char*)M4ARG(1));
+  pw = getpwnam (M4ARG (1));

   if (pw != NULL)
     {
@@ -205,9 +204,9 @@
       obstack_1grow (obs, ',');
       m4_shipout_string (obs, pw->pw_passwd, 0, TRUE);
       obstack_1grow (obs, ',');
-      m4_shipout_int(obs, pw->pw_uid);
+      m4_shipout_int (obs, pw->pw_uid);
       obstack_1grow (obs, ',');
-      m4_shipout_int(obs, pw->pw_gid);
+      m4_shipout_int (obs, pw->pw_gid);
       obstack_1grow (obs, ',');
       m4_shipout_string (obs, pw->pw_gecos, 0, TRUE);
       obstack_1grow (obs, ',');
@@ -228,10 +227,10 @@
   if (m4_bad_argc (argv[0], argc, 2, 2))
     return;

-  if (!m4_numeric_arg(argv[0], (char*)M4ARG(1), &uid))
+  if (!m4_numeric_arg (argv[0], M4ARG (1), &uid))
     return;

-  pw = getpwuid(uid);
+  pw = getpwuid (uid);

   if (pw != NULL)
     {
@@ -239,9 +238,9 @@
       obstack_1grow (obs, ',');
       m4_shipout_string (obs, pw->pw_passwd, 0, TRUE);
       obstack_1grow (obs, ',');
-      m4_shipout_int(obs, pw->pw_uid);
+      m4_shipout_int (obs, pw->pw_uid);
       obstack_1grow (obs, ',');
-      m4_shipout_int(obs, pw->pw_gid);
+      m4_shipout_int (obs, pw->pw_gid);
       obstack_1grow (obs, ',');
       m4_shipout_string (obs, pw->pw_gecos, 0, TRUE);
       obstack_1grow (obs, ',');
@@ -261,7 +260,7 @@
   if (m4_bad_argc (argv[0], argc, 1, 1))
     return;

-  if (gethostname(buf, sizeof buf) < 0)
+  if (gethostname (buf, sizeof buf) < 0)
     return;

   m4_shipout_string (obs, buf, 0, FALSE);
@@ -275,7 +274,7 @@
   if (m4_bad_argc (argv[0], argc, 1, 1))
     return;

-  m4_shipout_int(obs, rand());
+  m4_shipout_int (obs, rand ());
 }

 /**
@@ -289,14 +288,14 @@
     return;

   if (argc == 1)
-    seed = time(0L) * getpid();
+    seed = time (0L) * getpid ();
   else
     {
-      if (!m4_numeric_arg(argv[0], (char*)M4ARG(1), &seed))
+      if (!m4_numeric_arg (argv[0], M4ARG (1), &seed))
        return;
     }

-  srand(seed);
+  srand (seed);
 }

 /**
@@ -309,7 +308,7 @@
   if (m4_bad_argc (argv[0], argc, 1, 1))
     return;

-  if (uname(&ut) == 0)
+  if (uname (&ut) == 0)
     {
       m4_shipout_string (obs, ut.sysname, 0, TRUE);
       obstack_1grow (obs, ',');
@@ -331,5 +330,5 @@
   if (m4_bad_argc (argv[0], argc, 1, 1))
     return;

-  m4_shipout_int(obs, getuid());
+  m4_shipout_int (obs, getuid ());
 }
Index: modules/time.c
--- modules/time.c Thu, 30 Aug 2001 15:53:29 +0200 akim
+++ modules/time.c Wed, 05 Sep 2001 16:59:30 +0200 akim
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,16 +17,16 @@
    02111-1307  USA
 */

-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 #  include <config.h>
 #endif

 #include <stdio.h>

-#ifdef TM_IN_SYS_TIME
-#include <sys/time.h>
+#if TM_IN_SYS_TIME
+#  include <sys/time.h>
 #else
-#include <time.h>
+#  include <time.h>
 #endif /* TM_IN_SYS_TIME */

 #include <m4module.h>
@@ -48,10 +48,10 @@

 #define BUILTIN(handler, macros,  blind)       M4BUILTIN(handler)
   builtin_functions
-# ifdef HAVE_MKTIME
+# if HAVE_MKTIME
   mktime_functions
 # endif
-# ifdef HAVE_STRFTIME
+# if HAVE_STRFTIME
   strftime_functions
 # endif
 #undef BUILTIN
@@ -62,23 +62,21 @@
        { STR(handler), CONC(builtin_, handler), macros, blind },

   builtin_functions
-# ifdef HAVE_MKTIME
+# if HAVE_MKTIME
   mktime_functions
 # endif
-# ifdef HAVE_STRFTIME
+# if HAVE_STRFTIME
   strftime_functions
 # endif
 #undef BUILTIN

   { 0, 0, FALSE, FALSE },
 };
-
 
-
 /**
  * currenttime()
  **/
-M4BUILTIN_HANDLER(currenttime)
+M4BUILTIN_HANDLER (currenttime)
 {
   char buf[64];
   time_t now;
@@ -87,8 +85,8 @@
   if (m4_bad_argc (argv[0], argc, 1, 1))
     return;

-  now = time(0L);
-  l = sprintf(buf, "%ld", now);
+  now = time (0L);
+  l = sprintf (buf, "%ld", now);

   obstack_grow (obs, buf, l);
 }
@@ -96,7 +94,7 @@
 /**
  * ctime([SECONDS])
  **/
-M4BUILTIN_HANDLER(ctime)
+M4BUILTIN_HANDLER (ctime)
 {
   time_t t;

@@ -104,80 +102,80 @@
     return;

   if (argc == 2)
-    m4_numeric_arg(argv[0], (char*)M4ARG(1), (int *)&t);
+    m4_numeric_arg (argv[0], M4ARG (1), (int *) &t);
   else
-    t = time(0L);
+    t = time (0L);

-  obstack_grow (obs, ctime(&t), 24);
+  obstack_grow (obs, ctime (&t), 24);
 }

 static void
-format_tm(struct obstack *obs, struct tm *tm)
+format_tm (struct obstack *obs, struct tm *tm)
 {
-  m4_shipout_int(obs, tm->tm_sec);
-  obstack_1grow(obs, ',');
+  m4_shipout_int (obs, tm->tm_sec);
+  obstack_1grow (obs, ',');

-  m4_shipout_int(obs, tm->tm_min);
-  obstack_1grow(obs, ',');
+  m4_shipout_int (obs, tm->tm_min);
+  obstack_1grow (obs, ',');

-  m4_shipout_int(obs, tm->tm_hour);
-  obstack_1grow(obs, ',');
+  m4_shipout_int (obs, tm->tm_hour);
+  obstack_1grow (obs, ',');

-  m4_shipout_int(obs, tm->tm_mday);
-  obstack_1grow(obs, ',');
+  m4_shipout_int (obs, tm->tm_mday);
+  obstack_1grow (obs, ',');

-  m4_shipout_int(obs, tm->tm_mon);
-  obstack_1grow(obs, ',');
+  m4_shipout_int (obs, tm->tm_mon);
+  obstack_1grow (obs, ',');

-  m4_shipout_int(obs, tm->tm_year);
-  obstack_1grow(obs, ',');
+  m4_shipout_int (obs, tm->tm_year);
+  obstack_1grow (obs, ',');

-  m4_shipout_int(obs, tm->tm_wday);
-  obstack_1grow(obs, ',');
+  m4_shipout_int (obs, tm->tm_wday);
+  obstack_1grow (obs, ',');

-  m4_shipout_int(obs, tm->tm_yday);
-  obstack_1grow(obs, ',');
+  m4_shipout_int (obs, tm->tm_yday);
+  obstack_1grow (obs, ',');

-  m4_shipout_int(obs, tm->tm_isdst);
+  m4_shipout_int (obs, tm->tm_isdst);
 }

 /**
  * gmtime(SECONDS)
  **/
-M4BUILTIN_HANDLER(gmtime)
+M4BUILTIN_HANDLER (gmtime)
 {
   time_t t;

   if (m4_bad_argc (argv[0], argc, 2, 2))
     return;

-  if (!m4_numeric_arg (argv[0], (char*)M4ARG(1), (int *)&t))
+  if (!m4_numeric_arg (argv[0], M4ARG (1), (int *) &t))
     return;

-  format_tm(obs, gmtime(&t));
+  format_tm (obs, gmtime (&t));
 }

 /**
  * localtime(SECONDS)
  **/
-M4BUILTIN_HANDLER(localtime)
+M4BUILTIN_HANDLER (localtime)
 {
   time_t t;

   if (m4_bad_argc (argv[0], argc, 2, 2))
     return;

-  if (!m4_numeric_arg (argv[0], (char*)M4ARG(1), (int *)&t))
+  if (!m4_numeric_arg (argv[0], M4ARG (1), (int *) &t))
     return;

-  format_tm(obs, localtime(&t));
+  format_tm (obs, localtime (&t));
 }

-#ifdef HAVE_MKTIME
+#if HAVE_MKTIME
 /**
  * mktime(SEC, MIN, HOUR, MDAY, MONTH, YEAR, [ISDST])
  **/
-M4BUILTIN_HANDLER(mktime)
+M4BUILTIN_HANDLER (mktime)
 {
   struct tm tm;
   time_t t;
@@ -185,32 +183,32 @@
   if (m4_bad_argc (argv[0], argc, 7, 8))
     return;

-  if (!m4_numeric_arg (argv[0], (char*)M4ARG(1), &tm.tm_sec))
+  if (!m4_numeric_arg (argv[0], M4ARG (1), &tm.tm_sec))
     return;
-  if (!m4_numeric_arg (argv[0], (char*)M4ARG(2), &tm.tm_min))
+  if (!m4_numeric_arg (argv[0], M4ARG (2), &tm.tm_min))
     return;
-  if (!m4_numeric_arg (argv[0], (char*)M4ARG(3), &tm.tm_hour))
+  if (!m4_numeric_arg (argv[0], M4ARG (3), &tm.tm_hour))
     return;
-  if (!m4_numeric_arg (argv[0], (char*)M4ARG(4), &tm.tm_mday))
+  if (!m4_numeric_arg (argv[0], M4ARG (4), &tm.tm_mday))
     return;
-  if (!m4_numeric_arg (argv[0], (char*)M4ARG(5), &tm.tm_mon))
+  if (!m4_numeric_arg (argv[0], M4ARG (5), &tm.tm_mon))
     return;
-  if (!m4_numeric_arg (argv[0], (char*)M4ARG(6), &tm.tm_year))
+  if (!m4_numeric_arg (argv[0], M4ARG (6), &tm.tm_year))
     return;
-  if (M4ARG(7) && !m4_numeric_arg (argv[0], (char*)M4ARG(7), &tm.tm_isdst))
+  if (M4ARG (7) && !m4_numeric_arg (argv[0], M4ARG (7), &tm.tm_isdst))
     return;

-  t = mktime(&tm);
+  t = mktime (&tm);

-  m4_shipout_int(obs, t);
+  m4_shipout_int (obs, t);
 }
 #endif /* HAVE_MKTIME */

-#ifdef HAVE_STRFTIME
+#if HAVE_STRFTIME
 /**
  * strftime(FORMAT, SECONDS)
  **/
-M4BUILTIN_HANDLER(strftime)
+M4BUILTIN_HANDLER (strftime)
 {
   struct tm *tm;
   time_t t;
@@ -220,13 +218,13 @@
   if (m4_bad_argc (argv[0], argc, 3, 3))
     return;

-  if (!m4_numeric_arg (argv[0], (char*)M4ARG(2), (int *)&t))
+  if (!m4_numeric_arg (argv[0], M4ARG (2), (int *) &t))
     return;

-  tm = localtime(&t);
+  tm = localtime (&t);

-  buf = (char *) obstack_alloc(obs, 1024);
-  l = strftime(buf, 1024, (char*)M4ARG(1), tm);
-  obstack_grow(obs, buf, l);
+  buf = (char *) obstack_alloc (obs, 1024);
+  l = strftime (buf, 1024, M4ARG (1), tm);
+  obstack_grow (obs, buf, l);
 }
 #endif /* HAVE_STRFTIME */