diff options
-rw-r--r-- | src/htsback.c | 20 | ||||
-rw-r--r-- | src/htsback.h | 10 | ||||
-rw-r--r-- | src/htscore.c | 3 | ||||
-rw-r--r-- | src/htscore.h | 4 | ||||
-rw-r--r-- | src/htslib.c | 2 | ||||
-rw-r--r-- | src/htsname.c | 4 | ||||
-rw-r--r-- | src/htsname.h | 4 |
7 files changed, 24 insertions, 23 deletions
diff --git a/src/htsback.c b/src/htsback.c index 098a528..7d9a41d 100644 --- a/src/htsback.c +++ b/src/htsback.c @@ -349,8 +349,8 @@ int back_cleanup_background(httrackp * opt, cache_back * cache, } // nombre d'entrées libres dans le backing -int back_available(struct_back * sback) { - lien_back *const back = sback->lnk; +int back_available(const struct_back * sback) { + const lien_back *const back = sback->lnk; const int back_max = sback->count; int i; int nb = 0; @@ -362,8 +362,8 @@ int back_available(struct_back * sback) { } // retourne estimation de la taille des html et fichiers stockés en mémoire -LLint back_incache(struct_back * sback) { - lien_back *const back = sback->lnk; +LLint back_incache(const struct_back * sback) { + const lien_back *const back = sback->lnk; const int back_max = sback->count; int i; LLint sum = 0; @@ -391,8 +391,8 @@ LLint back_incache(struct_back * sback) { } // retourne estimation de la taille des html et fichiers stockés en mémoire -int back_done_incache(struct_back * sback) { - lien_back *const back = sback->lnk; +int back_done_incache(const struct_back * sback) { + const lien_back *const back = sback->lnk; const int back_max = sback->count; int i; int n = 0; @@ -426,8 +426,8 @@ HTS_INLINE int back_exist(struct_back * sback, httrackp * opt, const char *adr, } // nombre de sockets en tâche de fond -int back_nsoc(struct_back * sback) { - lien_back *const back = sback->lnk; +int back_nsoc(const struct_back * sback) { + const lien_back *const back = sback->lnk; const int back_max = sback->count; int n = 0; int i; @@ -438,8 +438,8 @@ int back_nsoc(struct_back * sback) { return n; } -int back_nsoc_overall(struct_back * sback) { - lien_back *const back = sback->lnk; +int back_nsoc_overall(const struct_back * sback) { + const lien_back *const back = sback->lnk; const int back_max = sback->count; int n = 0; int i; diff --git a/src/htsback.h b/src/htsback.h index 776214c..5c1aac8 100644 --- a/src/htsback.h +++ b/src/htsback.h @@ -76,13 +76,13 @@ void back_free(struct_back ** sback); #define BACK_ADD_TEST2 "(dummy2)" int back_index(httrackp * opt, struct_back * sback, const char *adr, const char *fil, const char *sav); -int back_available(struct_back * sback); -LLint back_incache(struct_back * sback); -int back_done_incache(struct_back * sback); +int back_available(const struct_back * sback); +LLint back_incache(const struct_back * sback); +int back_done_incache(const struct_back * sback); HTS_INLINE int back_exist(struct_back * sback, httrackp * opt, const char *adr, const char *fil, const char *sav); -int back_nsoc(struct_back * sback); -int back_nsoc_overall(struct_back * sback); +int back_nsoc(const struct_back * sback); +int back_nsoc_overall(const struct_back * sback); int back_add(struct_back * sback, httrackp * opt, cache_back * cache, const char *adr, const char *fil, const char *save, const char *referer_adr, const char *referer_fil, int test); diff --git a/src/htscore.c b/src/htscore.c index d95e4df..c9834d9 100644 --- a/src/htscore.c +++ b/src/htscore.c @@ -3219,7 +3219,8 @@ void check_rate(TStamp stat_timestart, int maxrate) { // sous routines liées au moteur et au backing // supplemental links ready (done) after ptr or ready in background -int backlinks_done(struct_back * sback, lien_url ** liens, int lien_tot, +int backlinks_done(const struct_back * sback, + const lien_url ** liens, int lien_tot, int ptr) { int n = 0; diff --git a/src/htscore.h b/src/htscore.h index 6c7d49f..178dc3f 100644 --- a/src/htscore.h +++ b/src/htscore.h @@ -372,8 +372,8 @@ int back_pluggable_sockets(struct_back * sback, httrackp * opt); int back_pluggable_sockets_strict(struct_back * sback, httrackp * opt); int back_fill(struct_back * sback, httrackp * opt, cache_back * cache, lien_url ** liens, int ptr, int numero_passe, int lien_tot); -int backlinks_done(struct_back * sback, lien_url ** liens, int lien_tot, - int ptr); +int backlinks_done(const struct_back * sback, const lien_url ** liens, + int lien_tot, int ptr); int back_fillmax(struct_back * sback, httrackp * opt, cache_back * cache, lien_url ** liens, int ptr, int numero_passe, int lien_tot); diff --git a/src/htslib.c b/src/htslib.c index 0ec0148..9c06cd5 100644 --- a/src/htslib.c +++ b/src/htslib.c @@ -2977,7 +2977,7 @@ int finput(T_SOC fd, char *s, int max) { do { //c=fgetc(fp); - if (read(fd, &c, 1) <= 0) { + if (read((int) fd, &c, 1) <= 0) { c = 0; } if (c != 0) { diff --git a/src/htsname.c b/src/htsname.c index 0ca6540..7b25627 100644 --- a/src/htsname.c +++ b/src/htsname.c @@ -140,8 +140,8 @@ static void cleanEndingSpaceOrDot(char *s) { // forme le nom du fichier à sauver (save) à partir de fil et adr // système intelligent, qui renomme en cas de besoin (exemple: deux INDEX.HTML et index.html) int url_savename(char *adr_complete, char *fil_complete, char *save, - char *former_adr, char *former_fil, char *referer_adr, - char *referer_fil, httrackp * opt, lien_url ** liens, + char *former_adr, char *former_fil, const char *referer_adr, + const char *referer_fil, httrackp * opt, lien_url ** liens, int lien_tot, struct_back * sback, cache_back * cache, hash_struct * hash, int ptr, int numero_passe, const lien_back * headers) { diff --git a/src/htsname.h b/src/htsname.h index 245cc26..4c67893 100644 --- a/src/htsname.h +++ b/src/htsname.h @@ -83,8 +83,8 @@ typedef struct lien_back lien_back; // note: 'headers' can either be null, or incomplete (only r member filled) int url_savename(char *adr_complete, char *fil_complete, char *save, - char *former_adr, char *former_fil, char *referer_adr, - char *referer_fil, httrackp * opt, lien_url ** liens, + char *former_adr, char *former_fil, const char *referer_adr, + const char *referer_fil, httrackp * opt, lien_url ** liens, int lien_tot, struct_back * sback, cache_back * cache, hash_struct * hash, int ptr, int numero_passe, const lien_back * headers); |