summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorXavier Roche <xroche@users.noreply.github.com>2013-06-18 16:23:52 +0000
committerXavier Roche <xroche@users.noreply.github.com>2013-06-18 16:23:52 +0000
commite6eb8c0224e585735c113613b7fa42402778476d (patch)
tree212c6d70a21fc7abadda66430c529c299cbfbf51 /src
parent189cde335fc51c7c858080624d879faa5f88b83e (diff)
transfered => transferred
Diffstat (limited to 'src')
-rw-r--r--src/htsalias.c2
-rw-r--r--src/htsback.c8
-rw-r--r--src/htsback.h2
-rw-r--r--src/htscore.c6
-rw-r--r--src/htslib.c6
-rw-r--r--src/htsname.c4
-rw-r--r--src/htsparse.c10
-rw-r--r--src/htsparse.h2
8 files changed, 20 insertions, 20 deletions
diff --git a/src/htsalias.c b/src/htsalias.c
index 52c93e9..2066093 100644
--- a/src/htsalias.c
+++ b/src/htsalias.c
@@ -173,7 +173,7 @@ const char *hts_optalias[][4] = {
{"structure", "-N", "param1", "user-defined structure"},
{"usercommand", "-V", "param1", "user-defined command"},
{"display", "-%v", "single",
- "show files transfered and other funny realtime information"},
+ "show files transferred and other funny realtime information"},
{"dos83", "-L0", "single", ""},
{"iso9660", "-L2", "single", ""},
{"disable-module", "-%w", "param1", ""},
diff --git a/src/htsback.c b/src/htsback.c
index a51a1cf..0644de1 100644
--- a/src/htsback.c
+++ b/src/htsback.c
@@ -1843,7 +1843,7 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, char *adr,
} else {
hts_log_print(opt, LOG_NOTICE,
"File partially present (" LLintP
- " bytes) retransfered due to lack of cache: %s%s",
+ " bytes) retransferred due to lack of cache: %s%s",
(LLint) sz, back[p].url_adr, back[p].url_fil);
/* Sinon requête normale... */
back[p].http11 = 0;
@@ -1861,7 +1861,7 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, char *adr,
} else {
hts_log_print(opt, LOG_NOTICE,
"HTML file (" LLintP
- " bytes) retransfered due to lack of cache: %s%s",
+ " bytes) retransferred due to lack of cache: %s%s",
(LLint) sz, back[p].url_adr, back[p].url_fil);
/* Sinon requête normale... */
back[p].http11 = 0;
@@ -4041,7 +4041,7 @@ int back_checkmirror(httrackp * opt) {
if (!opt->state.stop) { /* not yet stopped */
hts_log_print(opt, LOG_ERROR,
"More than " LLintP
- " bytes have been transfered.. giving up",
+ " bytes have been transferred.. giving up",
(LLint) opt->maxsite);
/* cancel mirror smoothly */
hts_request_stop(opt, 0);
@@ -4064,7 +4064,7 @@ int back_checkmirror(httrackp * opt) {
}
// octets transférés + add
-LLint back_transfered(LLint nb, struct_back * sback) {
+LLint back_transferred(LLint nb, struct_back * sback) {
lien_back *const back = sback->lnk;
const int back_max = sback->count;
int i;
diff --git a/src/htsback.h b/src/htsback.h
index a59dafc..82ceb9d 100644
--- a/src/htsback.h
+++ b/src/htsback.h
@@ -129,7 +129,7 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
const int p);
void back_info(struct_back * sback, int i, int j, FILE * fp);
void back_infostr(struct_back * sback, int i, int j, char *s);
-LLint back_transfered(LLint add, struct_back * sback);
+LLint back_transferred(LLint add, struct_back * sback);
// hostback
#if HTS_XGETHOST
diff --git a/src/htscore.c b/src/htscore.c
index 5872dd8..9aaf285 100644
--- a/src/htscore.c
+++ b/src/htscore.c
@@ -1970,7 +1970,7 @@ int httpmirror(char *url1, httrackp * opt) {
/*
updating-a-remotely-deteted-website hack
- no much data transfered, no data saved
+ no much data transferred, no data saved
<no files successfulyl saved>
we assume that something was bad (no connection)
just backup old cache and restore everything
@@ -1979,7 +1979,7 @@ int httpmirror(char *url1, httrackp * opt) {
&& (HTS_STAT.HTS_TOTAL_RECV < 32768) /* should be fine */
) {
hts_log_print(opt, LOG_INFO,
- "No data seems to have been transfered during this session! : restoring previous one!");
+ "No data seems to have been transferred during this session! : restoring previous one!");
XH_uninit;
if ((fexist
(fconcat
@@ -2169,7 +2169,7 @@ int httpmirror(char *url1, httrackp * opt) {
(int) ((LLint) (HTS_STAT.total_packed * 100) / HTS_STAT.total_unpacked);
sprintf(finalInfo + strlen(finalInfo),
", " LLintP
- " bytes transfered using HTTP compression in %d files, ratio %d%%",
+ " bytes transferred using HTTP compression in %d files, ratio %d%%",
(LLint) HTS_STAT.total_unpacked, HTS_STAT.total_packedfiles,
(int) packed_ratio);
}
diff --git a/src/htslib.c b/src/htslib.c
index 04f4360..dbb7c59 100644
--- a/src/htslib.c
+++ b/src/htslib.c
@@ -4552,7 +4552,7 @@ LLint check_downloadable_bytes(int rate) {
if (rate > 0) {
TStamp time_now;
TStamp elapsed_useconds;
- LLint bytes_transfered_during_period;
+ LLint bytes_transferred_during_period;
LLint left;
// get the older timer
@@ -4561,10 +4561,10 @@ LLint check_downloadable_bytes(int rate) {
time_now = mtime_local();
elapsed_useconds = time_now - HTS_STAT.istat_timestart[id_timer];
// NO totally stupid - elapsed_useconds+=1000; // for the next second, too
- bytes_transfered_during_period =
+ bytes_transferred_during_period =
(HTS_STAT.HTS_TOTAL_RECV - HTS_STAT.istat_bytes[id_timer]);
- left = ((rate * elapsed_useconds) / 1000) - bytes_transfered_during_period;
+ left = ((rate * elapsed_useconds) / 1000) - bytes_transferred_during_period;
if (left <= 0)
left = 0;
diff --git a/src/htsname.c b/src/htsname.c
index 0ca7591..4719ec5 100644
--- a/src/htsname.c
+++ b/src/htsname.c
@@ -84,7 +84,7 @@ static const char *hts_tbdev[] = {
HTS_STAT.stat_warnings=fspc(opt,NULL,"warning"); \
HTS_STAT.stat_infos=fspc(opt,NULL,"info"); \
HTS_STAT.nbk=backlinks_done(sback,liens,lien_tot,ptr); \
- HTS_STAT.nb=back_transfered(HTS_STAT.stat_bytes,sback); \
+ HTS_STAT.nb=back_transferred(HTS_STAT.stat_bytes,sback); \
/* Check */ \
{ \
if (!RUN_CALLBACK7(opt, loop, sback->lnk, sback->count,-1,ptr,lien_tot,(int) (time_local()-HTS_STAT.stat_timestart),&HTS_STAT)) { \
@@ -530,7 +530,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
HTS_STAT.stat_warnings = fspc(opt, NULL, "warning");
HTS_STAT.stat_infos = fspc(opt, NULL, "info");
HTS_STAT.nbk = backlinks_done(sback, liens, lien_tot, ptr);
- HTS_STAT.nb = back_transfered(HTS_STAT.stat_bytes, sback);
+ HTS_STAT.nb = back_transferred(HTS_STAT.stat_bytes, sback);
if (!RUN_CALLBACK7
(opt, loop, sback->lnk, sback->count, b, ptr, lien_tot,
diff --git a/src/htsparse.c b/src/htsparse.c
index e1380a0..1661e2b 100644
--- a/src/htsparse.c
+++ b/src/htsparse.c
@@ -3453,7 +3453,7 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {
HTS_STAT.stat_warnings = fspc(opt, NULL, "warning");
HTS_STAT.stat_infos = fspc(opt, NULL, "info");
HTS_STAT.nbk = backlinks_done(sback, liens, lien_tot, ptr);
- HTS_STAT.nb = back_transfered(HTS_STAT.stat_bytes, sback);
+ HTS_STAT.nb = back_transferred(HTS_STAT.stat_bytes, sback);
if (!RUN_CALLBACK7
(opt, loop, sback->lnk, sback->count, 0, ptr, lien_tot,
@@ -4009,7 +4009,7 @@ void hts_mirror_process_user_interaction(htsmoduleStruct * str,
HTS_STAT.stat_warnings = fspc(opt, NULL, "warning");
HTS_STAT.stat_infos = fspc(opt, NULL, "info");
HTS_STAT.nbk = backlinks_done(sback, liens, lien_tot, ptr);
- HTS_STAT.nb = back_transfered(HTS_STAT.stat_bytes, sback);
+ HTS_STAT.nb = back_transferred(HTS_STAT.stat_bytes, sback);
b = 0;
if (!RUN_CALLBACK7
@@ -4137,7 +4137,7 @@ void hts_mirror_process_user_interaction(htsmoduleStruct * str,
HTS_STAT.stat_warnings = fspc(opt, NULL, "warning");
HTS_STAT.stat_infos = fspc(opt, NULL, "info");
HTS_STAT.nbk = backlinks_done(sback, liens, lien_tot, ptr);
- HTS_STAT.nb = back_transfered(HTS_STAT.stat_bytes, sback);
+ HTS_STAT.nb = back_transferred(HTS_STAT.stat_bytes, sback);
if (!RUN_CALLBACK7
(opt, loop, sback->lnk, sback->count, b, ptr, lien_tot,
@@ -4337,7 +4337,7 @@ int hts_mirror_wait_for_next_file(htsmoduleStruct * str,
HTS_STAT.stat_warnings = fspc(opt, NULL, "warning");
HTS_STAT.stat_infos = fspc(opt, NULL, "info");
HTS_STAT.nbk = backlinks_done(sback, liens, lien_tot, ptr);
- HTS_STAT.nb = back_transfered(HTS_STAT.stat_bytes, sback);
+ HTS_STAT.nb = back_transferred(HTS_STAT.stat_bytes, sback);
if (!RUN_CALLBACK7
(opt, loop, sback->lnk, sback->count, b, ptr, lien_tot,
@@ -4740,7 +4740,7 @@ int hts_wait_delayed(htsmoduleStruct * str, char *adr, char *fil, char *save,
HTS_STAT.stat_warnings = fspc(opt, NULL, "warning");
HTS_STAT.stat_infos = fspc(opt, NULL, "info");
HTS_STAT.nbk = backlinks_done(sback, liens, lien_tot, ptr);
- HTS_STAT.nb = back_transfered(HTS_STAT.stat_bytes, sback);
+ HTS_STAT.nb = back_transferred(HTS_STAT.stat_bytes, sback);
if (!RUN_CALLBACK7
(opt, loop, sback->lnk, sback->count, b, ptr, lien_tot,
diff --git a/src/htsparse.h b/src/htsparse.h
index 9c0f401..5424437 100644
--- a/src/htsparse.h
+++ b/src/htsparse.h
@@ -188,7 +188,7 @@ int hts_wait_delayed(htsmoduleStruct * str, char *adr, char *fil, char *save,
HTS_STAT.stat_warnings=fspc(opt,NULL,"warning"); \
HTS_STAT.stat_infos=fspc(opt,NULL,"info"); \
HTS_STAT.nbk=backlinks_done(sback,liens,lien_tot,ptr); \
- HTS_STAT.nb=back_transfered(HTS_STAT.stat_bytes,sback); \
+ HTS_STAT.nb=back_transferred(HTS_STAT.stat_bytes,sback); \
/* Check */ \
if (!RUN_CALLBACK7(opt, loop, sback->lnk, sback->count, -1,ptr,lien_tot,(int) (time_local()-HTS_STAT.stat_timestart),&HTS_STAT)) { \
return -1; \