Commit: c6c1f1d8515e01253933b1878bff34284d368257
Parent: 59284efe35179146d075c83231b66aaed7567a3f
Author: opask
Date: Thu, 19 Jul 2018 17:16:33 -0600
remove some unused options
Diffstat:
5 files changed, 1 insertion(+), 45 deletions(-)
diff --git a/default.c b/default.c
@@ -1038,9 +1038,6 @@ fprintf(stdout, "%s%s%s%s%s%s\n",
" -g\n"
" Run in graphics mode.\n"
"\n"
-" -no-g\n"
-" Run in text mode (overrides previous -g).\n"
-"\n"
" -driver <driver name>\n"
" Graphics driver to use. Drivers are: x, svgalib, fb, directfb, pmshell,\n"
" atheos.\n"
@@ -1127,12 +1124,6 @@ fprintf(stdout, "%s%s%s%s%s%s\n",
" -no-libevent\n"
" Don't use libevent library.\n"
"\n"
-" -no-openmp\n"
-" Don't use OpenMP.\n"
-"\n"
-" -async-dns <0>/<1>\n"
-" Asynchronous DNS resolver on(1)/off(0).\n"
-"\n"
" -download-utime <0>/<1>\n"
" Set time of downloaded files to last modification time reported by server.\n"
"\n"
@@ -1517,7 +1508,6 @@ unsigned char *links_home = NULL;
int first_use = 0;
int disable_libevent = 0;
-int disable_openmp = 0;
int no_connect = 0;
int base_session = 0;
int dmp = 0;
@@ -1533,7 +1523,6 @@ int unrestartable_receive_timeout = 600;
int timeout_multiple_addresses = 3;
unsigned char bind_ip_address[16] = "";
unsigned char bind_ipv6_address[INET6_ADDRSTRLEN] = "";
-int async_lookup = 1;
int download_utime = 0;
int max_format_cache_entries = 5;
@@ -1625,7 +1614,6 @@ static struct option links_options[] = {
{1, set_cmd, NULL, NULL, 0, 0, &no_connect, NULL, "no-connect"},
{1, set_cmd, NULL, NULL, 0, 0, &anonymous, NULL, "anonymous"},
{1, set_cmd, NULL, NULL, 0, 0, &ggr, NULL, "g"},
- {1, unset_cmd, NULL, NULL, 0, 0, &ggr, NULL, "no-g"},
{1, setstr_cmd, NULL, NULL, 0, MAX_STR_LEN, ggr_drv, NULL, "driver"},
{1, setstr_cmd, NULL, NULL, 0, MAX_STR_LEN, default_target, NULL, "target"},
{1, setstr_cmd, NULL, NULL, 0, MAX_STR_LEN, ggr_mode, NULL, "mode"},
@@ -1646,8 +1634,6 @@ static struct option links_options[] = {
{1, gen_cmd, ip_rd, str_wr, 0, 16, bind_ip_address, "bind_address", "bind-address"},
{1, gen_cmd, ipv6_rd, str_wr, 0, INET6_ADDRSTRLEN, bind_ipv6_address, "bind_address_ipv6", "bind-address-ipv6"},
{1, set_cmd, NULL, NULL, 0, 0, &disable_libevent, NULL, "no-libevent"},
- {1, set_cmd, NULL, NULL, 0, 0, &disable_openmp, NULL, "no-openmp"},
- {1, gen_cmd, num_rd, num_wr, 0, 1, &async_lookup, "async_dns", "async-dns"},
{1, gen_cmd, num_rd, num_wr, 0, 1, &download_utime, "download_utime", "download-utime"},
{1, gen_cmd, num_rd, num_wr, 0, 999, &max_format_cache_entries, "format_cache_size", "format-cache-size"},
{1, gen_cmd, num_rd, num_wr, 0, MAXINT, &memory_cache_size, "memory_cache_size", "memory-cache-size"},
diff --git a/links.1 b/links.1
@@ -42,12 +42,7 @@ Does name lookup, like command "host".
Run Links in graphics mode. If not given, Links will run in text mode.
Running in graphics mode means that Links will probe all compiled-in graphics
devices and run on the first found. If none found, links will not run in
-graphics mode. This option works only if --enable-graphics was given
-to ./configure.
-
-.TP
-\f3-no-g\f1
-Run in text mode (overrides previous \-g).
+graphics mode.
.TP
\f3-driver \f2<driver name>\f1
@@ -153,14 +148,6 @@ Use a specific local IPv6 address.
Don't use libevent library.
.TP
-\f3-no-openmp\f1
-Don't use OpenMP.
-
-.TP
-\f3-async-dns \f2<0>/<1>\f1
-Asynchronous DNS resolver on(1)/off(0).
-
-.TP
\f3-download-utime \f2<0>/<1>\f1
Set time of downloaded files to last modification time reported by server.
diff --git a/links.h b/links.h
@@ -3673,7 +3673,6 @@ extern unsigned char *links_home;
extern int first_use;
extern int disable_libevent;
-extern int disable_openmp;
extern int no_connect;
extern int base_session;
#define D_DUMP 1
@@ -3691,7 +3690,6 @@ extern int unrestartable_receive_timeout;
extern int timeout_multiple_addresses;
extern unsigned char bind_ip_address[16];
extern unsigned char bind_ipv6_address[INET6_ADDRSTRLEN];
-extern int async_lookup;
extern int download_utime;
extern int max_format_cache_entries;
diff --git a/menu.c b/menu.c
@@ -23,7 +23,6 @@ static unsigned char * const version_texts[] = {
TEXT_(T_GRAPHICS_MODE),
#ifdef G
TEXT_(T_IMAGE_LIBRARIES),
- TEXT_(T_OPENMP),
#endif
TEXT_(T_CONFIGURATION_DIRECTORY),
NULL,
@@ -136,12 +135,6 @@ static void menu_version(void *term_)
add_to_str(&s, &l, cast_uchar "\n");
#endif
-#ifdef G
- add_and_pad(&s, &l, term, *text_ptr++, maxlen);
- add_to_str(&s, &l, get_text_translation(TEXT_(T_NO), term));
- add_to_str(&s, &l, cast_uchar "\n");
-#endif
-
add_and_pad(&s, &l, term, *text_ptr++, maxlen);
if (links_home) {
unsigned char *native_home = os_conv_to_external_path(links_home, NULL);
@@ -1136,10 +1129,6 @@ static void dlg_net_options(struct terminal *term, void *xxx, void *yyy)
d->items[a].dlen = sizeof(bind_ipv6_address);
d->items[a++].fn = check_local_ipv6_address;
}
- net_msg[a] = TEXT_(T_ASYNC_DNS_LOOKUP);
- d->items[a].type = D_CHECKBOX;
- d->items[a].data = (unsigned char *)&async_lookup;
- d->items[a++].dlen = sizeof(int);
net_msg[a] = TEXT_(T_SET_TIME_OF_DOWNLOADED_FILES);
d->items[a].type = D_CHECKBOX;
d->items[a].data = (unsigned char *)&download_utime;
diff --git a/os_dep.c b/os_dep.c
@@ -871,10 +871,6 @@ void os_detach_console(void)
#if !defined(NO_FORK_ON_EXIT)
{
pid_t rp;
- /* Intel and PathScale handle fork gracefully */
-#if !defined(__PATHSCALE__)
- disable_openmp = 1;
-#endif
EINTRLOOP(rp, fork());
if (!rp) {
reinit_child();