projects / people / arne_f / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| c6060300 MT |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.153 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.153 (after 7.3.152) | |
| 11 | Problem: Compiler warning for ambiguous else, missing prototype. | |
| 12 | Solution: Add braces. (Dominique Pelle) Add prototype for die(). | |
| 13 | Files: src/xxd/xxd.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.152/src/xxd/xxd.c 2011-04-01 19:14:35.000000000 +0200 | |
| 17 | --- src/xxd/xxd.c 2011-04-02 14:42:54.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 210,215 **** | |
| 20 | --- 210,216 ---- | |
| 21 | /* Let's collect some prototypes */ | |
| 22 | /* CodeWarrior is really picky about missing prototypes */ | |
| 23 | static void exit_with_usage __P((void)); | |
| 24 | + static void die __P((int)); | |
| 25 | static int huntype __P((FILE *, FILE *, FILE *, int, int, long)); | |
| 26 | static void xxdline __P((FILE *, char *, int)); | |
| 27 | ||
| 28 | *************** | |
| 29 | *** 689,694 **** | |
| 30 | --- 690,696 ---- | |
| 31 | ||
| 32 | while (s--) | |
| 33 | if (getc(fp) == EOF) | |
| 34 | + { | |
| 35 | if (ferror(fp)) | |
| 36 | { | |
| 37 | die(2); | |
| 38 | *************** | |
| 39 | *** 698,703 **** | |
| 40 | --- 700,706 ---- | |
| 41 | fprintf(stderr, "%s: sorry cannot seek.\n", pname); | |
| 42 | return 4; | |
| 43 | } | |
| 44 | + } | |
| 45 | } | |
| 46 | } | |
| 47 | ||
| 48 | *** ../vim-7.3.152/src/version.c 2011-04-01 19:14:35.000000000 +0200 | |
| 49 | --- src/version.c 2011-04-02 14:41:12.000000000 +0200 | |
| 50 | *************** | |
| 51 | *** 716,717 **** | |
| 52 | --- 716,719 ---- | |
| 53 | { /* Add new patch number below this line */ | |
| 54 | + /**/ | |
| 55 | + 153, | |
| 56 | /**/ | |
| 57 | ||
| 58 | -- | |
| 59 | | | |
| 60 | ||
| 61 | Ceci n'est pas une pipe. | |
| 62 | ||
| 63 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 64 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 65 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 66 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |