diff options
| author | Xavier Roche <xroche@users.noreply.github.com> | 2013-08-12 13:42:55 +0000 |
|---|---|---|
| committer | Xavier Roche <xroche@users.noreply.github.com> | 2013-08-12 13:42:55 +0000 |
| commit | 4e903579b22f3698934294370f076119576041ab (patch) | |
| tree | b2007c09c0994a8a3c2d1aba4c8c04ae540daf9a /src/htsparse.c | |
| parent | e77141ceaefb55f427edcfb777f5f1a96b885583 (diff) | |
Big cleanup in core heap hashtable code, rewritten using new fancy hashtables.
Diffstat (limited to 'src/htsparse.c')
| -rw-r--r-- | src/htsparse.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/htsparse.c b/src/htsparse.c index 02e4e3a..7648d07 100644 --- a/src/htsparse.c +++ b/src/htsparse.c @@ -295,7 +295,7 @@ Please visit our Website: http://www.httrack.com strcpybuff(liens[lien_tot]->fil,F); \ strcpybuff(liens[lien_tot]->sav,S); \ liens_record_sav_len(liens[lien_tot]); \ - hash_write(hashptr,lien_tot,opt->urlhack); \ + hash_write(hashptr,lien_tot); \ } \ } @@ -3196,7 +3196,7 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) { // // On part de la fin et on essaye de se presser (économise temps machine) { - int i = hash_read(hash, save, "", 0, opt->urlhack); // lecture type 0 (sav) + int i = hash_read(hash, save, NULL, 0); // lecture type 0 (sav) if (i >= 0) { if ((opt->debug > 1) && (opt->log != NULL)) { @@ -3636,7 +3636,7 @@ int hts_mirror_check_moved(htsmoduleStruct * str, liens[liens[ptr]->precedent]->adr, liens[liens[ptr]->precedent]->fil, opt, liens, lien_tot, sback, cache, hash, ptr, numero_passe, NULL) != -1) { - if (hash_read(hash, mov_sav, "", 0, 0) < 0) { // n'existe pas déja + if (hash_read(hash, mov_sav, NULL, HASH_STRUCT_FILENAME) < 0) { // n'existe pas déja // enregistrer lien (MACRO) avec SAV IDENTIQUE liens_record(mov_adr, mov_fil, liens[ptr]->sav, "", ""); //liens_record(mov_adr,mov_fil,mov_sav,"",""); @@ -4074,7 +4074,7 @@ void hts_mirror_process_user_interaction(htsmoduleStruct * str, if (url_savename (add_adr, add_fil, add_sav, NULL, NULL, NULL, NULL, opt, liens, lien_tot, sback, cache, hash, ptr, numero_passe, NULL) != -1) { - if (hash_read(hash, add_sav, "", 0, 0) < 0) { // n'existe pas déja + if (hash_read(hash, add_sav, NULL, HASH_STRUCT_FILENAME) < 0) { // n'existe pas déja // enregistrer lien (MACRO) liens_record(add_adr, add_fil, add_sav, "", ""); if (liens[lien_tot] != NULL) { // OK, pas d'erreur @@ -4624,7 +4624,7 @@ int hts_wait_delayed(htsmoduleStruct * str, char *adr, char *fil, char *save, } /* Check if the file was recorded already (necessary for redirects) */ - if (hash_read(hash, save, "", 0, opt->urlhack) >= 0) { + if (hash_read(hash, save, NULL, HASH_STRUCT_FILENAME) >= 0) { if (loops == 0) { /* Should not happend */ hts_log_print(opt, LOG_ERROR, "Duplicate entry in hts_wait_delayed() cancelled: %s%s -> %s", |