summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2011-02-25 15:11:22 +0100
committerBram Moolenaar <bram@vim.org>2011-02-25 15:11:22 +0100
commitf1f2b7f77cd609deb7b8965a272fb91847c5dcaf (patch)
tree1eea61d1aa303c1133fe71f04169bd6c3fdd220f
parent481ba383ba0ed9672661e083c77efbb739b83f96 (diff)
downloadvim-7-3-128.tar.gz
updated for version 7.3.128v7.3.128v7-3-128
Problem: Another compiler warning for signed pointer. Solution: Use unsigned int argument for sscanf().
-rw-r--r--src/mark.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/mark.c b/src/mark.c
index 2669cb14..f8b4c576 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -1750,7 +1750,10 @@ copy_viminfo_marks(virp, fp_out, count, eof, flags)
{
if (line[1] != NUL)
{
- sscanf((char *)line + 2, "%ld %u", &pos.lnum, &pos.col);
+ unsigned u;
+
+ sscanf((char *)line + 2, "%ld %u", &pos.lnum, &u);
+ pos.col = u;
switch (line[1])
{
case '"': curbuf->b_last_cursor = pos; break;
diff --git a/src/version.c b/src/version.c
index e72af8e7..7e6af4e7 100644
--- 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 */
/**/
+ 128,
+/**/
127,
/**/
126,