Commit: 34c4622d7f8a07d251913cc524bed3e455392fe1
Parent: 4616ab66f7a3ea95a7cc816a2d99cec363d316f7
Author: opask
Date: Sun, 25 Aug 2019 09:34:41 -0600
make use of add_chr_to_str() where appropriate
Diffstat:
14 files changed, 98 insertions(+), 94 deletions(-)
diff --git a/cache.c b/cache.c
@@ -141,8 +141,8 @@ int get_connection_cache_entry(struct connection *c)
if (c->last_lookup_state.addr.n > 1) {
int i, d = 0;
if (l)
- add_to_str(&s, &l, cast_uchar " ");
- add_to_str(&s, &l, cast_uchar "(");
+ add_chr_to_str(&s, &l, ' ');
+ add_chr_to_str(&s, &l, '(');
for (i = 0; i < c->last_lookup_state.addr.n; i++) {
if (i == c->last_lookup_state.addr_index)
continue;
@@ -154,7 +154,7 @@ int get_connection_cache_entry(struct connection *c)
d = 1;
}
}
- add_to_str(&s, &l, cast_uchar ")");
+ add_chr_to_str(&s, &l, ')');
}
e->ip_address = s;
}
diff --git a/compress.c b/compress.c
@@ -378,6 +378,6 @@ void add_compress_methods(unsigned char **s, int *l)
#ifdef zlib_version
add_to_str(s, l, cast_uchar " (");
add_to_str(s, l, (unsigned char *)zlib_version);
- add_to_str(s, l, cast_uchar ")");
+ add_chr_to_str(s, l, ')');
#endif
}
diff --git a/cookies.c b/cookies.c
@@ -219,7 +219,7 @@ ok:
add_to_str(s, l, cast_uchar "; ");
add_to_str(s, l, c->name);
if (c->value) {
- add_to_str(s, l, cast_uchar "=");
+ add_chr_to_str(s, l, '=');
add_to_str(s, l, c->value);
}
}
diff --git a/default.c b/default.c
@@ -20,9 +20,9 @@ static void get_system_name(void)
unsigned char *str = init_str();
int l = 0;
add_to_str(&str, &l, cast_uchar name.sysname);
- add_to_str(&str, &l, cast_uchar " ");
+ add_chr_to_str(&str, &l, ' ');
add_to_str(&str, &l, cast_uchar name.release);
- add_to_str(&str, &l, cast_uchar " ");
+ add_chr_to_str(&str, &l, ' ');
add_to_str(&str, &l, cast_uchar name.machine);
safe_strncpy(system_name, str, MAX_STR_LEN);
free(str);
@@ -429,7 +429,7 @@ static void add_nm(struct option *o, unsigned char **s, int *l)
{
if (*l) add_to_str(s, l, cast_uchar "\n");
add_to_str(s, l, cast_uchar o->cfg_name);
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
}
static void add_quoted_to_str(unsigned char **s, int *l, unsigned char *q)
@@ -599,13 +599,13 @@ static void type_wr(struct option *o, unsigned char **s, int *l)
struct assoc *as = get_struct(a, struct assoc, head);
add_nm(o, s, l);
add_quoted_to_str(s, l, as->label);
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_quoted_to_str(s, l, as->ct);
add_to_str(s, l, cast_uchar " ");
add_quoted_to_str(s, l, as->prog);
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_num_to_str(s, l, (!!as->cons) + (!!as->xwin) * 2 + (!!as->ask) * 4 + (!as->block) * 8 + (!!as->block) * 16 + (!!as->accept_http) * 32 + (!!as->accept_ftp) * 64);
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_num_to_str(s, l, as->system);
}
}
@@ -633,7 +633,7 @@ static void ext_wr(struct option *o, unsigned char **s, int *l)
struct extension *e = get_struct(a, struct extension, head);
add_nm(o, s, l);
add_quoted_to_str(s, l, e->ext);
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_quoted_to_str(s, l, e->ct);
}
}
@@ -723,23 +723,23 @@ static void term_wr(struct option *o, unsigned char **s, int *l)
foreachback(struct term_spec, ts, lts, term_specs) {
add_nm(o, s, l);
add_quoted_to_str(s, l, ts->term);
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_num_to_str(s, l, ts->mode);
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_num_to_str(s, l, !!ts->m11_hack);
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_num_to_str(s, l, !!ts->col + !!ts->restrict_852 * 2 + !!ts->block_cursor * 4);
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
if (ts->character_set == -1) add_to_str(s, l, cast_uchar "default");
else add_to_str(s, l, get_cp_mime_name(ts->character_set));
if (ts->left_margin || ts->right_margin || ts->top_margin || ts->bottom_margin) {
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_num_to_str(s, l, ts->left_margin);
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_num_to_str(s, l, ts->right_margin);
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_num_to_str(s, l, ts->top_margin);
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_num_to_str(s, l, ts->bottom_margin);
}
}
@@ -805,14 +805,14 @@ static void dp_wr(struct option *o, unsigned char **s, int *l)
if (dp->nosave) continue;
add_nm(o, s, l);
add_quoted_to_str(s, l, dp->name);
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_quoted_to_str(s, l, dp->param ? dp->param : (unsigned char*)"");
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_quoted_to_str(s, l, dp->shell_term);
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
if (dp->kbd_codepage == -1) add_to_str(s, l, cast_uchar "default");
else add_to_str(s, l, get_cp_mime_name(dp->kbd_codepage));
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_num_to_str(s, l, dp->palette_mode);
/* pokud se sem neco prida, opravit podminku na zacatku cyklu */
}
diff --git a/file.c b/file.c
@@ -360,14 +360,14 @@ void file_func(struct connection *c)
add_to_str(&file, &fl, cast_uchar "<a href=\"./");
add_conv_str(&file, &fl, dir[i].f, (int)strlen(cast_const_char dir[i].f), 1);
if (dir[i].s[0] == 'd')
- add_to_str(&file, &fl, cast_uchar "/");
+ add_chr_to_str(&file, &fl, '/');
else if (lnk) {
struct stat st;
unsigned char *n = stracpy(name);
add_to_strn(&n, dir[i].f);
EINTRLOOP(rs, stat(cast_const_char n, &st));
if (!rs && S_ISDIR(st.st_mode))
- add_to_str(&file, &fl, cast_uchar "/");
+ add_chr_to_str(&file, &fl, '/');
free(n);
}
add_to_str(&file, &fl, cast_uchar "\">");
diff --git a/http.c b/http.c
@@ -286,7 +286,7 @@ http_bad_url:
c->unrestartable = 2;
}
if (!proxy) {
- add_to_str(&hdr, &l, cast_uchar "/");
+ add_chr_to_str(&hdr, &l, '/');
u = get_url_data(host);
} else
u = host;
@@ -489,7 +489,7 @@ static void add_accept_charset(unsigned char **hdr, int *l, struct http_connecti
ac = init_str();
cs = get_cp_mime_name(0);
if (aclen)
- add_to_str(&ac, &aclen, cast_uchar ",");
+ add_chr_to_str(&ac, &aclen, ',');
else
add_to_str(&ac, &aclen, cast_uchar "Accept-Charset: ");
add_to_str(&ac, &aclen, cs);
diff --git a/jpeg.c b/jpeg.c
@@ -408,14 +408,14 @@ void add_jpeg_version(unsigned char **s, int *l)
#endif
#if defined(JPEG_LIB_VERSION_MAJOR) && defined(JPEG_LIB_VERSION_MINOR)
add_num_to_str(s, l, JPEG_LIB_VERSION_MAJOR);
- add_to_str(s, l, cast_uchar ".");
+ add_chr_to_str(s, l, '.');
add_num_to_str(s, l, JPEG_LIB_VERSION_MINOR);
#else
add_num_to_str(s, l, JPEG_LIB_VERSION / 10);
- add_to_str(s, l, cast_uchar ".");
+ add_chr_to_str(s, l, '.');
add_num_to_str(s, l, JPEG_LIB_VERSION % 10);
#endif
- add_to_str(s, l, cast_uchar ")");
+ add_chr_to_str(s, l, ')');
}
#endif /* #ifdef HAVE_JPEG */
diff --git a/menu.c b/menu.c
@@ -61,11 +61,11 @@ static void menu_version(void *term_)
add_and_pad(&s, &l, term, *text_ptr++, maxlen);
add_to_str(&s, &l, get_text_translation(TEXT_(T_MEMORY), term));
- add_to_str(&s, &l, cast_uchar " ");
+ add_chr_to_str(&s, &l, ' ');
add_num_to_str(&s, &l, sizeof(void *) * 8);
add_to_str(&s, &l, cast_uchar "-bit, ");
add_to_str(&s, &l, get_text_translation(TEXT_(T_FILE_SIZE), term));
- add_to_str(&s, &l, cast_uchar " ");
+ add_chr_to_str(&s, &l, ' ');
add_num_to_str(&s, &l, sizeof(off_t) * 8 /*- ((off_t)-1 < 0)*/);
add_to_str(&s, &l, cast_uchar "-bit");
add_to_str(&s, &l, cast_uchar "\n");
@@ -287,60 +287,60 @@ static int resource_info(struct terminal *term, struct refresh *r2)
add_to_str(&a, &l, get_text_translation(TEXT_(T_HANDLES), term));
add_to_str(&a, &l, cast_uchar ", ");
add_unsigned_long_num_to_str(&a, &l, select_info(CI_TIMERS));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_TIMERS), term));
add_to_str(&a, &l, cast_uchar ".\n");
add_to_str(&a, &l, get_text_translation(TEXT_(T_CONNECTIONS), term));
add_to_str(&a, &l, cast_uchar ": ");
add_unsigned_long_num_to_str(&a, &l, connect_info(CI_FILES) - connect_info(CI_CONNECTING) - connect_info(CI_TRANSFER));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_WAITING), term));
add_to_str(&a, &l, cast_uchar ", ");
add_unsigned_long_num_to_str(&a, &l, connect_info(CI_CONNECTING));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_CONNECTING), term));
add_to_str(&a, &l, cast_uchar ", ");
add_unsigned_long_num_to_str(&a, &l, connect_info(CI_TRANSFER));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_tRANSFERRING), term));
add_to_str(&a, &l, cast_uchar ", ");
add_unsigned_long_num_to_str(&a, &l, connect_info(CI_KEEP));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_KEEPALIVE), term));
add_to_str(&a, &l, cast_uchar ".\n");
add_to_str(&a, &l, get_text_translation(TEXT_(T_MEMORY_CACHE), term));
add_to_str(&a, &l, cast_uchar ": ");
add_unsigned_long_num_to_str(&a, &l, cache_info(CI_BYTES));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_BYTES), term));
add_to_str(&a, &l, cast_uchar ", ");
add_unsigned_long_num_to_str(&a, &l, cache_info(CI_FILES));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_FILES), term));
add_to_str(&a, &l, cast_uchar ", ");
add_unsigned_long_num_to_str(&a, &l, cache_info(CI_LOCKED));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_LOCKED), term));
add_to_str(&a, &l, cast_uchar ", ");
add_unsigned_long_num_to_str(&a, &l, cache_info(CI_LOADING));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_LOADING), term));
add_to_str(&a, &l, cast_uchar ".\n");
add_to_str(&a, &l, get_text_translation(TEXT_(T_DECOMPRESSED_CACHE), term));
add_to_str(&a, &l, cast_uchar ": ");
add_unsigned_long_num_to_str(&a, &l, decompress_info(CI_BYTES));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_BYTES), term));
add_to_str(&a, &l, cast_uchar ", ");
add_unsigned_long_num_to_str(&a, &l, decompress_info(CI_FILES));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_FILES), term));
add_to_str(&a, &l, cast_uchar ", ");
add_unsigned_long_num_to_str(&a, &l, decompress_info(CI_LOCKED));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_LOCKED), term));
add_to_str(&a, &l, cast_uchar ".\n");
@@ -349,26 +349,26 @@ static int resource_info(struct terminal *term, struct refresh *r2)
add_to_str(&a, &l, get_text_translation(TEXT_(T_IMAGE_CACHE), term));
add_to_str(&a, &l, cast_uchar ": ");
add_unsigned_long_num_to_str(&a, &l, imgcache_info(CI_BYTES));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_BYTES), term));
add_to_str(&a, &l, cast_uchar ", ");
add_unsigned_long_num_to_str(&a, &l, imgcache_info(CI_FILES));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_IMAGES), term));
add_to_str(&a, &l, cast_uchar ", ");
add_unsigned_long_num_to_str(&a, &l, imgcache_info(CI_LOCKED));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_LOCKED), term));
add_to_str(&a, &l, cast_uchar ".\n");
add_to_str(&a, &l, get_text_translation(TEXT_(T_FONT_CACHE), term));
add_to_str(&a, &l, cast_uchar ": ");
add_unsigned_long_num_to_str(&a, &l, fontcache_info(CI_BYTES));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_BYTES), term));
add_to_str(&a, &l, cast_uchar ", ");
add_unsigned_long_num_to_str(&a, &l, fontcache_info(CI_FILES));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_LETTERS), term));
add_to_str(&a, &l, cast_uchar ".\n");
}
@@ -377,26 +377,26 @@ static int resource_info(struct terminal *term, struct refresh *r2)
add_to_str(&a, &l, get_text_translation(TEXT_(T_FORMATTED_DOCUMENT_CACHE), term));
add_to_str(&a, &l, cast_uchar ": ");
add_unsigned_long_num_to_str(&a, &l, formatted_info(CI_FILES));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_DOCUMENTS), term));
add_to_str(&a, &l, cast_uchar ", ");
add_unsigned_long_num_to_str(&a, &l, formatted_info(CI_LOCKED));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_LOCKED), term));
add_to_str(&a, &l, cast_uchar ".\n");
add_to_str(&a, &l, get_text_translation(TEXT_(T_DNS_CACHE), term));
add_to_str(&a, &l, cast_uchar ": ");
add_unsigned_long_num_to_str(&a, &l, dns_info(CI_FILES));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_SERVERS), term));
add_to_str(&a, &l, cast_uchar ", ");
add_to_str(&a, &l, get_text_translation(TEXT_(T_TLS_SESSION_CACHE), term));
add_to_str(&a, &l, cast_uchar ": ");
add_unsigned_long_num_to_str(&a, &l, session_info(CI_FILES));
- add_to_str(&a, &l, cast_uchar " ");
+ add_chr_to_str(&a, &l, ' ');
add_to_str(&a, &l, get_text_translation(TEXT_(T_SERVERS), term));
- add_to_str(&a, &l, cast_uchar ".");
+ add_chr_to_str(&a, &l, '.');
if (r2 && !strcmp(cast_const_char a, cast_const_char *(unsigned char **)((struct dialog_data *)r2->win->data)->dlg->udata)) {
free(a);
diff --git a/png.c b/png.c
@@ -185,7 +185,7 @@ void add_png_version(unsigned char **s, int *l)
{
add_to_str(s, l, cast_uchar "PNG (");
add_to_str(s, l, cast_uchar png_get_libpng_ver(NULL));
- add_to_str(s, l, cast_uchar ")");
+ add_chr_to_str(s, l, ')');
}
#endif /* #ifdef G */
diff --git a/select.c b/select.c
@@ -397,24 +397,24 @@ void add_event_string(unsigned char **s, int *l, struct terminal *term)
#else
add_to_str(s, l, cast_uchar "LibEvent");
#endif
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
{
#if defined(HAVE_LIBEV)
/* old libev report bogus version */
if (!casestrcmp(cast_uchar event_get_version(), cast_uchar "EV_VERSION_MAJOR.EV_VERSION_MINOR")) {
add_num_to_str(s, l, ev_version_major());
- add_to_str(s, l, cast_uchar ".");
+ add_chr_to_str(s, l, '.');
add_num_to_str(s, l, ev_version_minor());
} else
#endif
add_to_str(s, l, cast_uchar event_get_version());
}
if (!event_enabled) {
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_to_str(s, l, get_text_translation(TEXT_(T_dISABLED), term));
- add_to_str(s, l, cast_uchar ")");
+ add_chr_to_str(s, l, ')');
} else {
- add_to_str(s, l, cast_uchar " ");
+ add_chr_to_str(s, l, ' ');
add_to_str(s, l, cast_uchar event_base_get_method(event_base));
}
}
diff --git a/terminal.c b/terminal.c
@@ -767,9 +767,9 @@ static unsigned char frame_vt100[49] = "aaaxuuukkuxkjjjkmvwtqnttmlvwtqnvvwwmmlln
{ \
add_to_str(&a, &l, cast_uchar "\033["); \
add_num_to_str(&a, &l, (y) + 1 + term->top_margin); \
- add_to_str(&a, &l, cast_uchar ";"); \
+ add_chr_to_str(&a, &l, ';'); \
add_num_to_str(&a, &l, (x) + 1 + term->left_margin); \
- add_to_str(&a, &l, cast_uchar "H"); \
+ add_chr_to_str(&a, &l, 'H'); \
n_chars = 0; \
}
@@ -800,7 +800,7 @@ static unsigned char frame_vt100[49] = "aaaxuuukkuxkjjjkmvwtqnttmlvwtqnvvwwmmlln
} else if (getcompcode(attrib & 7) < getcompcode(attrib >> 3 & 7))\
add_to_str(&a, &l, cast_uchar ";7"); \
if (attrib & 0100) add_to_str(&a, &l, cast_uchar ";1"); \
- add_to_str(&a, &l, cast_uchar "m"); \
+ add_chr_to_str(&a, &l, 'm'); \
} \
if (c >= ' ' && c != 127 && c != 155) { \
if (c < 128 || frm) { \
@@ -898,9 +898,9 @@ static void redraw_screen(struct terminal *term)
term->lcy = term->cy;
add_to_str(&a, &l, cast_uchar "\033[");
add_num_to_str(&a, &l, term->cy + 1 + term->top_margin);
- add_to_str(&a, &l, cast_uchar ";");
+ add_chr_to_str(&a, &l, ';');
add_num_to_str(&a, &l, term->cx + 1 + term->left_margin);
- add_to_str(&a, &l, cast_uchar "H");
+ add_chr_to_str(&a, &l, 'H');
}
hard_write(term->fdout, a, l);
free(a);
diff --git a/view.c b/view.c
@@ -1551,12 +1551,16 @@ static void encode_controls(struct list_head *l, unsigned char **data, int *len,
*data = init_str();
foreach(struct submitted_value, sv, lsv, *l) {
unsigned char *p = sv->value;
- if (lst) add_to_str(data, len, cast_uchar "&"); else lst = 1;
+ if (lst)
+ add_chr_to_str(data, len, '&');
+ else
+ lst = 1;
encode_string(sv->name, data, len);
- add_to_str(data, len, cast_uchar "=");
+ add_chr_to_str(data, len, '=');
if (sv->type == FC_TEXT || sv->type == FC_PASSWORD || sv->type == FC_TEXTAREA)
p2 = convert(cp_from, cp_to, p, NULL);
- else p2 = stracpy(p);
+ else
+ p2 = stracpy(p);
encode_string(p2, data, len);
free(p2);
}
@@ -3474,7 +3478,7 @@ static unsigned char *print_current_linkx(struct f_data_c *fd, struct terminal *
free(txt);
} else {
add_to_str(&m, &ll, get_text_translation(TEXT_(T_IMAGE), term));
- add_to_str(&m, &ll, cast_uchar " ");
+ add_chr_to_str(&m, &ll, ' ');
d = display_url(term, l->where_img, 1);
add_to_str(&m, &ll, d);
free(d);
@@ -3485,7 +3489,7 @@ static unsigned char *print_current_linkx(struct f_data_c *fd, struct terminal *
m = init_str();
ll = 0;
add_to_str(&m, &ll, get_text_translation(TEXT_(T_USEMAP), term));
- add_to_str(&m, &ll, cast_uchar " ");
+ add_chr_to_str(&m, &ll, ' ');
d = display_url(term, l->where + 4, 1);
add_to_str(&m, &ll, d);
free(d);
@@ -3515,7 +3519,7 @@ static unsigned char *print_current_linkx(struct f_data_c *fd, struct terminal *
ll = 0;
if (l->form->method == FM_GET) add_to_str(&m, &ll, get_text_translation(TEXT_(T_SUBMIT_FORM_TO), term));
else add_to_str(&m, &ll, get_text_translation(TEXT_(T_POST_FORM_TO), term));
- add_to_str(&m, &ll, cast_uchar " ");
+ add_chr_to_str(&m, &ll, ' ');
add_to_str(&m, &ll, l->form->action);
goto p;
}
@@ -3537,7 +3541,7 @@ static unsigned char *print_current_linkx(struct f_data_c *fd, struct terminal *
add_to_str(&m, &ll, cast_uchar ", ");
add_to_str(&m, &ll, get_text_translation(TEXT_(T_NAME),
term));
- add_to_str(&m, &ll, cast_uchar " ");
+ add_chr_to_str(&m, &ll, ' ');
add_to_str(&m, &ll, l->form->name);
}
if ((l->form->type == FC_CHECKBOX || l->form->type == FC_RADIO)
@@ -3546,17 +3550,17 @@ static unsigned char *print_current_linkx(struct f_data_c *fd, struct terminal *
add_to_str(&m, &ll, cast_uchar ", ");
add_to_str(&m, &ll, get_text_translation(TEXT_(T_VALUE),
term));
- add_to_str(&m, &ll, cast_uchar " ");
+ add_chr_to_str(&m, &ll, ' ');
add_to_str(&m, &ll, l->form->default_value);
}
/* pri enteru se bude posilat vzdycky -- Brain */
if (l->type == L_FIELD && !has_form_submit(fd->f_data, l->form) && l->form->action) {
add_to_str(&m, &ll, cast_uchar ", ");
add_to_str(&m, &ll, get_text_translation(TEXT_(T_HIT_ENTER_TO), term));
- add_to_str(&m, &ll, cast_uchar " ");
+ add_chr_to_str(&m, &ll, ' ');
if (l->form->method == FM_GET) add_to_str(&m, &ll, get_text_translation(TEXT_(T_SUBMIT_TO), term));
else add_to_str(&m, &ll, get_text_translation(TEXT_(T_POST_TO), term));
- add_to_str(&m, &ll, cast_uchar " ");
+ add_chr_to_str(&m, &ll, ' ');
add_to_str(&m, &ll, l->form->action);
}
goto p;
@@ -3586,7 +3590,7 @@ static unsigned char *print_current_linkx_plus(struct f_data_c *fd, struct termi
ll = 0;
if (l->where && strlen(cast_const_char l->where) >= 4 && !casecmp(l->where, cast_uchar "MAP@", 4)) {
add_to_str(&m, &ll, get_text_translation(TEXT_(T_USEMAP), term));
- add_to_str(&m, &ll, cast_uchar " ");
+ add_chr_to_str(&m, &ll, ' ');
d = display_url(term, l->where + 4, 1);
add_to_str(&m, &ll, d);
free(d);
@@ -3612,7 +3616,7 @@ static unsigned char *print_current_linkx_plus(struct f_data_c *fd, struct termi
d = display_url(term, l->where_img, 1);
add_to_str(&m, &ll, d);
free(d);
- add_to_str(&m, &ll, cast_uchar "'");
+ add_chr_to_str(&m, &ll, '\'');
if (l->img_alt)
{
@@ -3621,7 +3625,7 @@ static unsigned char *print_current_linkx_plus(struct f_data_c *fd, struct termi
add_to_str(&m, &ll, cast_uchar " alt='");
txt = convert(fd->f_data->cp, fd->f_data->opt.cp, l->img_alt, &fd->f_data->opt);
add_to_str(&m, &ll, txt);
- add_to_str(&m, &ll, cast_uchar "'");
+ add_chr_to_str(&m, &ll, '\'');
free(txt);
}
#ifdef G
@@ -3629,9 +3633,9 @@ static unsigned char *print_current_linkx_plus(struct f_data_c *fd, struct termi
{
add_to_str(&m, &ll, cast_uchar " size='");
add_num_to_str(&m, &ll, l->obj->xw);
- add_to_str(&m, &ll, cast_uchar "x");
+ add_chr_to_str(&m, &ll, 'x');
add_num_to_str(&m, &ll, l->obj->yw);
- add_to_str(&m, &ll, cast_uchar "'");
+ add_chr_to_str(&m, &ll, '\'');
}
#endif
goto p;
@@ -3655,7 +3659,7 @@ static unsigned char *print_current_linkx_plus(struct f_data_c *fd, struct termi
ll = 0;
if (l->form->method == FM_GET) add_to_str(&m, &ll, get_text_translation(TEXT_(T_SUBMIT_FORM_TO), term));
else add_to_str(&m, &ll, get_text_translation(TEXT_(T_POST_FORM_TO), term));
- add_to_str(&m, &ll, cast_uchar " ");
+ add_chr_to_str(&m, &ll, ' ');
add_to_str(&m, &ll, l->form->action);
goto p;
}
@@ -3677,7 +3681,7 @@ static unsigned char *print_current_linkx_plus(struct f_data_c *fd, struct termi
add_to_str(&m, &ll, cast_uchar ", ");
add_to_str(&m, &ll, get_text_translation(TEXT_(T_NAME),
term));
- add_to_str(&m, &ll, cast_uchar " ");
+ add_chr_to_str(&m, &ll, ' ');
add_to_str(&m, &ll, l->form->name);
}
if ((l->form->type == FC_CHECKBOX || l->form->type == FC_RADIO)
@@ -3686,17 +3690,17 @@ static unsigned char *print_current_linkx_plus(struct f_data_c *fd, struct termi
add_to_str(&m, &ll, cast_uchar ", ");
add_to_str(&m, &ll, get_text_translation(TEXT_(T_VALUE),
term));
- add_to_str(&m, &ll, cast_uchar " ");
+ add_chr_to_str(&m, &ll, ' ');
add_to_str(&m, &ll, l->form->default_value);
}
/* pri enteru se bude posilat vzdycky -- Brain */
if (l->type == L_FIELD && !has_form_submit(fd->f_data, l->form) && l->form->action) {
add_to_str(&m, &ll, cast_uchar ", ");
add_to_str(&m, &ll, get_text_translation(TEXT_(T_HIT_ENTER_TO), term));
- add_to_str(&m, &ll, cast_uchar " ");
+ add_chr_to_str(&m, &ll, ' ');
if (l->form->method == FM_GET) add_to_str(&m, &ll, get_text_translation(TEXT_(T_SUBMIT_TO), term));
else add_to_str(&m, &ll, get_text_translation(TEXT_(T_POST_TO), term));
- add_to_str(&m, &ll, cast_uchar " ");
+ add_chr_to_str(&m, &ll, ' ');
add_to_str(&m, &ll, l->form->action);
}
goto p;
@@ -3758,11 +3762,11 @@ void loc_msg(struct terminal *term, struct location *lo, struct f_data_c *frame)
if (enc) {
add_to_str(&s, &l, cast_uchar " (");
add_num_to_str(&s, &l, ce->length);
- add_to_str(&s, &l, cast_uchar " ");
+ add_chr_to_str(&s, &l, ' ');
add_to_str(&s, &l, get_text_translation(TEXT_(T_COMPRESSED_WITH), term));
- add_to_str(&s, &l, cast_uchar " ");
+ add_chr_to_str(&s, &l, ' ');
add_to_str(&s, &l, enc);
- add_to_str(&s, &l, cast_uchar ")");
+ add_chr_to_str(&s, &l, ')');
free(enc);
}
} else {
@@ -3771,7 +3775,7 @@ void loc_msg(struct terminal *term, struct location *lo, struct f_data_c *frame)
if (ce->incomplete) {
add_to_str(&s, &l, cast_uchar " (");
add_to_str(&s, &l, get_text_translation(TEXT_(T_INCOMPLETE), term));
- add_to_str(&s, &l, cast_uchar ")");
+ add_chr_to_str(&s, &l, ')');
}
if (frame->f_data->ass >= 0) {
add_to_str(&s, &l, cast_uchar "\n");
@@ -3781,12 +3785,12 @@ void loc_msg(struct terminal *term, struct location *lo, struct f_data_c *frame)
if (frame->f_data->ass == 1) {
add_to_str(&s, &l, cast_uchar " (");
add_to_str(&s, &l, get_text_translation(TEXT_(T_ASSUMED), term));
- add_to_str(&s, &l, cast_uchar ")");
+ add_chr_to_str(&s, &l, ')');
}
if (frame->f_data->ass == 2) {
add_to_str(&s, &l, cast_uchar " (");
add_to_str(&s, &l, get_text_translation(TEXT_(T_IGNORING_SERVER_SETTING), term));
- add_to_str(&s, &l, cast_uchar ")");
+ add_chr_to_str(&s, &l, ')');
}
}
if (ce->head && ce->head[0] != '\n' && ce->head[0] != '\r' && (a = parse_http_header(ce->head, cast_uchar "Content-Type", NULL))) {
diff --git a/view_gr.c b/view_gr.c
@@ -1399,7 +1399,7 @@ static void get_searched_sub(struct g_object *p, struct g_object *c)
if (c->get_list) c->get_list(c, get_searched_sub);
if (c->draw == g_line_draw) {
if (srch_f_data->srch_string_size && srch_f_data->srch_string[srch_f_data->srch_string_size - 1] != ' ')
- add_to_str(&srch_f_data->srch_string, &srch_f_data->srch_string_size, cast_uchar " ");
+ add_chr_to_str(&srch_f_data->srch_string, &srch_f_data->srch_string_size, ' ');
}
}
diff --git a/x.c b/x.c
@@ -646,7 +646,7 @@ static void x_update_driver_param(int w, int h)
free(x_driver_param);
x_driver_param = init_str();
add_num_to_str(&x_driver_param, &l, x_default_window_width);
- add_to_str(&x_driver_param, &l ,cast_uchar "x");
+ add_chr_to_str(&x_driver_param, &l, 'x');
add_num_to_str(&x_driver_param, &l, x_default_window_height);
}