summaryrefslogtreecommitdiff
path: root/src/mark.c
diff options
context:
space:
mode:
authorAmadeusz Sławiński <amade@asmblr.net>2017-07-06 12:50:52 +0200
committerAmadeusz Sławiński <amade@asmblr.net>2017-07-09 23:50:29 +0200
commite1dd1c2fe9339c57f743e41032d379c85c1c3388 (patch)
tree664d4f1911a58f4e867043febf6f426f95cdb607 /src/mark.c
parent4f9fbd49aa6c73667834f273bebfc0b0931fb171 (diff)
downloadscreen-e1dd1c2fe9339c57f743e41032d379c85c1c3388.tar.gz
type cleanups
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
Diffstat (limited to 'src/mark.c')
-rw-r--r--src/mark.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mark.c b/src/mark.c
index 663cd6e..feb5a6b 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -239,11 +239,11 @@ static void nextword(int *xp, int *yp, int flags, int num)
static int rem(int x1, int y1, int x2, int y2, int redisplay, char *pt, int yend)
{
- int i, j, from, to, ry, c;
+ int i, j, from, to, ry;
int l = 0;
uint32_t *im;
struct mline *ml;
- int cf, cfx, font;
+ int font;
uint32_t *fo, *fox;
markdata->second = 0;
@@ -288,9 +288,9 @@ static int rem(int x1, int y1, int x2, int y2, int redisplay, char *pt, int yend
fox = ml->fontx + j;
font = ASCII;
for (; j <= to; j++) {
- c = (unsigned char)*im++;
- cf = (unsigned char)*fo++;
- cfx = (unsigned char)*fox++;
+ uint32_t c = *im++;
+ uint32_t cf = *fo++;
+ uint32_t cfx = *fox++;
if (fore->w_encoding == UTF8) {
c |= cf << 8 | cfx << 16;
if (c == UCS_HIDDEN)
@@ -302,7 +302,7 @@ static int rem(int x1, int y1, int x2, int y2, int redisplay, char *pt, int yend
continue;
}
if (is_dw_font(cf)) {
- c = c << 8 | (unsigned char)*im++;
+ c = c << 8 | *im++;
fo++;
j++;
}