diff options
author | Amadeusz Sławiński (amade) <amade@asmblr.net> | 2011-01-05 20:42:18 +0100 |
---|---|---|
committer | Amadeusz Sławiński <amade@asmblr.net> | 2014-05-15 17:33:42 +0200 |
commit | 044aa7680303a1ddf11d890fc7eaa0e84e8bf2a0 (patch) | |
tree | 700d93532ed67c2bea1033f87780422bac05256d | |
parent | 1df69c7b8c5237653f89cb7baa406804e99344e6 (diff) | |
download | screen-044aa7680303a1ddf11d890fc7eaa0e84e8bf2a0.tar.gz |
replace bcmp with memcmp
-rw-r--r-- | src/ansi.c | 8 | ||||
-rw-r--r-- | src/process.c | 4 | ||||
-rw-r--r-- | src/utmp.c | 2 |
3 files changed, 7 insertions, 7 deletions
@@ -2627,13 +2627,13 @@ MFindUsedLine(struct win *p, int ye, int ys) debug2("MFindUsedLine: %d %d\n", ye, ys); for (y = ye; y >= ys; y--, ml--) { - if (bcmp((char*)ml->image, blank, p->w_width)) + if (memcmp((char*)ml->image, blank, p->w_width)) break; - if (ml->attr != null && bcmp((char*)ml->attr, null, p->w_width)) + if (ml->attr != null && memcmp((char*)ml->attr, null, p->w_width)) break; - if (ml->color != null && bcmp((char*)ml->color, null, p->w_width)) + if (ml->color != null && memcmp((char*)ml->color, null, p->w_width)) break; - if (ml->colorx != null && bcmp((char*)ml->colorx, null, p->w_width)) + if (ml->colorx != null && memcmp((char*)ml->colorx, null, p->w_width)) break; if (p->w_encoding == UTF8) { diff --git a/src/process.c b/src/process.c index 28e5717..a7e9f30 100644 --- a/src/process.c +++ b/src/process.c @@ -1926,7 +1926,7 @@ ProcessInput(char *ibuf, int ilen) if (D_seqp[l] != l) { q = D_seqp + 1 + l; - if (D_kmaps + D_nseqs > q && q[2] > l && !bcmp(D_seqp - l, q + 3, l)) + if (D_kmaps + D_nseqs > q && q[2] > l && !memcmp(D_seqp - l, q + 3, l)) { debug1("have another mapping (%s), delay execution\n", q + 3); D_seqh = D_seqp - 3 - l; @@ -4361,7 +4361,7 @@ DoAction(struct action *act, int key) break; } else - if (*argl == (kme->fl & ~KMAP_NOTIMEOUT) && bcmp(kme->str, *args, *argl) == 0) + if (*argl == (kme->fl & ~KMAP_NOTIMEOUT) && memcmp(kme->str, *args, *argl) == 0) break; if (i == kmap_extn) { @@ -424,7 +424,7 @@ SetUtmp(struct win *win) debug2("SetUtmp %d will get slot %d...\n", win->w_number, (int)slot); memset((char *)&u, 0, sizeof(u)); - if ((saved_ut = bcmp((char *) &win->w_savut, (char *)&u, sizeof(u)))) + if ((saved_ut = memcmp((char *) &win->w_savut, (char *)&u, sizeof(u)))) /* restore original, of which we will adopt all fields but ut_host */ memmove((char *) &u, (char *)&win->w_savut, sizeof(u)); |