Use NULL rather than (type *) 0.

diff --git a/src/buf.c b/src/buf.c
index f2410f0f7f3b66e5b3a7e9a35da437542aaf69e5..a1c917bb019ce69af0c68ff79a384c5047e1eca2 100644 (file)
--- a/src/buf.c
+++ b/src/buf.c
@@ -197,7 +197,7 @@ struct Buf *buf_m4_undefine (struct Buf *buf, const char* def)
 /* create buf with 0 elements, each of size elem_size. */
 void buf_init (struct Buf *buf, size_t elem_size)
 {
-       buf->elts = (void *) 0;
+       buf->elts = NULL;
        buf->nelts = 0;
        buf->elt_size = elem_size;
        buf->nmax = 0;
@@ -208,7 +208,7 @@ void buf_destroy (struct Buf *buf)
 {
        if (buf && buf->elts)
                flex_free (buf->elts);
-       buf->elts = (void *) 0;
+       buf->elts = NULL;
 }
 
 

diff --git a/src/dfa.c b/src/dfa.c
index c47f48d8f7d046a02eb2e05bc4eea52e934b7ca0..f96874d13e7b8310efa01964ff00bfa52da4bbfd 100644 (file)
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -870,7 +870,7 @@ int snstods (int sns[], int numstates, int accset[], int nacc, int hashval, int
 
        if (nacc == 0) {
                if (reject)
-                       dfaacc[newds].dfaacc_set = (int *) 0;
+                       dfaacc[newds].dfaacc_set = NULL;
                else
                        dfaacc[newds].dfaacc_state = 0;
 

diff --git a/src/main.c b/src/main.c
index 7d45cb3d3ac812cd263f2a5a28e6297ecdbb0133..4c6ac34d6e07a8c715ef34a82c144be37aeab6eb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1451,9 +1451,9 @@ void readin (void)
 {
        static char yy_stdinit[] = "FILE *yyin = stdin, *yyout = stdout;";
        static char yy_nostdinit[] =
-               "FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;";
+               "FILE *yyin = NULL, *yyout = NULL;";
 
-       line_directive_out ((FILE *) 0, 1);
+       line_directive_out(NULL, 1);
 
        if (yyparse ()) {
                pinpoint_message (_("fatal parse error"));
@@ -1760,7 +1760,7 @@ void set_up_initial_allocations (void)
        dss = allocate_int_ptr_array (current_max_dfas);
        dfaacc = allocate_dfaacc_union (current_max_dfas);
 
-       nultrans = (int *) 0;
+       nultrans = NULL;
 }
 
 

diff --git a/src/nfa.c b/src/nfa.c
index b84a6e55d7afb46c2ab9350afd97f0e58595e131..f3ea1a45ec7a9b9c2c50068ea8419c343e39d507 100644 (file)
--- a/src/nfa.c
+++ b/src/nfa.c
@@ -286,7 +286,7 @@ void    finish_rule (int mach, int variable_trail_rule, int headcnt, int trailcn
        if (!continued_action)
                add_action ("YY_RULE_SETUP\n");
 
-       line_directive_out ((FILE *) 0, 1);
+       line_directive_out(NULL, 1);
 }
 
 

diff --git a/src/parse.y b/src/parse.y
index 9bec1ee38aee1ce60725cc9761153b64f26b0e2b..c28d5bb2fac87ff258e8c28f0719bcf674af7f79 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -976,7 +976,7 @@ void build_eof_action(void)
                        }
                }
 
-       line_directive_out( (FILE *) 0, 1 );
+       line_directive_out(NULL, 1);
 
        /* This isn't a normal rule after all - don't count it as
         * such, so we don't have any holes in the rule numbering

diff --git a/src/scan.l b/src/scan.l
index 4a96f2325ad41eb9a6ce36f2db7bc869e4469c58..4ee070ca27dec22398b7cd1288b89165964b628f 100644 (file)
--- a/src/scan.l
+++ b/src/scan.l
@@ -146,7 +146,7 @@ M4QEND      "]]"
        ^"%x"{NAME}?    return XSCDECL;
        ^"%{".*{NL}     {
                        ++linenum;
-                       line_directive_out( (FILE *) 0, 1 );
+                       line_directive_out(NULL, 1);
                        indented_code = false;
                        BEGIN(CODEBLOCK);
                        }
@@ -166,7 +166,7 @@ M4QEND      "]]"
                        sectnum = 2;
                        bracelevel = 0;
                        mark_defs1();
-                       line_directive_out( (FILE *) 0, 1 );
+                       line_directive_out(NULL, 1);
                        BEGIN(SECT2PROLOG);
                        return SECTEND;
                        }

diff --git a/src/scanopt.c b/src/scanopt.c
index 70c638dd1557c884259a58dcb0da193e505cd5a7..2fe33f631324af4f4fb4acc4a377ebc9859734b5 100644 (file)
--- a/src/scanopt.c
+++ b/src/scanopt.c
@@ -569,7 +569,7 @@ static int matchlongopt (char *str, char **optname, int *optlen, char **arg, int
 {
        char   *p;
 
-       *optname = *arg = (char *) 0;
+       *optname = *arg = NULL;
        *optlen = *arglen = 0;
 
        /* Match regex /--./   */

diff --git a/src/sym.c b/src/sym.c
index 8d6b278d3b0d4cab8d8fcc9b1b373c24f717aa9b..8b08c9fc7f480cee71a6711f072f4987d14655d7 100644 (file)
--- a/src/sym.c
+++ b/src/sym.c
@@ -141,8 +141,7 @@ int     ccllookup (unsigned char ccltxt[])
 static struct hash_entry *findsym (const char *sym, hash_table table, int table_size)
 {
        static struct hash_entry empty_entry = {
-               (struct hash_entry *) 0, (struct hash_entry *) 0,
-               (char *) 0, (char *) 0, 0,
+               NULL, NULL, NULL, NULL, 0,
        };
        struct hash_entry *sym_entry =
 
@@ -229,7 +228,7 @@ void    scinstal (const char *str, int xcluflg)
 
        scname[lastsc] = xstrdup(str);
 
-       if (addsym (scname[lastsc], (char *) 0, lastsc,
+       if (addsym(scname[lastsc], NULL, lastsc,
                    sctbl, START_COND_HASH_SIZE))
                        format_pinpoint_message (_
                                                 ("start condition %s declared twice"),

diff --git a/to.do/unicode/main.c b/to.do/unicode/main.c
index eee3c3e638d2662cebb046efc76322f75335c0fa..ca38e10fe02fba9922ea553e549d0b353604f1bc 100644 (file)
--- a/to.do/unicode/main.c
+++ b/to.do/unicode/main.c
@@ -908,9 +908,9 @@ void readin()
        {
        static char yy_stdinit[] = "FILE *yyin = stdin, *yyout = stdout;";
        static char yy_nostdinit[] =
-               "FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;";
+               "FILE *yyin = NULL, *yyout = NULL;";
 
-       line_directive_out( (FILE *) 0, 1 );
+       line_directive_out(NULL, 1);
 
        if ( yyparse() )
                {
@@ -1155,7 +1155,7 @@ void set_up_initial_allocations()
        dss = allocate_int_ptr_array( current_max_dfas );
        dfaacc = allocate_dfaacc_union( current_max_dfas );
 
-       nultrans = (int *) 0;
+       nultrans = NULL;
        }
 
 

diff --git a/to.do/unicode/scan.l b/to.do/unicode/scan.l
index d7bda22656ec79ee4628d02904de375ca55a7fb6..34cac7791c2a4c244ed25c3e431a0d4b5bc5bfa3 100644 (file)
--- a/to.do/unicode/scan.l
+++ b/to.do/unicode/scan.l
@@ -109,7 +109,7 @@ LEXOPT              [aceknopr]
        ^"%x"{NAME}?    return XSCDECL;
        ^"%{".*{NL}     {
                        ++linenum;
-                       line_directive_out( (FILE *) 0, 1 );
+                       line_directive_out(NULL, 1);
                        indented_code = false;
                        BEGIN(CODEBLOCK);
                        }
@@ -120,7 +120,7 @@ LEXOPT              [aceknopr]
                        sectnum = 2;
                        bracelevel = 0;
                        mark_defs1();
-                       line_directive_out( (FILE *) 0, 1 );
+                       line_directive_out(NULL, 1);
                        BEGIN(SECT2PROLOG);
                        return SECTEND;
                        }