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