summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/htsftp.c4
-rw-r--r--src/htshelp.c28
-rw-r--r--src/htsjava.c2
-rw-r--r--src/htsmodules.h2
-rw-r--r--src/htsweb.c2
-rw-r--r--src/htszlib.c2
-rw-r--r--src/proxy/proxytrack.c2
7 files changed, 21 insertions, 21 deletions
diff --git a/src/htsftp.c b/src/htsftp.c
index 26e0ef0..98aa522 100644
--- a/src/htsftp.c
+++ b/src/htsftp.c
@@ -603,7 +603,7 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
deletesoc(soc_dat);
soc_dat = INVALID_SOCKET;
//
- snprintf(back->r.msg, sizeof(back->r.msg), "RETR command errror: %s",
+ snprintf(back->r.msg, sizeof(back->r.msg), "RETR command error: %s",
linejmp(line));
// back->status=STATUS_FTP_READY; // fini
back->r.statuscode = STATUSCODE_INVALID;
@@ -657,7 +657,7 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
back->r.statuscode = STATUSCODE_INVALID;
}
} else {
- snprintf(back->r.msg, sizeof(back->r.msg), "RETR command errror: %s", linejmp(line));
+ snprintf(back->r.msg, sizeof(back->r.msg), "RETR command error: %s", linejmp(line));
// back->status=STATUS_FTP_READY; // fini
back->r.statuscode = STATUSCODE_INVALID;
}
diff --git a/src/htshelp.c b/src/htshelp.c
index 3a628fa..5672047 100644
--- a/src/htshelp.c
+++ b/src/htshelp.c
@@ -532,7 +532,7 @@ void help(const char *app, int more) {
infomsg
(" JN traffic jam control, minimum transfert rate (bytes/seconds) tolerated for a link");
infomsg
- (" HN host is abandonned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow");
+ (" HN host is abandoned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow");
infomsg("");
infomsg("Links options:");
infomsg
@@ -662,7 +662,7 @@ void help(const char *app, int more) {
infomsg(" #R old FTP routines (debug)");
infomsg(" #T generate transfer ops. log every minutes");
infomsg(" #u wait time");
- infomsg(" #Z generate transfer rate statictics every minutes");
+ infomsg(" #Z generate transfer rate statistics every minutes");
infomsg("");
infomsg
("Dangerous options: (do NOT use unless you exactly know what you are doing)");
@@ -689,24 +689,24 @@ void help(const char *app, int more) {
infomsg(" N99 All files in web/, with random names (gadget !)");
infomsg(" N100 Site-structure, without www.domain.xxx/");
infomsg
- (" N101 Identical to N1 exept that \"web\" is replaced by the site's name");
+ (" N101 Identical to N1 except that \"web\" is replaced by the site's name");
infomsg
- (" N102 Identical to N2 exept that \"web\" is replaced by the site's name");
+ (" N102 Identical to N2 except that \"web\" is replaced by the site's name");
infomsg
- (" N103 Identical to N3 exept that \"web\" is replaced by the site's name");
+ (" N103 Identical to N3 except that \"web\" is replaced by the site's name");
infomsg
- (" N104 Identical to N4 exept that \"web\" is replaced by the site's name");
+ (" N104 Identical to N4 except that \"web\" is replaced by the site's name");
infomsg
- (" N105 Identical to N5 exept that \"web\" is replaced by the site's name");
+ (" N105 Identical to N5 except that \"web\" is replaced by the site's name");
infomsg
- (" N199 Identical to N99 exept that \"web\" is replaced by the site's name");
- infomsg(" N1001 Identical to N1 exept that there is no \"web\" directory");
- infomsg(" N1002 Identical to N2 exept that there is no \"web\" directory");
+ (" N199 Identical to N99 except that \"web\" is replaced by the site's name");
+ infomsg(" N1001 Identical to N1 except that there is no \"web\" directory");
+ infomsg(" N1002 Identical to N2 except that there is no \"web\" directory");
infomsg
- (" N1003 Identical to N3 exept that there is no \"web\" directory (option set for g option)");
- infomsg(" N1004 Identical to N4 exept that there is no \"web\" directory");
- infomsg(" N1005 Identical to N5 exept that there is no \"web\" directory");
- infomsg(" N1099 Identical to N99 exept that there is no \"web\" directory");
+ (" N1003 Identical to N3 except that there is no \"web\" directory (option set for g option)");
+ infomsg(" N1004 Identical to N4 except that there is no \"web\" directory");
+ infomsg(" N1005 Identical to N5 except that there is no \"web\" directory");
+ infomsg(" N1099 Identical to N99 except that there is no \"web\" directory");
infomsg("Details: User-defined option N");
infomsg(" '%n' Name of file without file type (ex: image)");
infomsg(" '%N' Name of file, including file type (ex: image.gif)");
diff --git a/src/htsjava.c b/src/htsjava.c
index 48a4267..5f3d828 100644
--- a/src/htsjava.c
+++ b/src/htsjava.c
@@ -425,7 +425,7 @@ static RESP_STRUCT readtable(htsmoduleStruct * str, FILE * fp,
if (!feof(fp)) {
trans.type = -1;
} else {
- sprintf(str->err_msg, "Internal stucture error (ASCII)");
+ sprintf(str->err_msg, "Internal structure error (ASCII)");
*error = 1;
}
return (trans);
diff --git a/src/htsmodules.h b/src/htsmodules.h
index 3f9d673..4d90c14 100644
--- a/src/htsmodules.h
+++ b/src/htsmodules.h
@@ -78,7 +78,7 @@ struct htsmoduleStruct {
/* Write-only */
const char *wrapper_name; /* name of wrapper (static string) */
- char *err_msg; /* if an error occured, the error message (max. 1KB) */
+ char *err_msg; /* if an error occurred, the error message (max. 1KB) */
/* Read/Write */
int relativeToHtmlLink; /* set this to 1 if all urls you pass to addLink
diff --git a/src/htsweb.c b/src/htsweb.c
index 2ef8c3b..294d41d 100644
--- a/src/htsweb.c
+++ b/src/htsweb.c
@@ -152,7 +152,7 @@ int main(int argc, char *argv[]) {
int defaultPort = 0;
int parentPid = 0;
- printf("Initialzing the server..\n");
+ printf("Initializing the server..\n");
#ifdef _WIN32
{
diff --git a/src/htszlib.c b/src/htszlib.c
index c3d8ca8..40bc948 100644
--- a/src/htszlib.c
+++ b/src/htszlib.c
@@ -48,7 +48,7 @@ Please visit our Website: http://www.httrack.com
/*
Unpack file into a new file
- Return value: size of the new file, or -1 if an error occured
+ Return value: size of the new file, or -1 if an error occurred
*/
/* Note: utf-8 */
int hts_zunpack(char *filename, char *newfile) {
diff --git a/src/proxy/proxytrack.c b/src/proxy/proxytrack.c
index bf920c9..8bef948 100644
--- a/src/proxy/proxytrack.c
+++ b/src/proxy/proxytrack.c
@@ -1271,7 +1271,7 @@ static void proxytrack_process_HTTP(PT_Indexes indexes, T_SOC soc_c) {
DISABLE_IE_FRIENDLY_HTTP_ERROR_MESSAGES "<head>"
"<title>ProxyTrack - HTTP Proxy Error %d</title>" "</head>\r\n"
"<body>"
- "<h3>A proxy error has occured while processing the request.</h3><br />"
+ "<h3>A proxy error has occurred while processing the request.</h3><br />"
"<b>Error HTTP %d: <i>%s</i></b><br />" "<br />" "<br />\r\n"
"<i>Generated by ProxyTrack " PROXYTRACK_VERSION
", (C) Xavier Roche and other contributors</i>" "\r\n" "</body>"