Karsten Hopp 95699e
To: vim_dev@googlegroups.com
Karsten Hopp 95699e
Subject: Patch 7.3.153
Karsten Hopp 95699e
Fcc: outbox
Karsten Hopp 95699e
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 95699e
Mime-Version: 1.0
Karsten Hopp 95699e
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 95699e
Content-Transfer-Encoding: 8bit
Karsten Hopp 95699e
------------
Karsten Hopp 95699e
Karsten Hopp 95699e
Patch 7.3.153 (after 7.3.152)
Karsten Hopp 95699e
Problem:    Compiler warning for ambiguous else, missing prototype.
Karsten Hopp 95699e
Solution:   Add braces. (Dominique Pelle)  Add prototype for die().
Karsten Hopp 95699e
Files:	    src/xxd/xxd.c
Karsten Hopp 95699e
Karsten Hopp 95699e
Karsten Hopp 95699e
*** ../vim-7.3.152/src/xxd/xxd.c	2011-04-01 19:14:35.000000000 +0200
Karsten Hopp 95699e
--- src/xxd/xxd.c	2011-04-02 14:42:54.000000000 +0200
Karsten Hopp 95699e
***************
Karsten Hopp 95699e
*** 210,215 ****
Karsten Hopp 95699e
--- 210,216 ----
Karsten Hopp 95699e
  /* Let's collect some prototypes */
Karsten Hopp 95699e
  /* CodeWarrior is really picky about missing prototypes */
Karsten Hopp 95699e
  static void exit_with_usage __P((void));
Karsten Hopp 95699e
+ static void die __P((int));
Karsten Hopp 95699e
  static int huntype __P((FILE *, FILE *, FILE *, int, int, long));
Karsten Hopp 95699e
  static void xxdline __P((FILE *, char *, int));
Karsten Hopp 95699e
  
Karsten Hopp 95699e
***************
Karsten Hopp 95699e
*** 689,694 ****
Karsten Hopp 95699e
--- 690,696 ----
Karsten Hopp 95699e
  
Karsten Hopp 95699e
  	  while (s--)
Karsten Hopp 95699e
  	    if (getc(fp) == EOF)
Karsten Hopp 95699e
+ 	    {
Karsten Hopp 95699e
  	      if (ferror(fp))
Karsten Hopp 95699e
  		{
Karsten Hopp 95699e
  		  die(2);
Karsten Hopp 95699e
***************
Karsten Hopp 95699e
*** 698,703 ****
Karsten Hopp 95699e
--- 700,706 ----
Karsten Hopp 95699e
  		  fprintf(stderr, "%s: sorry cannot seek.\n", pname);
Karsten Hopp 95699e
  		  return 4;
Karsten Hopp 95699e
  		}
Karsten Hopp 95699e
+ 	    }
Karsten Hopp 95699e
  	}
Karsten Hopp 95699e
      }
Karsten Hopp 95699e
  
Karsten Hopp 95699e
*** ../vim-7.3.152/src/version.c	2011-04-01 19:14:35.000000000 +0200
Karsten Hopp 95699e
--- src/version.c	2011-04-02 14:41:12.000000000 +0200
Karsten Hopp 95699e
***************
Karsten Hopp 95699e
*** 716,717 ****
Karsten Hopp 95699e
--- 716,719 ----
Karsten Hopp 95699e
  {   /* Add new patch number below this line */
Karsten Hopp 95699e
+ /**/
Karsten Hopp 95699e
+     153,
Karsten Hopp 95699e
  /**/
Karsten Hopp 95699e
Karsten Hopp 95699e
-- 
Karsten Hopp 95699e
            |
Karsten Hopp 95699e
Karsten Hopp 95699e
Ceci n'est pas une pipe.
Karsten Hopp 95699e
Karsten Hopp 95699e
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 95699e
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 95699e
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp 95699e
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///