schannel: Removed curl_ prefix from source files

Removed the curl_ prefix from the schannel source files as discussed
with Marc and Daniel at FOSDEM.

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 4f81cd07b82c56ce654a541173d9ca53b0bcb106..e4ce0bb3eb3190c8dad5ef27f494c81ee9f2162f 100644 (file)
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -22,11 +22,11 @@
 
 LIB_VTLS_CFILES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c     \
   vtls/polarssl.c vtls/polarssl_threadlock.c vtls/axtls.c               \
-  vtls/cyassl.c vtls/curl_schannel.c vtls/curl_darwinssl.c vtls/gskit.c
+  vtls/cyassl.c vtls/schannel.c vtls/curl_darwinssl.c vtls/gskit.c
 
 LIB_VTLS_HFILES = vtls/openssl.h vtls/vtls.h vtls/gtls.h                \
   vtls/nssg.h vtls/polarssl.h vtls/polarssl_threadlock.h vtls/axtls.h   \
-  vtls/cyassl.h vtls/curl_schannel.h vtls/curl_darwinssl.h vtls/gskit.h
+  vtls/cyassl.h vtls/schannel.h vtls/curl_darwinssl.h vtls/gskit.h
 
 LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c   \
   cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c       \

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 8e0314604dbf9ba073d4d2bab95e4116d10515f9..3abc9c2d0e36f2c18818365d164a245b699c8ee8 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -550,7 +550,6 @@ X_OBJS= \
        $(DIROBJ)\curl_sasl.obj \\r
        $(DIROBJ)\curl_sasl_gssapi.obj \\r
        $(DIROBJ)\curl_sasl_sspi.obj \\r
-       $(DIROBJ)\curl_schannel.obj \\r
        $(DIROBJ)\curl_sspi.obj \\r
        $(DIROBJ)\curl_threads.obj \\r
        $(DIROBJ)\cyassl.obj \\r
@@ -608,6 +607,7 @@ X_OBJS= \
        $(DIROBJ)\progress.obj \\r
        $(DIROBJ)\rawstr.obj \\r
        $(DIROBJ)\rtsp.obj \\r
+       $(DIROBJ)\schannel.obj \\r
        $(DIROBJ)\security.obj \\r
        $(DIROBJ)\select.obj \\r
        $(DIROBJ)\sendf.obj \\r

diff --git a/lib/vtls/curl_schannel.c b/lib/vtls/schannel.c
similarity index 99%
rename from lib/vtls/curl_schannel.c
rename to lib/vtls/schannel.c
index b02a187f4559c301f07d43d079c554b10df6443b..00ed0f6b84d6b3924823cc1be33ea041621ebbef 100644 (file)
--- a/lib/vtls/curl_schannel.c
+++ b/lib/vtls/schannel.c
@@ -47,7 +47,7 @@
 #endif
 
 #include "curl_sspi.h"
-#include "curl_schannel.h"
+#include "schannel.h"
 #include "vtls.h"
 #include "sendf.h"
 #include "connect.h" /* for the connect timeout */

diff --git a/lib/vtls/curl_schannel.h b/lib/vtls/schannel.h
similarity index 100%
rename from lib/vtls/curl_schannel.h
rename to lib/vtls/schannel.h

diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h
index 96321ec9848ec9c814a4f25d2ab25bd9038ac0a3..e56a8b62d0d490afc974e65103d37170385609fa 100644 (file)
--- a/lib/vtls/vtls.h
+++ b/lib/vtls/vtls.h
@@ -30,7 +30,7 @@
 #include "polarssl.h"       /* PolarSSL versions */
 #include "axtls.h"          /* axTLS versions */
 #include "cyassl.h"         /* CyaSSL versions */
-#include "curl_schannel.h"  /* Schannel SSPI version */
+#include "schannel.h"       /* Schannel SSPI version */
 #include "curl_darwinssl.h" /* SecureTransport (Darwin) version */
 
 #ifndef MAX_PINNED_PUBKEY_SIZE

diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index 3b7303aea358242587661bb9221d03cc51346501..a9c884d171990f266ab854343b3ee8652a5a16de 100644 (file)
--- a/packages/Symbian/group/libcurl.mmp
+++ b/packages/Symbian/group/libcurl.mmp
@@ -38,9 +38,9 @@ SOURCE \
   vtls/axtls.c idn_win32.c http_negotiate_sspi.c vtls/cyassl.c         \
   http_proxy.c non-ascii.c asyn-ares.c asyn-thread.c curl_gssapi.c     \
   curl_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_ntlm_msgs.c         \
-  curl_sasl.c vtls/curl_schannel.c curl_multibyte.c                    \
-  vtls/curl_darwinssl.c bundles.c conncache.c curl_sasl_sspi.c smb.c   \
-  curl_sasl_gssapi.c curl_endian.c curl_des.c
+  curl_sasl.c vtls/schannel.c curl_multibyte.c vtls/curl_darwinssl.c   \
+  bundles.c conncache.c curl_sasl_sspi.c smb.c curl_sasl_gssapi.c      \
+  curl_endian.c curl_des.c
 
 USERINCLUDE   ../../../lib ../../../include/curl
 #ifdef ENABLE_SSL