From 477b246771158850962bf17d9ba58b4650754ed5 Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Mon, 6 Nov 2017 07:13:50 -0600
Subject: [PATCH] tweaks: use printf's z modifier for most of the
size_t/ssize_t types
Also, properly refer to numreplaced as signed, since it's ssize_t
(even though it's only shown when positive).
---
src/files.c | 26 +++++++++++++-------------
src/history.c | 4 ++--
src/search.c | 5 ++---
src/utils.c | 5 ++---
src/winio.c | 2 +-
5 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/src/files.c b/src/files.c
index 42426e33..a9b3003c 100644
--- a/src/files.c
+++ b/src/files.c
@@ -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);
}
diff --git a/src/history.c b/src/history.c
index 5ee5091f..aa4f60f5 100644
--- a/src/history.c
+++ b/src/history.c
@@ -472,8 +472,8 @@ void save_poshistory(void)
/* Assume 20 decimal positions each for line and column number,
* plus two spaces, plus the line feed, plus the null byte. */
path_and_place = charalloc(strlen(posptr->filename) + 44);
- sprintf(path_and_place, "%s %ld %ld\n", posptr->filename,
- (long)posptr->lineno, (long)posptr->xno);
+ sprintf(path_and_place, "%s %zd %zd\n",
+ posptr->filename, posptr->lineno, posptr->xno);
length = strlen(path_and_place);
/* Encode newlines in filenames as nulls. */
diff --git a/src/search.c b/src/search.c
index a63885f4..8a6ae4a0 100644
--- a/src/search.c
+++ b/src/search.c
@@ -778,9 +778,8 @@ void do_replace(void)
refresh_needed = TRUE;
if (numreplaced >= 0)
- statusline(HUSH, P_("Replaced %lu occurrence",
- "Replaced %lu occurrences", (unsigned long)numreplaced),
- (unsigned long)numreplaced);
+ statusline(HUSH, P_("Replaced %zd occurrence",
+ "Replaced %zd occurrences", numreplaced), numreplaced);
search_replace_abort();
}
diff --git a/src/utils.c b/src/utils.c
index 530dd2cd..87243038 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -559,7 +559,7 @@ void dump_filestruct(const filestruct *inptr)
fprintf(stderr, "Dumping a buffer to stderr...\n");
while (inptr != NULL) {
- fprintf(stderr, "(%ld) %s\n", (long)inptr->lineno, inptr->data);
+ fprintf(stderr, "(%zd) %s\n", inptr->lineno, inptr->data);
inptr = inptr->next;
}
}
@@ -570,8 +570,7 @@ void dump_filestruct_reverse(void)
const filestruct *fileptr = openfile->filebot;
while (fileptr != NULL) {
- fprintf(stderr, "(%ld) %s\n", (long)fileptr->lineno,
- fileptr->data);
+ fprintf(stderr, "(%zd) %s\n", fileptr->lineno, fileptr->data);
fileptr = fileptr->prev;
}
}
diff --git a/src/winio.c b/src/winio.c
index cd466d2d..215adf2d 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -2433,7 +2433,7 @@ void edit_draw(filestruct *fileptr, const char *converted,
mvwprintw(edit, row, 0, "%*s", margin - 1, " ");
else
#endif
- mvwprintw(edit, row, 0, "%*ld", margin - 1, (long)fileptr->lineno);
+ mvwprintw(edit, row, 0, "%*zd", margin - 1, fileptr->lineno);
wattroff(edit, interface_color_pair[LINE_NUMBER]);
}
#endif
--
GitLab