storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warning for unused variable without USE_M17N

Browse Source
This commit is contained in:
Rene Kita
2021-09-13 19:47:02 +02:00
parent 916104b7f2
commit 4901408ea5
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
display.c
+2 -4
View File
@@ -1368,15 +1368,14 @@ cursorRight(Buffer *buf, int n)
{ {
int i, delta = 1, cpos, vpos2; int i, delta = 1, cpos, vpos2;
Line *l = buf->currentLine; Line *l = buf->currentLine;
Lineprop *p;
if (buf->firstLine == NULL) if (buf->firstLine == NULL)
return; return;
if (buf->pos == l->len && !(l->next && l->next->bpos)) if (buf->pos == l->len && !(l->next && l->next->bpos))
return; return;
i = buf->pos; i = buf->pos;
p = l->propBuf;
#ifdef USE_M17N #ifdef USE_M17N
Lineprop *p = l->propBuf;
while (i + delta < l->len && p[i + delta] & PC_WCHAR2) while (i + delta < l->len && p[i + delta] & PC_WCHAR2)
delta++; delta++;
#endif #endif
@@ -1419,13 +1418,12 @@ cursorLeft(Buffer *buf, int n)
{ {
int i, delta = 1, cpos; int i, delta = 1, cpos;
Line *l = buf->currentLine; Line *l = buf->currentLine;
Lineprop *p;
if (buf->firstLine == NULL) if (buf->firstLine == NULL)
return; return;
i = buf->pos; i = buf->pos;
p = l->propBuf;
#ifdef USE_M17N #ifdef USE_M17N
Lineprop *p = l->propBuf;
while (i - delta > 0 && p[i - delta] & PC_WCHAR2) while (i - delta > 0 && p[i - delta] & PC_WCHAR2)
delta++; delta++;
#endif #endif
etc.c
+3 -1
View File
@@ -253,8 +253,10 @@ checkType(Str s, Lineprop **oprop, Linecolor **ocolor)
char *es = NULL; char *es = NULL;
#endif #endif
int do_copy = FALSE; int do_copy = FALSE;
#ifdef USE_M17N
int i; int i;
int plen = 0, clen; int plen = 0, clen;
#endif
if (prop_size < s->length) { if (prop_size < s->length) {
prop_size = (s->length > LINELEN) ? s->length : LINELEN; prop_size = (s->length > LINELEN) ? s->length : LINELEN;
@@ -429,7 +431,6 @@ checkType(Str s, Lineprop **oprop, Linecolor **ocolor)
} }
#endif #endif
plen = get_mclen(str);
mode = get_mctype(str) | effect; mode = get_mctype(str) | effect;
#ifdef USE_ANSI_COLOR #ifdef USE_ANSI_COLOR
if (color) { if (color) {
@@ -439,6 +440,7 @@ checkType(Str s, Lineprop **oprop, Linecolor **ocolor)
#endif #endif
*(prop++) = mode; *(prop++) = mode;
#ifdef USE_M17N #ifdef USE_M17N
plen = get_mclen(str);
if (plen > 1) { if (plen > 1) {
mode = (mode & ~PC_WCHAR1) | PC_WCHAR2; mode = (mode & ~PC_WCHAR1) | PC_WCHAR2;
for (i = 1; i < plen; i++) { for (i = 1; i < plen; i++) {
file.c
+1 -2
View File
@@ -8164,7 +8164,6 @@ int
save2tmp(URLFile uf, char *tmpf) save2tmp(URLFile uf, char *tmpf)
{ {
FILE *ff; FILE *ff;
int check;
clen_t linelen = 0, trbyte = 0; clen_t linelen = 0, trbyte = 0;
MySignalHandler(*volatile prevtrap) (SIGNAL_ARG) = NULL; MySignalHandler(*volatile prevtrap) (SIGNAL_ARG) = NULL;
static JMP_BUF env_bak; static JMP_BUF env_bak;
@@ -8181,8 +8180,8 @@ save2tmp(URLFile uf, char *tmpf)
goto _end; goto _end;
} }
TRAP_ON; TRAP_ON;
check = 0;
#ifdef USE_NNTP #ifdef USE_NNTP
int check = 0;
if (uf.scheme == SCM_NEWS) { if (uf.scheme == SCM_NEWS) {
char c; char c;
while (c = UFgetc(&uf), !iseos(uf.stream)) { while (c = UFgetc(&uf), !iseos(uf.stream)) {
linein.c
-2
View File
@@ -77,8 +77,6 @@ static Str strCurrentBuf;
static int use_hist; static int use_hist;
#ifdef USE_M17N #ifdef USE_M17N
static void ins_char(Str str); static void ins_char(Str str);
#else
static void ins_char(char c);
#endif #endif
char * char *
table.c
+1 -1
View File
@@ -419,7 +419,7 @@ suspend_or_pushdata(struct table *tbl, char *line)
#ifdef USE_M17N #ifdef USE_M17N
#define PUSH_TAG(str,n) Strcat_charp_n(tagbuf, str, n) #define PUSH_TAG(str,n) Strcat_charp_n(tagbuf, str, n)
#else #else
#define PUSH_TAG(str,n) Strcat_char(tagbuf, *str) #define PUSH_TAG(str,n) Strcat_char(tagbuf, *str), (void)n
#endif #endif
int visible_length_offset = 0; int visible_length_offset = 0;