Commit: bbb228190f8671edf6a44a5e60c4a3164ac478c8
Parent: 61d9c04362e9bdb06cb450cd7bcc7a50fc957f51
Author: opask
Date: Wed, 11 Jul 2018 07:50:59 -0600
remove unused code
Diffstat:
5 files changed, 2 insertions(+), 75 deletions(-)
diff --git a/default.c b/default.c
@@ -987,37 +987,6 @@ static void ext_wr(struct option *o, unsigned char **s, int *l)
}
}
-static unsigned char *prog_rd(struct option *o, unsigned char *c)
-{
- unsigned char *err = cast_uchar "Error reading program specification";
- unsigned char *prog, *w;
- int n;
- if (!(prog = get_token(&c))) goto err_1;
- if (!(w = get_token(&c))) goto err_2;
- if (getnum(w, &n, 0, 256)) goto err_3;
- update_prog(o->ptr, prog, n);
- err = NULL;
- err_3:
- mem_free(w);
- err_2:
- mem_free(prog);
- err_1:
- return err;
-}
-
-static void prog_wr(struct option *o, unsigned char **s, int *l)
-{
- struct protocol_program *a;
- struct list_head *la;
- foreachback(struct protocol_program, a, la, *(struct list_head *)o->ptr) {
- if (!*a->prog) continue;
- add_nm(o, s, l);
- add_quoted_to_str(s, l, a->prog);
- add_to_str(s, l, cast_uchar " ");
- add_num_to_str(s, l, a->system);
- }
-}
-
static unsigned char *term_rd(struct option *o, unsigned char *c)
{
struct term_spec *ts;
diff --git a/language.c b/language.c
@@ -78,22 +78,14 @@ search_again:
int get_default_charset(void)
{
- static int default_charset = -1;
unsigned char *lang, *p;
int i;
- if (default_charset >= 0)
- return default_charset;
-
- i = os_default_charset();
- if (i >= 0)
- goto ret_i;
lang = cast_uchar getenv("LC_CTYPE");
if (!lang)
lang = cast_uchar getenv("LANG");
if (!lang) {
- i = 0;
- goto ret_i;
+ return 0;
}
if ((p = cast_uchar strchr(cast_const_char lang, '.'))) {
p++;
@@ -109,10 +101,8 @@ int get_default_charset(void)
i = get_cp_index(p);
if (i < 0)
- i = 0;
+ return 0;
- ret_i:
- default_charset = i;
return i;
}
diff --git a/links.h b/links.h
@@ -675,11 +675,7 @@ void set_highpri(void);
void os_free_clipboard(void);
void os_seed_random(unsigned char **pool, int *pool_size);
-int os_send_fg_cookie(int);
-int os_receive_fg_cookie(int);
void os_detach_console(void);
-int os_default_language(void);
-int os_default_charset(void);
/* memory.c */
diff --git a/main.c b/main.c
@@ -206,8 +206,6 @@ void gfx_connection(int h)
int info_len;
struct terminal *term;
- if (os_send_fg_cookie(h))
- goto err_close;
if (hard_read(h, cwd, MAX_CWD_LEN) != MAX_CWD_LEN)
goto err_close;
cwd[MAX_CWD_LEN - 1] = 0;
@@ -235,13 +233,6 @@ err_close:
EINTRLOOP(r, close(h));
}
-static void gfx_connection_terminate(void *p)
-{
- int h = (int)(my_intptr_t)p;
- set_handlers(h, NULL, NULL, NULL);
- terminate_loop = 1;
-}
-
#endif
static struct object_request *dump_obj;
diff --git a/os_dep.c b/os_dep.c
@@ -871,15 +871,6 @@ void os_seed_random(unsigned char **pool, int *pool_size)
*pool_size = 0;
}
-int os_send_fg_cookie(int h)
-{
- return 0;
-}
-int os_receive_fg_cookie(int h)
-{
- return 0;
-}
-
void os_detach_console(void)
{
#if !defined(NO_FORK_ON_EXIT)
@@ -907,13 +898,3 @@ void os_detach_console(void)
}
#endif
}
-
-int os_default_language(void)
-{
- return -1;
-}
-
-int os_default_charset(void)
-{
- return -1;
-}