osdir.com
mailing list archive F.A.Q. -since 2001!



Subject: danf: curl/lib connect.c, 1.135, 1.136 ftp.c,
1.326, 1.327 strerror.c, 1.25, 1.26 - msg#00025

List: web.curl.cvs

Mail Archive Navigation:
by Date: Prev Next Date Index by Thread: Prev Next Thread Index

Update of /cvsroot/curl/curl/lib
In directory labb:/tmp/cvs-serv27630

Modified Files:
connect.c ftp.c strerror.c
Log Message:
Fixed some typos in output messages.


Index: strerror.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/strerror.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- strerror.c 18 May 2005 13:24:23 -0000 1.25
+++ strerror.c 21 Jul 2005 22:18:35 -0000 1.26
@@ -69,10 +69,10 @@
return "URL using bad/illegal format or missing URL";

case CURLE_COULDNT_RESOLVE_PROXY:
- return "couldnt resolve proxy name";
+ return "couldn't resolve proxy name";

case CURLE_COULDNT_RESOLVE_HOST:
- return "couldnt resolve host name";
+ return "couldn't resolve host name";

case CURLE_COULDNT_CONNECT:
return "couldn't connect to server";
@@ -492,7 +492,7 @@
p = "Winsock library is not ready";
break;
case WSANOTINITIALISED:
- p = "Winsock library not initalised";
+ p = "Winsock library not initialised";
break;
case WSAVERNOTSUPPORTED:
p = "Winsock version not supported.";

Index: connect.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/connect.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- connect.c 14 May 2005 21:15:36 -0000 1.135
+++ connect.c 21 Jul 2005 22:18:35 -0000 1.136
@@ -359,13 +359,13 @@

} /* end of if h */
else {
- failf(data,"could't find my own IP address (%s)", myhost);
+ failf(data,"couldn't find my own IP address (%s)", myhost);
return CURLE_HTTP_PORT_FAILED;
}
} /* end of inet_addr */

else {
- failf(data, "could't find my own IP address (%s)", myhost);
+ failf(data, "couldn't find my own IP address (%s)", myhost);
return CURLE_HTTP_PORT_FAILED;
}


Index: ftp.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/ftp.c,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -d -r1.326 -r1.327
--- ftp.c 3 Jul 2005 22:25:15 -0000 1.326
+++ ftp.c 21 Jul 2005 22:18:35 -0000 1.327
@@ -1110,7 +1110,7 @@
}
}
else {
- failf(data, "could't find IP address to use");
+ failf(data, "couldn't find IP address to use");
return CURLE_FTP_PORT_FAILED;
}

@@ -3170,7 +3170,7 @@
*connected = conn->bits.tcpconnect;

if(*dophase_done)
- DEBUGF(infof(conn->data, "DO phase is comlete\n"));
+ DEBUGF(infof(conn->data, "DO phase is complete\n"));

return result;
}
@@ -3827,7 +3827,7 @@
if(*dophase_done) {
result = ftp_dophase_done(conn, FALSE /* not connected */);

- DEBUGF(infof(conn->data, "DO phase is comlete\n"));
+ DEBUGF(infof(conn->data, "DO phase is complete\n"));
}
return result;
}

_______________________________________________
http://cool.haxx.se/mailman/listinfo/curl-commits



Thread at a glance:

Previous Message by Date:

danf: curl configure.ac,1.155,1.156

