Texinfo 4.0 misc bug fixes

[Mark Montague]

None of these bug fixes are incredibly important.  I'm submitting them
just on the chance that no one else has already.  They are all
compiler warning fixes which could possibly result in segfaults in
some odd cases.

GNU texinfo 4.0
sparc64-sun-solaris2.8
Sun Forte 6.0 complier


Please let me know if you'd like any additional information.  Patches
are below.

Thanks.

                Mark Montague
                LS&A Information Technology
                address@hidden



2001-06-19  Mark Montague  <address@hidden>

        * info/filesys.c: fix for sparc64 (offsets should be "long"s).

        * info/session.c: fix typos in function calls.

        * makeinfo/makeinfo.c: fix typo in call to usage().

        * makeinfo/multi.c: fix typo.



*** ./info/filesys.c.orig       Tue Jun 19 14:01:56 2001
--- ./info/filesys.c    Tue Jun 19 14:02:27 2001
***************
*** 557,563 ****
    /* Read chunks from this file until there are none left to read. */
    if (stream)
      {
!       int offset, size;
        char *chunk;

        offset = size = 0;
--- 557,563 ----
    /* Read chunks from this file until there are none left to read. */
    if (stream)
      {
!       long offset, size;
        char *chunk;

        offset = size = 0;

*** ./info/session.c.orig       Tue Jun 19 14:22:40 2001
--- ./info/session.c    Tue Jun 19 14:24:38 2001
***************
*** 1301,1307 ****
                      _("Scroll down by half screen size"))
  {
    if (count < 0)
!     info_scroll_half_screen_up (window -count, key);
    else
      {
        int scroll_size = (the_screen->height + 1) / 2;
--- 1301,1307 ----
                      _("Scroll down by half screen size"))
  {
    if (count < 0)
!     info_scroll_half_screen_up (window, -count, key);
    else
      {
        int scroll_size = (the_screen->height + 1) / 2;
***************
*** 1327,1333 ****
                      _("Scroll up by half screen size"))
  {
    if (count < 0)
!     info_scroll_half_screen_down (window -count, key);
    else
      {
        int scroll_size = (the_screen->height + 1) / 2;
--- 1327,1333 ----
                      _("Scroll up by half screen size"))
  {
    if (count < 0)
!     info_scroll_half_screen_down (window, -count, key);
    else
      {
        int scroll_size = (the_screen->height + 1) / 2;

*** ./makeinfo/makeinfo.c.orig  Tue Jun 19 15:23:32 2001
--- ./makeinfo/makeinfo.c       Tue Jun 19 15:24:20 2001
***************
*** 507,513 ****
                fprintf (stderr,
                        _("%s: %s arg must be numeric, not `%s'.\n"),
                        "--error-limit", progname, optarg);
!               usage (stderr, 1);
              }
            break;

--- 507,513 ----
                fprintf (stderr,
                        _("%s: %s arg must be numeric, not `%s'.\n"),
                        "--error-limit", progname, optarg);
!               usage (1);
              }
            break;


*** ./makeinfo/multi.c.orig     Tue Jun 19 15:28:50 2001
--- ./makeinfo/multi.c  Tue Jun 19 15:29:05 2001
***************
*** 388,394 ****
        add_word ("<br></tr>"); /* <br> for non-tables browsers. */
        add_word ("<tr align=\"left\"><td>");
        first_row = 0;
!       return;
      }
    first_row = 0;

--- 388,394 ----
        add_word ("<br></tr>"); /* <br> for non-tables browsers. */
        add_word ("<tr align=\"left\"><td>");
        first_row = 0;
!       return 0;
      }
    first_row = 0;