gcc-2.95 cpplib.c/cpphash.c/cppfiles.c warning fixes

[Dave Brolley]

This patch is also OK.

Dave

Philippe De Muyter wrote:

> Sun Jun  6 13:41:46 1999  Philippe De Muyter  <phdm@macqel.be>
>
>         * cpplib.c (do_define): Cast `alloca' return value.
>         (do_include, do_undef, do_pragma): Likewise.
>         * cpphash (dump_definition): Cast `xstrdup' and `alloca' return values.
>         * cppfiles.c (initialize_input_buffer): Cast `xmalloc' return values.
>
> --- ./gcc/cpplib.c      Sun Jun  6 13:39:01 1999
> +++ ./gcc/cpplib.c      Sun Jun  6 13:34:10 1999
> @@ -624,7 +624,7 @@ do_define (pfile, keyword)
>    /* Copy out the line so we can pop the token buffer. */
>    buf = pfile->token_buffer + here;
>    end = CPP_PWRITTEN (pfile);
> -  macro = alloca (end - buf + 1);
> +  macro = (U_CHAR *) alloca (end - buf + 1);
>    bcopy (buf, macro, end - buf + 1);
>    end = macro + (end - buf);
>
> @@ -1015,7 +1015,7 @@ do_include (pfile, keyword)
>      }
>
>    flen = CPP_WRITTEN (pfile) - old_written;
> -  ftok = alloca (flen + 1);
> +  ftok = (unsigned char *) alloca (flen + 1);
>    memcpy (ftok, pfile->token_buffer + old_written, flen);
>    ftok[flen] = '\0';
>
> @@ -1342,7 +1342,7 @@ do_undef (pfile, keyword)
>    limit = CPP_PWRITTEN(pfile);
>
>    /* Copy out the token so we can pop the token buffer. */
> -  name = alloca (limit - buf + 1);
> +  name = (U_CHAR *) alloca (limit - buf + 1);
>    bcopy(buf, name, limit - buf);
>    name[limit - buf] = '\0';
>
> @@ -1507,7 +1507,7 @@ do_pragma (pfile, keyword)
>        fname = p + 1;
>        p = (U_CHAR *) index (fname, '\"');
>
> -      fcopy = alloca (p - fname + 1);
> +      fcopy = (U_CHAR *) alloca (p - fname + 1);
>        bcopy (fname, fcopy, p - fname);
>        fcopy[p-fname] = '\0';
>
> --- ./gcc/cpphash.c     Sun Jun  6 13:39:03 1999
> +++ ./gcc/cpphash.c     Sun Jun  6 13:35:47 1999
> @@ -1665,9 +1665,10 @@ dump_definition (pfile, macro)
>    else
>      {
>        struct reflist *r;
> -      unsigned char *argnames = xstrdup (defn->args.argnames);
> -      unsigned char **argv = alloca (defn->nargs * sizeof(char *));
> -      int *argl = alloca (defn->nargs * sizeof(int));
> +      unsigned char *argnames = (unsigned char *) xstrdup (defn->args.argnames);
> +      unsigned char **argv = (unsigned char **) alloca (defn->nargs *
> +                                                       sizeof(char *));
> +      int *argl = (int *) alloca (defn->nargs * sizeof(int));
>        unsigned char *x;
>        int i;
>
> --- ./gcc/cppfiles.c    Sun Jun  6 13:39:04 1999
> +++ ./gcc/cppfiles.c    Sun Jun  6 13:36:58 1999
> @@ -1100,7 +1100,7 @@ initialize_input_buffer (pfile, fd, st)
>       read_and_prescan inner loop.  The number of non-EMPTY entries
>       should be as small as humanly possible.  */
>
> -  tmp = xmalloc (1 << CHAR_BIT);
> +  tmp = (U_CHAR *) xmalloc (1 << CHAR_BIT);
>    memset (tmp, SPECCASE_EMPTY, 1 << CHAR_BIT);
>    tmp['\0'] = SPECCASE_NUL;
>    tmp['\r'] = SPECCASE_CR;
> @@ -1138,7 +1138,7 @@ initialize_input_buffer (pfile, fd, st)
>       the case there's a potential trigraph or end-of-line digraph at
>       the end of a block. */
>
> -  tmp = xmalloc (pipe_buf + 2 + 2);
> +  tmp = (U_CHAR *) xmalloc (pipe_buf + 2 + 2);
>    pfile->input_buffer = tmp;
>    pfile->input_buffer_len = pipe_buf;
>  }