Update of /cvsroot/curl/curl In directory labb:/tmp/cvs-serv9406 Modified Files: configure.ac Log Message: Properly support the options --without-spnego --without-gssapi --without-krb4 Index: configure.ac =================================================================== RCS file: /cvsroot/curl/curl/configure.ac,v retrieving revision 1.155 retrieving revision 1.156 diff -u -d -r1.155 -r1.156 --- configure.ac 1 Jun 2005 21:30:29 -0000 1.155 +++ configure.ac 20 Jul 2005 23:00:27 -0000 1.156 @@ -567,14 +567,15 @@ AC_ARG_WITH(krb4,dnl AC_HELP_STRING([--with-krb4=DIR],[where to look for Kerberos4]),[ OPT_KRB4="$withval" - if test X"$OPT_KRB4" != Xyes - then - LDFLAGS="$LDFLAGS -L$OPT_KRB4/lib$libsuff" - KRB4LIB="$OPT_KRB4/lib$libsuff" - CPPFLAGS="$CPPFLAGS -I$OPT_KRB4/include" - KRB4INC="$OPT_KRB4/include" + if test X"$OPT_KRB4" != Xno; then + want_krb4="yes" + if test X"$OPT_KRB4" != Xyes; then + LDFLAGS="$LDFLAGS -L$OPT_KRB4/lib$libsuff" + KRB4LIB="$OPT_KRB4/lib$libsuff" + CPPFLAGS="$CPPFLAGS -I$OPT_KRB4/include" + KRB4INC="$OPT_KRB4/include" + fi fi - want_krb4="yes" ]) AC_MSG_CHECKING([if Kerberos4 support is requested]) @@ -643,10 +644,13 @@ AC_ARG_WITH(spnego, AC_HELP_STRING([--with-spnego=DIR], - [Specify location of SPNEGO library fbopenssl]), - [ SPNEGO_ROOT="$withval" - want_spnego="yes" ] -) + [Specify location of SPNEGO library fbopenssl]), [ + SPNEGO_ROOT="$withval" + if test x"$SPNEGO_ROOT" != xno; then + want_spnego="yes" + fi +]) + AC_MSG_CHECKING([if SPNEGO support is requested]) if test x"$want_spnego" = xyes; then @@ -689,10 +693,12 @@ AC_ARG_WITH(gssapi, AC_HELP_STRING([--with-gssapi=DIR], - [Where to look for GSSAPI]), - [ GSSAPI_ROOT="$withval" - want_gss="yes" ] -) + [Where to look for GSSAPI]), [ + GSSAPI_ROOT="$withval" + if test x"$GSSAPI_ROOT" != xno; then + want_gss="yes" + fi +]) AC_MSG_CHECKING([if GSSAPI support is requested]) if test x"$want_gss" = xyes; then _______________________________________________ http://cool.haxx.se/mailman/listinfo/curl-commits

Next Message by Date:

danf: curl configure.ac,1.156,1.157

