LineageOS/android_external_nano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweaks: use printf's z modifier for most of the size_t/ssize_t types

Browse Source 
Also, properly refer to numreplaced as signed, since it's ssize_t
(even though it's only shown when positive).
This commit is contained in:
David Lawrence Ramsey
2017-11-06 07:13:50 -06:00
committed by Benno Schulenberg
parent 7d653e5a17
commit 477b246771
5 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/files.c
View File

@@ -891,24 +891,24 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable,
#ifndef NANO_TINY
else if (format == 3) {
/* TRANSLATORS: Keep the next four messages at most 78 characters. */
statusline(HUSH, P_("Read %lu line (Converted from DOS and Mac format)",
"Read %lu lines (Converted from DOS and Mac format)",
(unsigned long)num_lines), (unsigned long)num_lines);
statusline(HUSH, P_("Read %zu line (Converted from DOS and Mac format)",
"Read %zu lines (Converted from DOS and Mac format)",
num_lines), num_lines);
} else if (format == 2) {
openfile->fmt = MAC_FILE;
statusline(HUSH, P_("Read %lu line (Converted from Mac format)",
"Read %lu lines (Converted from Mac format)",
(unsigned long)num_lines), (unsigned long)num_lines);
statusline(HUSH, P_("Read %zu line (Converted from Mac format)",
"Read %zu lines (Converted from Mac format)",
num_lines), num_lines);
} else if (format == 1) {
openfile->fmt = DOS_FILE;
statusline(HUSH, P_("Read %lu line (Converted from DOS format)",
"Read %lu lines (Converted from DOS format)",
(unsigned long)num_lines), (unsigned long)num_lines);
statusline(HUSH, P_("Read %zu line (Converted from DOS format)",
"Read %zu lines (Converted from DOS format)",
num_lines), num_lines);
}
#endif
else
statusline(HUSH, P_("Read %lu line", "Read %lu lines",
(unsigned long)num_lines), (unsigned long)num_lines);
statusline(HUSH, P_("Read %zu line", "Read %zu lines",
num_lines), num_lines);
/* If we inserted less than a screenful, don't center the cursor. */
if (undoable && less_than_a_screenful(was_lineno, was_leftedge))
@@ -1957,8 +1957,8 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
stat_with_alloc(realname, &openfile->current_stat);
#endif
statusline(HUSH, P_("Wrote %lu line", "Wrote %lu lines",
(unsigned long)lineswritten), (unsigned long)lineswritten);
statusline(HUSH, P_("Wrote %zu line", "Wrote %zu lines",
lineswritten), lineswritten);
openfile->modified = FALSE;
titlebar(NULL);
}