aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Raad <raad@teamviewer.com>2017-04-25 08:36:13 +0200
committerMarcel Raad <raad@teamviewer.com>2017-04-26 10:01:53 +0200
commitb85142164228abe15d6ca20a244ffb849c700e6c (patch)
treed502a7a9fb8d72fdbc09630c970ef7dc9d2cb852
parent55c3c02e59d1daf31ec2097f93b8139ddb3fdeb6 (diff)
lib: remove unused code
This fixes the following clang warnings: macro is not used [-Wunused-macros] will never be executed [-Wunreachable-code] Closes https://github.com/curl/curl/pull/1448
-rw-r--r--lib/formdata.c3
-rw-r--r--lib/hostip.c1
-rw-r--r--lib/mprintf.c4
-rw-r--r--lib/telnet.c6
-rw-r--r--lib/url.c3
5 files changed, 5 insertions, 12 deletions
diff --git a/lib/formdata.c b/lib/formdata.c
index 2a934344e..90fbd1143 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -54,9 +54,6 @@ static char *formboundary(struct Curl_easy *data);
extensions. */
#define HTTPPOST_CONTENTTYPE_DEFAULT "application/octet-stream"
-#define FORM_FILE_SEPARATOR ','
-#define FORM_TYPE_SEPARATOR ';'
-
#define HTTPPOST_PTRNAME CURL_HTTPPOST_PTRNAME
#define HTTPPOST_FILENAME CURL_HTTPPOST_FILENAME
#define HTTPPOST_PTRCONTENTS CURL_HTTPPOST_PTRCONTENTS
diff --git a/lib/hostip.c b/lib/hostip.c
index ed18763fd..21baf6015 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -538,7 +538,6 @@ RETSIGTYPE alarmfunc(int sig)
/* this is for "-ansi -Wall -pedantic" to stop complaining! (rabe) */
(void)sig;
siglongjmp(curl_jmpenv, 1);
- return;
}
#endif /* USE_ALARM_TIMEOUT */
diff --git a/lib/mprintf.c b/lib/mprintf.c
index 6b7d317f8..6d4e733f0 100644
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -42,10 +42,6 @@
/* The last #include file should be: */
#include "memdebug.h"
-#ifndef SIZEOF_LONG_DOUBLE
-#define SIZEOF_LONG_DOUBLE 0
-#endif
-
/*
* If SIZEOF_SIZE_T has not been defined, default to the size of long.
*/
diff --git a/lib/telnet.c b/lib/telnet.c
index 5cceed258..bbdbb86ad 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -81,10 +81,12 @@
} WHILE_FALSE
#define CURL_SB_GET(x) ((*x->subpointer++)&0xff)
-#define CURL_SB_PEEK(x) ((*x->subpointer)&0xff)
-#define CURL_SB_EOF(x) (x->subpointer >= x->subend)
#define CURL_SB_LEN(x) (x->subend - x->subpointer)
+/* For posterity:
+#define CURL_SB_PEEK(x) ((*x->subpointer)&0xff)
+#define CURL_SB_EOF(x) (x->subpointer >= x->subend) */
+
#ifdef CURL_DISABLE_VERBOSE_STRINGS
#define printoption(a,b,c,d) Curl_nop_stmt
#endif
diff --git a/lib/url.c b/lib/url.c
index 6795a9c8f..f5998d6b1 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2935,8 +2935,7 @@ static void conn_reset_all_postponed_data(struct connectdata *conn)
conn_reset_postponed_data(conn, 1);
}
#else /* ! USE_RECV_BEFORE_SEND_WORKAROUND */
-/* Use "do-nothing" macros instead of functions when workaround not used */
-#define conn_reset_postponed_data(c,n) do {} WHILE_FALSE
+/* Use "do-nothing" macro instead of function when workaround not used */
#define conn_reset_all_postponed_data(c) do {} WHILE_FALSE
#endif /* ! USE_RECV_BEFORE_SEND_WORKAROUND */