diff options
Diffstat (limited to 'mark.c')
| -rw-r--r-- | mark.c | 36 |
1 files changed, 18 insertions, 18 deletions
@@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2023 Mark Nudelman + * Copyright (C) 1984-2024 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -73,7 +73,7 @@ public void init_mark(void) switch (i) { case MOUSEMARK: letter = '#'; break; case LASTMARK: letter = '\''; break; - default: letter = (i < 26) ? 'a'+i : 'A'+i-26; break; + default: letter = (char) ((i < 26) ? 'a'+i : 'A'+i-26); break; } marks[i].m_letter = letter; cmark(&marks[i], NULL_IFILE, NULL_POSITION, -1); @@ -104,7 +104,7 @@ static void mark_get_ifile(struct mark *m) /* * Return the user mark struct identified by a character. */ -static struct mark * getumark(LWCHAR c) +static struct mark * getumark(char c) { PARG parg; if (c >= 'a' && c <= 'z') @@ -125,7 +125,7 @@ static struct mark * getumark(LWCHAR c) * The mark struct may either be in the mark table (user mark) * or may be constructed on the fly for certain characters like ^, $. */ -static struct mark * getmark(LWCHAR c) +static struct mark * getmark(char c) { struct mark *m; static struct mark sm; @@ -185,7 +185,7 @@ static struct mark * getmark(LWCHAR c) /* * Is a mark letter invalid? */ -public int badmark(LWCHAR c) +public int badmark(char c) { return (getmark(c) == NULL); } @@ -193,7 +193,7 @@ public int badmark(LWCHAR c) /* * Set a user-defined mark. */ -public void setmark(LWCHAR c, int where) +public void setmark(char c, int where) { struct mark *m; struct scrpos scrpos; @@ -214,7 +214,7 @@ public void setmark(LWCHAR c, int where) /* * Clear a user-defined mark. */ -public void clrmark(LWCHAR c) +public void clrmark(char c) { struct mark *m; @@ -249,7 +249,7 @@ public void lastmark(void) /* * Go to a mark. */ -public void gomark(LWCHAR c) +public void gomark(char c) { struct mark *m; struct scrpos scrpos; @@ -290,7 +290,7 @@ public void gomark(LWCHAR c) * is associated with, but this doesn't matter much, * because it's always the first non-blank line on the screen. */ -public POSITION markpos(LWCHAR c) +public POSITION markpos(char c) { struct mark *m; @@ -311,15 +311,15 @@ public POSITION markpos(LWCHAR c) */ public char posmark(POSITION pos) { - int i; + unsigned char i; /* Only user marks */ for (i = 0; i < NUMARKS; i++) { if (marks[i].m_ifile == curr_ifile && marks[i].m_scrpos.pos == pos) { - if (i < 26) return 'a' + i; - if (i < 26*2) return 'A' + (i - 26); + if (i < 26) return (char) ('a' + i); + if (i < 26*2) return (char) ('A' + (i - 26)); return '#'; } } @@ -345,7 +345,7 @@ public void unmark(IFILE ifile) public void mark_check_ifile(IFILE ifile) { int i; - char *filename = get_real_filename(ifile); + constant char *filename = get_real_filename(ifile); for (i = 0; i < NMARKS; i++) { @@ -366,7 +366,7 @@ public void mark_check_ifile(IFILE ifile) /* * Save marks to history file. */ -public void save_marks(FILE *fout, char *hdr) +public void save_marks(FILE *fout, constant char *hdr) { int i; @@ -376,7 +376,7 @@ public void save_marks(FILE *fout, char *hdr) fprintf(fout, "%s\n", hdr); for (i = 0; i < NMARKS; i++) { - char *filename; + constant char *filename; struct mark *m = &marks[i]; char pos_str[INT_STRLEN_BOUND(m->m_scrpos.pos) + 2]; if (m->m_scrpos.pos == NULL_POSITION) @@ -394,7 +394,7 @@ public void save_marks(FILE *fout, char *hdr) /* * Restore one mark from the history file. */ -public void restore_mark(char *line) +public void restore_mark(constant char *line) { struct mark *m; int ln; @@ -408,7 +408,7 @@ public void restore_mark(char *line) if (m == NULL) return; skip_whitespace; - ln = lstrtoi(line, &line, 10); + ln = lstrtoic(line, &line, 10); if (ln < 0) return; if (ln < 1) @@ -416,7 +416,7 @@ public void restore_mark(char *line) if (ln > sc_height) ln = sc_height; skip_whitespace; - pos = lstrtopos(line, &line, 10); + pos = lstrtoposc(line, &line, 10); if (pos < 0) return; skip_whitespace; |