diff options
| -rw-r--r-- | src/buffer.c | 4 | ||||
| -rw-r--r-- | src/ex_cmds.c | 2 | ||||
| -rw-r--r-- | src/memline.c | 5 | ||||
| -rw-r--r-- | src/screen.c | 6 | ||||
| -rw-r--r-- | src/window.c | 4 |
5 files changed, 11 insertions, 10 deletions
diff --git a/src/buffer.c b/src/buffer.c index 80502aa0e3..9164664bbf 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -4306,8 +4306,8 @@ void write_viminfo_bufferlist(FILE *fp) break; putc('%', fp); home_replace(NULL, buf->b_ffname, line, MAXPATHL, TRUE); - vim_snprintf_add((char *)line, LINE_BUF_LEN, "\t%ld\t%d", - (long)buf->b_last_cursor.lnum, + vim_snprintf_add((char *)line, LINE_BUF_LEN, "\t%" PRId64 "\t%d", + (int64_t)buf->b_last_cursor.lnum, buf->b_last_cursor.col); viminfo_writestring(fp, line); } diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 4d17e7ba41..b3b6e0c0f2 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2738,7 +2738,7 @@ do_ecmd ( if (command != NULL) vim_snprintf((char *)p, len, ":%s\r", command); else - vim_snprintf((char *)p, len, "%ldG", (long)newlnum); + vim_snprintf((char *)p, len, "%" PRId64 "G", (int64_t)newlnum); set_vim_var_string(VV_SWAPCOMMAND, p, -1); did_set_swapcommand = TRUE; vim_free(p); diff --git a/src/memline.c b/src/memline.c index ac6a16f807..89085745a1 100644 --- a/src/memline.c +++ b/src/memline.c @@ -4263,12 +4263,13 @@ static void ml_crypt_prepare(memfile_T *mfp, off_t offset, int reading) use_crypt_method = method; /* select pkzip or blowfish */ if (method == 0) { - vim_snprintf((char *)salt, sizeof(salt), "%s%ld", key, (long)offset); + vim_snprintf((char *)salt, sizeof(salt), "%s%" PRId64 "", + key, (int64_t)offset); crypt_init_keys(salt); } else { /* Using blowfish, add salt and seed. We use the byte offset of the * block for the salt. */ - vim_snprintf((char *)salt, sizeof(salt), "%ld", (long)offset); + vim_snprintf((char *)salt, sizeof(salt), "%" PRId64, (int64_t)offset); bf_key_init(key, salt, (int)STRLEN(salt)); bf_cfb_init(seed, MF_SEED_LEN); } diff --git a/src/screen.c b/src/screen.c index fde1fb7856..00a749ab61 100644 --- a/src/screen.c +++ b/src/screen.c @@ -7900,10 +7900,10 @@ static void win_redr_ruler(win_T *wp, int always) * Some sprintfs return the length, some return a pointer. * To avoid portability problems we use strlen() here. */ - vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", + vim_snprintf((char *)buffer, RULER_BUF_LEN, "%" PRId64 ",", (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) - ? 0L - : (long)(wp->w_cursor.lnum)); + ? (int64_t)0L + : (int64_t)(wp->w_cursor.lnum)); len = STRLEN(buffer); col_print(buffer + len, RULER_BUF_LEN - len, empty_line ? 0 : (int)wp->w_cursor.col + 1, diff --git a/src/window.c b/src/window.c index 0552ab4582..e5786fae84 100644 --- a/src/window.c +++ b/src/window.c @@ -172,7 +172,7 @@ do_window ( STRCPY(cbuf, "split #"); if (Prenum) vim_snprintf((char *)cbuf + 7, sizeof(cbuf) - 7, - "%ld", Prenum); + "%" PRId64, (int64_t)Prenum); do_cmdline_cmd(cbuf); break; @@ -183,7 +183,7 @@ do_window ( newwindow: if (Prenum) /* window height */ - vim_snprintf((char *)cbuf, sizeof(cbuf) - 5, "%ld", Prenum); + vim_snprintf((char *)cbuf, sizeof(cbuf) - 5, "%" PRId64, (int64_t)Prenum); else cbuf[0] = NUL; if (nchar == 'v' || nchar == Ctrl_V) |