summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-09-21 14:28:40 +0200
committerDaniel Stenberg <daniel@haxx.se>2020-09-22 15:14:12 +0200
commit3d64031fa7a80ac4ae3fd09a5939196268b92f81 (patch)
treecf6006f0a3ed771c382e53016978241be02506d0 /src
parent5a654a0a6990211ee63c55d6a5e0333ad087f133 (diff)
downloadgnurl-3d64031fa7a80ac4ae3fd09a5939196268b92f81.tar.gz
gnurl-3d64031fa7a80ac4ae3fd09a5939196268b92f81.tar.bz2
gnurl-3d64031fa7a80ac4ae3fd09a5939196268b92f81.zip
symbian: drop support
The OS is deprecated. I see no traces of anyone having actually built curl for Symbian after 2012. The public headers are unmodified. Closes #5989
Diffstat (limited to 'src')
-rw-r--r--src/tool_getpass.c10
-rw-r--r--src/tool_help.c4
-rw-r--r--src/tool_main.c5
-rw-r--r--src/tool_panykey.c10
-rw-r--r--src/tool_panykey.h8
5 files changed, 8 insertions, 29 deletions
diff --git a/src/tool_getpass.c b/src/tool_getpass.c
index d3bd4e688..35e7c73b3 100644
--- a/src/tool_getpass.c
+++ b/src/tool_getpass.c
@@ -100,11 +100,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen)
#define DONE
#endif /* __VMS */
-#ifdef __SYMBIAN32__
-# define getch() getchar()
-#endif
-
-#if defined(WIN32) || defined(__SYMBIAN32__)
+#if defined(WIN32)
char *getpass_r(const char *prompt, char *buffer, size_t buflen)
{
@@ -123,10 +119,8 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen)
previous one as well */
i = i - (i >= 1 ? 2 : 1);
}
-#ifndef __SYMBIAN32__
/* since echo is disabled, print a newline */
fputs("\n", stderr);
-#endif
/* if user didn't hit ENTER, terminate buffer */
if(i == buflen)
buffer[buflen-1] = '\0';
@@ -134,7 +128,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen)
return buffer; /* we always return success */
}
#define DONE
-#endif /* WIN32 || __SYMBIAN32__ */
+#endif /* WIN32 */
#ifdef NETWARE
/* NetWare implementation */
diff --git a/src/tool_help.c b/src/tool_help.c
index a67e4bc85..4955a52c3 100644
--- a/src/tool_help.c
+++ b/src/tool_help.c
@@ -830,10 +830,6 @@ static const struct helptxt helptext[] = {
# define PRINT_LINES_PAUSE 23
#endif
-#ifdef __SYMBIAN32__
-# define PRINT_LINES_PAUSE 16
-#endif
-
struct feat {
const char *name;
int bitmask;
diff --git a/src/tool_main.c b/src/tool_main.c
index ccf098e94..b60454675 100644
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -322,11 +322,6 @@ int main(int argc, char *argv[])
/* Start our curl operation */
result = operate(&global, argc, argv);
-#ifdef __SYMBIAN32__
- if(global.showerror)
- tool_pressanykey();
-#endif
-
/* Perform the main cleanup */
main_free(&global);
}
diff --git a/src/tool_panykey.c b/src/tool_panykey.c
index 7c519028a..e7ee99518 100644
--- a/src/tool_panykey.c
+++ b/src/tool_panykey.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -21,7 +21,7 @@
***************************************************************************/
#include "tool_setup.h"
-#if defined(__SYMBIAN32__) || defined(NETWARE)
+#if defined(NETWARE)
#ifdef NETWARE
# ifdef __NOVELL_LIBC__
@@ -37,11 +37,9 @@
void tool_pressanykey(void)
{
-#if defined(__SYMBIAN32__)
- getchar();
-#elif defined(NETWARE)
+#if defined(NETWARE)
pressanykey();
#endif
}
-#endif /* __SYMBIAN32__ || NETWARE */
+#endif /* NETWARE */
diff --git a/src/tool_panykey.h b/src/tool_panykey.h
index e5c6f3930..2e8846ced 100644
--- a/src/tool_panykey.h
+++ b/src/tool_panykey.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -23,14 +23,10 @@
***************************************************************************/
#include "tool_setup.h"
-#if defined(__SYMBIAN32__) || defined(NETWARE)
-
+#if defined(NETWARE)
void tool_pressanykey(void);
-
#else
-
#define tool_pressanykey() Curl_nop_stmt
-
#endif
#endif /* HEADER_CURL_TOOL_PANYKEY_H */