Update of /cvsroot/curl/curl In directory labb:/tmp/cvs-serv20696 Modified Files: configure.ac Log Message: Fixed --without-gnutls Index: configure.ac =================================================================== RCS file: /cvsroot/curl/curl/configure.ac,v retrieving revision 1.156 retrieving revision 1.157 diff -u -d -r1.156 -r1.157 --- configure.ac 20 Jul 2005 23:00:27 -0000 1.156 +++ configure.ac 27 Jul 2005 18:22:21 -0000 1.157 @@ -977,7 +977,7 @@ dnl ---------------------------------------------------- dnl Default to compiler & linker defaults for GnuTLS files & libraries. -OPT_GNUTLS=off +OPT_GNUTLS=no AC_ARG_WITH(gnutls,dnl AC_HELP_STRING([--with-gnutls=PATH],[where to look for GnuTLS, PATH points to the installation root (default: /usr/local/)]) @@ -986,7 +986,7 @@ if test "$OPENSSL_ENABLED" != "1"; then - if test X"$OPT_GNUTLS" != Xoff; then + if test X"$OPT_GNUTLS" != Xno; then if test "x$OPT_GNUTLS" = "xyes"; then check=`libgnutls-config --version 2>/dev/null` if test -n "$check"; then _______________________________________________ http://cool.haxx.se/mailman/listinfo/curl-commits

Previous Message by Thread:

danf: curl configure.ac,1.155,1.156

Update of /cvsroot/curl/curl In directory labb:/tmp/cvs-serv9406 Modified Files: configure.ac Log Message: Properly support the options --without-spnego --without-gssapi --without-krb4 Index: configure.ac =================================================================== RCS file: /cvsroot/curl/curl/configure.ac,v retrieving revision 1.155 retrieving revision 1.156 diff -u -d -r1.155 -r1.156 --- configure.ac 1 Jun 2005 21:30:29 -0000 1.155 +++ configure.ac 20 Jul 2005 23:00:27 -0000 1.156 @@ -567,14 +567,15 @@ AC_ARG_WITH(krb4,dnl AC_HELP_STRING([--with-krb4=DIR],[where to look for Kerberos4]),[ OPT_KRB4="$withval" - if test X"$OPT_KRB4" != Xyes - then - LDFLAGS="$LDFLAGS -L$OPT_KRB4/lib$libsuff" - KRB4LIB="$OPT_KRB4/lib$libsuff" - CPPFLAGS="$CPPFLAGS -I$OPT_KRB4/include" - KRB4INC="$OPT_KRB4/include" + if test X"$OPT_KRB4" != Xno; then + want_krb4="yes" + if test X"$OPT_KRB4" != Xyes; then + LDFLAGS="$LDFLAGS -L$OPT_KRB4/lib$libsuff" + KRB4LIB="$OPT_KRB4/lib$libsuff" + CPPFLAGS="$CPPFLAGS -I$OPT_KRB4/include" + KRB4INC="$OPT_KRB4/include" + fi fi - want_krb4="yes" ]) AC_MSG_CHECKING([if Kerberos4 support is requested]) @@ -643,10 +644,13 @@ AC_ARG_WITH(spnego, AC_HELP_STRING([--with-spnego=DIR], - [Specify location of SPNEGO library fbopenssl]), - [ SPNEGO_ROOT="$withval" - want_spnego="yes" ] -) + [Specify location of SPNEGO library fbopenssl]), [ + SPNEGO_ROOT="$withval" + if test x"$SPNEGO_ROOT" != xno; then + want_spnego="yes" + fi +]) + AC_MSG_CHECKING([if SPNEGO support is requested]) if test x"$want_spnego" = xyes; then @@ -689,10 +693,12 @@ AC_ARG_WITH(gssapi, AC_HELP_STRING([--with-gssapi=DIR], - [Where to look for GSSAPI]), - [ GSSAPI_ROOT="$withval" - want_gss="yes" ] -) + [Where to look for GSSAPI]), [ + GSSAPI_ROOT="$withval" + if test x"$GSSAPI_ROOT" != xno; then + want_gss="yes" + fi +]) AC_MSG_CHECKING([if GSSAPI support is requested]) if test x"$want_gss" = xyes; then _______________________________________________ http://cool.haxx.se/mailman/listinfo/curl-commits

Next Message by Thread:

danf: curl configure.ac,1.156,1.157

Update of /cvsroot/curl/curl In directory labb:/tmp/cvs-serv20696 Modified Files: configure.ac Log Message: Fixed --without-gnutls Index: configure.ac =================================================================== RCS file: /cvsroot/curl/curl/configure.ac,v retrieving revision 1.156 retrieving revision 1.157 diff -u -d -r1.156 -r1.157 --- configure.ac 20 Jul 2005 23:00:27 -0000 1.156 +++ configure.ac 27 Jul 2005 18:22:21 -0000 1.157 @@ -977,7 +977,7 @@ dnl ---------------------------------------------------- dnl Default to compiler & linker defaults for GnuTLS files & libraries. -OPT_GNUTLS=off +OPT_GNUTLS=no AC_ARG_WITH(gnutls,dnl AC_HELP_STRING([--with-gnutls=PATH],[where to look for GnuTLS, PATH points to the installation root (default: /usr/local/)]) @@ -986,7 +986,7 @@ if test "$OPENSSL_ENABLED" != "1"; then - if test X"$OPT_GNUTLS" != Xoff; then + if test X"$OPT_GNUTLS" != Xno; then if test "x$OPT_GNUTLS" = "xyes"; then check=`libgnutls-config --version 2>/dev/null` if test -n "$check"; then _______________________________________________ http://cool.haxx.se/mailman/listinfo/curl-commits
blog comments powered by Disqus

Home | News | Sitemap | FAQ | advertise | OSDir is an Inevitable website. GBiz is too!