remove some spurious line-endings

diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index 31482a1680a5751680d8240f94904e7bc0881428..6ebda874c09b210ab008219055316d278141568c 100644 (file)
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -620,26 +620,26 @@ password to use for the transfer.
 
 The CURLOPT_PASSWORD option should be used in conjunction with
 as the \fICURLOPT_USERNAME\fP option. (Added in 7.19.1)
-.IP CURLOPT_PROXYUSERNAME\r
-Pass a char * as parameter, which should be pointing to the zero terminated\r
-user name to use for the transfer while connecting to Proxy.\r
-\r
-The CURLOPT_PROXYUSERNAME option should be used in same way as the\r
-\fICURLOPT_PROXYUSERPWD\fP is used.  In comparison to \fICURLOPT_PROXYUSERPWD\fP\r
-the CURLOPT_PROXYUSERNAME allows the username to contain colon,\r
-like in following example: "sip:user@example.com".\r
-Note the CURLOPT_PROXYUSERNAME option is an alternative way to set the user name\r
-while connecting to Proxy.  There is no meaning to use it together\r
-with the \fICURLOPT_PROXYUSERPWD\fP option.\r
-\r
-In order to specify the password to be used in conjunction with the user name\r
-use the \fICURLOPT_PROXYPASSWORD\fP option.  (Added in 7.19.1)\r
-.IP CURLOPT_PROXYPASSWORD\r
-Pass a char * as parameter, which should be pointing to the zero terminated\r
-password to use for the transfer while connecting to Proxy.\r
-\r
-The CURLOPT_PROXYPASSWORD option should be used in conjunction with\r
-as the \fICURLOPT_PROXYUSERNAME\fP option. (Added in 7.19.1)\r
+.IP CURLOPT_PROXYUSERNAME
+Pass a char * as parameter, which should be pointing to the zero terminated
+user name to use for the transfer while connecting to Proxy.
+
+The CURLOPT_PROXYUSERNAME option should be used in same way as the
+\fICURLOPT_PROXYUSERPWD\fP is used.  In comparison to \fICURLOPT_PROXYUSERPWD\fP
+the CURLOPT_PROXYUSERNAME allows the username to contain colon,
+like in following example: "sip:user@example.com".
+Note the CURLOPT_PROXYUSERNAME option is an alternative way to set the user name
+while connecting to Proxy.  There is no meaning to use it together
+with the \fICURLOPT_PROXYUSERPWD\fP option.
+
+In order to specify the password to be used in conjunction with the user name
+use the \fICURLOPT_PROXYPASSWORD\fP option.  (Added in 7.19.1)
+.IP CURLOPT_PROXYPASSWORD
+Pass a char * as parameter, which should be pointing to the zero terminated
+password to use for the transfer while connecting to Proxy.
+
+The CURLOPT_PROXYPASSWORD option should be used in conjunction with
+as the \fICURLOPT_PROXYUSERNAME\fP option. (Added in 7.19.1)
 .IP CURLOPT_HTTPAUTH
 Pass a long as parameter, which is set to a bitmask, to tell libcurl what
 authentication method(s) you want it to use. The available bits are listed

diff --git a/include/curl/curl.h b/include/curl/curl.h
index 0d4fdbbb248d2feebaa30a506234e1b57ea99d04..daa925fa87e0d31245f157400a2b52ee82ff296b 100644 (file)
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -1144,10 +1144,10 @@ typedef enum {
   /* "name" and "pwd" to use when fetching. */
   CINIT(USERNAME, OBJECTPOINT, 173),
   CINIT(PASSWORD, OBJECTPOINT, 174),
-\r
-    /* "name" and "pwd" to use with Proxy when fetching. */\r
-  CINIT(PROXYUSERNAME, OBJECTPOINT, 175),\r
-  CINIT(PROXYPASSWORD, OBJECTPOINT, 176),\r
+
+    /* "name" and "pwd" to use with Proxy when fetching. */
+  CINIT(PROXYUSERNAME, OBJECTPOINT, 175),
+  CINIT(PROXYPASSWORD, OBJECTPOINT, 176),
 
   CURLOPT_LASTENTRY /* the last unused */
 } CURLoption;

diff --git a/include/curl/typecheck-gcc.h b/include/curl/typecheck-gcc.h
index 6f5313f1ff0dafed8dba1486c5f461c819bc9e3d..41cc7598e3c43bfc3b6fc852ece9cf2f50620a4b 100644 (file)
--- a/include/curl/typecheck-gcc.h
+++ b/include/curl/typecheck-gcc.h
@@ -198,9 +198,9 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_slist,
    (option) == CURLOPT_USERPWD ||                                             \
    (option) == CURLOPT_USERNAME ||                                            \
    (option) == CURLOPT_PASSWORD ||                                            \
-   (option) == CURLOPT_PROXYUSERPWD ||                                        \\r
-   (option) == CURLOPT_PROXYUSERNAME ||                                       \\r
-   (option) == CURLOPT_PROXYPASSWORD ||                                       \\r
+   (option) == CURLOPT_PROXYUSERPWD ||                                        \
+   (option) == CURLOPT_PROXYUSERNAME ||                                       \
+   (option) == CURLOPT_PROXYPASSWORD ||                                       \
    (option) == CURLOPT_ENCODING ||                                            \
    (option) == CURLOPT_REFERER ||                                             \
    (option) == CURLOPT_USERAGENT ||                                           \

diff --git a/lib/urldata.h b/lib/urldata.h
index 079c7716ba0ab553d0c0950827674c222bea7d1b..c6d8bf17f5357ab6665793d34ff0759819e9e20a 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -1338,8 +1338,8 @@ enum dupstring {
   STRING_SSL_ISSUERCERT,  /* issuer cert file to check certificate */
   STRING_USERNAME,        /* <username>, if used */
   STRING_PASSWORD,        /* <password>, if used */
-  STRING_PROXYUSERNAME,   /* Proxy <username>, if used */\r
-  STRING_PROXYPASSWORD,   /* Proxy <password>, if used */\r
+  STRING_PROXYUSERNAME,   /* Proxy <username>, if used */
+  STRING_PROXYPASSWORD,   /* Proxy <password>, if used */
 
   /* -- end of strings -- */
   STRING_LAST /* not used, just an end-of-list marker */