Mercurial > vim

changeset 2754:d0cae5983609 v7.3.153

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.153 Problem: Compiler warning for ambiguous else, missing prototype. Solution: Add braces. (Dominique Pelle) Add prototype for die().
author Bram Moolenaar <bram@vim.org>
date Sat, 02 Apr 2011 14:44:55 +0200
parents 6e042e124c4e
children 1772d74dcb35
files src/version.c src/xxd/xxd.c
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    153,
+/**/
     152,
 /**/
     151,
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -210,6 +210,7 @@ char osver[] = "";
 /* Let's collect some prototypes */
 /* CodeWarrior is really picky about missing prototypes */
 static void exit_with_usage __P((void));
+static void die __P((int));
 static int huntype __P((FILE *, FILE *, FILE *, int, int, long));
 static void xxdline __P((FILE *, char *, int));
 
@@ -689,6 +690,7 @@ main(argc, argv)
 
 	  while (s--)
 	    if (getc(fp) == EOF)
+	    {
 	      if (ferror(fp))
 		{
 		  die(2);
@@ -698,6 +700,7 @@ main(argc, argv)
 		  fprintf(stderr, "%s: sorry cannot seek.\n", pname);
 		  return 4;
 		}
+	    }
 	}
     }