summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/htsback.c8
-rw-r--r--src/htsbase.h12
-rw-r--r--src/htscache.c14
-rw-r--r--src/htscatchurl.c5
-rw-r--r--src/htscharset.c6
-rw-r--r--src/htscore.c7
-rw-r--r--src/htscoremain.c8
-rw-r--r--src/htsfilters.c5
-rw-r--r--src/htsftp.c2
-rw-r--r--src/htshash.c10
-rw-r--r--src/htshash.h4
-rw-r--r--src/htsjava.c4
-rw-r--r--src/htslib.c9
-rw-r--r--src/htslib.h4
-rw-r--r--src/htsmd5.c14
-rw-r--r--src/htsmd5.h3
-rw-r--r--src/htsname.c6
-rw-r--r--src/htsnet.h3
-rw-r--r--src/htsparse.c31
-rw-r--r--src/htsserver.c4
-rw-r--r--src/htstools.c4
-rw-r--r--src/httrack.c13
-rw-r--r--src/proxy/proxytrack.c6
23 files changed, 89 insertions, 93 deletions
diff --git a/src/htsback.c b/src/htsback.c
index a19d543..f1bf273 100644
--- a/src/htsback.c
+++ b/src/htsback.c
@@ -464,13 +464,13 @@ int back_finalize(httrackp* opt,cache_back* cache,struct_back* sback,int p) {
if (back[p].status == STATUS_READY) {
if (opt->log!=NULL) {
HTS_LOG(opt,LOG_WARNING);
- fprintf(opt->log, "file not stored in cache due to bogus state (broken size, expected %d got %d): %s%s"LF,
+ fprintf(opt->log, "file not stored in cache due to bogus state (broken size, expected "LLintP" got "LLintP"): %s%s"LF,
back[p].r.totalsize, back[p].r.size, back[p].url_adr,back[p].url_fil);
}
} else {
if (opt->log!=NULL) {
HTS_LOG(opt,LOG_INFO);
- fprintf(opt->log, "incomplete file not yet stored in cache (expected %d got %d): %s%s"LF,
+ fprintf(opt->log, "incomplete file not yet stored in cache (expected "LLintP" got "LLintP"): %s%s"LF,
back[p].r.totalsize, back[p].r.size, back[p].url_adr,back[p].url_fil);
}
}
@@ -1482,9 +1482,7 @@ int back_add(struct_back* sback,httrackp* opt,cache_back* cache,char* adr,char*
if (a) {
#endif
if (!test) { // non mode test
-#if HTS_FAST_CACHE
- uintptr_t pos=hash_pos;
-#else
+#if HTS_FAST_CACHE==0
int pos=-1;
a+=strlen(buff);
sscanf(a,"%d",&pos); // lire position
diff --git a/src/htsbase.h b/src/htsbase.h
index 8bf7e2e..e144991 100644
--- a/src/htsbase.h
+++ b/src/htsbase.h
@@ -237,7 +237,7 @@ extern HTSEXT_API int htsMemoryFastXfr;
/* protected strcat, strncat and strcpy - definitely useful */
#define strcatbuff(A, B) do { \
assertf( (A) != NULL ); \
- if ( ! (B) ) { assertf( 0 ); } \
+ assertf( (B) != NULL ); \
if (htsMemoryFastXfr) { \
if (sizeof(A) != sizeof(char*)) { \
(A)[sizeof(A) - 1] = '\0'; \
@@ -263,7 +263,7 @@ extern HTSEXT_API int htsMemoryFastXfr;
} while(0)
#define strncatbuff(A, B, N) do { \
assertf( (A) != NULL ); \
- if ( ! (B) ) { assertf( 0 ); } \
+ assertf( (B) != NULL ); \
if (htsMemoryFastXfr) { \
if (sizeof(A) != sizeof(char*)) { \
(A)[sizeof(A) - 1] = '\0'; \
@@ -292,7 +292,7 @@ extern HTSEXT_API int htsMemoryFastXfr;
} while(0)
#define strcpybuff(A, B) do { \
assertf( (A) != NULL ); \
- if ( ! (B) ) { assertf( 0 ); } \
+ assertf( (const char*) (B) != NULL ); \
if (htsMemoryFastXfr) { \
if (sizeof(A) != sizeof(char*)) { \
(A)[sizeof(A) - 1] = '\0'; \
@@ -327,7 +327,7 @@ extern HTSEXT_API int htsMemoryFastXfr;
/* protected strcat, strncat and strcpy - definitely useful */
#define strcatbuff(A, B) do { \
assertf( (A) != NULL ); \
- if ( ! (B) ) { assertf( 0 ); } \
+ assertf( (B) != NULL ); \
if (sizeof(A) != sizeof(char*)) { \
(A)[sizeof(A) - 1] = '\0'; \
} \
@@ -338,7 +338,7 @@ extern HTSEXT_API int htsMemoryFastXfr;
} while(0)
#define strncatbuff(A, B, N) do { \
assertf( (A) != NULL ); \
- if ( ! (B) ) { assertf( 0 ); } \
+ assertf( (B) != NULL ); \
if (sizeof(A) != sizeof(char*)) { \
(A)[sizeof(A) - 1] = '\0'; \
} \
@@ -349,7 +349,7 @@ extern HTSEXT_API int htsMemoryFastXfr;
} while(0)
#define strcpybuff(A, B) do { \
assertf( (A) != NULL ); \
- if ( ! (B) ) { assertf( 0 ); } \
+ assertf( (B) != NULL ); \
if (sizeof(A) != sizeof(char*)) { \
(A)[sizeof(A) - 1] = '\0'; \
} \
diff --git a/src/htscache.c b/src/htscache.c
index fc18852..689154f 100644
--- a/src/htscache.c
+++ b/src/htscache.c
@@ -231,8 +231,8 @@ void cache_add(httrackp* opt,cache_back* cache,const htsblk *r,const char* url_a
int dataincache=0; // put data in cache ?
char BIGSTK headers[8192];
int headersSize = 0;
- int entryBodySize = 0;
- int entryFilenameSize = 0;
+ //int entryBodySize = 0;
+ //int entryFilenameSize = 0;
zip_fileinfo fi;
const char* url_save_suffix = url_save;
int zErr;
@@ -268,7 +268,7 @@ void cache_add(httrackp* opt,cache_back* cache,const htsblk *r,const char* url_a
// data in cache
if (dataincache) {
assertf(((int) r->size) == r->size);
- entryBodySize = (int) r->size;
+ //entryBodySize = (int) r->size;
}
/* Fields */
@@ -283,7 +283,7 @@ void cache_add(httrackp* opt,cache_back* cache,const htsblk *r,const char* url_a
message = "(See X-StatusMessage)";
}
/* 64 characters MAX for first line */
- sprintf(headers + headersSize, "HTTP/1.%c %d %s\r\n", '1', r->statuscode, r->msg);
+ sprintf(headers + headersSize, "HTTP/1.%c %d %s\r\n", '1', r->statuscode, message);
}
headersSize += (int) strlen(headers + headersSize);
@@ -309,7 +309,7 @@ void cache_add(httrackp* opt,cache_back* cache,const htsblk *r,const char* url_a
ZIP_FIELD_STRING(headers, headersSize, "X-Fil", url_fil); // Original URI filename
ZIP_FIELD_STRING(headers, headersSize, "X-Save", url_save_suffix); // Original save filename
- entryFilenameSize = (int) ( strlen(url_adr) + strlen(url_fil));
+ //entryFilenameSize = (int) ( strlen(url_adr) + strlen(url_fil));
/* Filename */
if (!link_has_authority(url_adr)) {
@@ -630,7 +630,7 @@ static htsblk cache_readex_new(httrackp* opt,cache_back* cache,const char* adr,c
if (unzOpenCurrentFile((unzFile) cache->zipInput) == Z_OK) {
char BIGSTK headerBuff[8192 + 2];
int readSizeHeader;
- int totalHeader = 0;
+ //int totalHeader = 0;
int dataincache = 0;
/* For BIG comments */
@@ -674,7 +674,7 @@ static htsblk cache_readex_new(httrackp* opt,cache_back* cache,const char* adr,c
ZIP_READFIELD_STRING(line, value, "X-Save", previous_save_); // Original save filename
}
} while(offset < readSizeHeader && !lineEof);
- totalHeader = offset;
+ //totalHeader = offset;
/* Previous entry */
if (previous_save_[0] != '\0') {
diff --git a/src/htscatchurl.c b/src/htscatchurl.c
index 0188b31..9579687 100644
--- a/src/htscatchurl.c
+++ b/src/htscatchurl.c
@@ -106,7 +106,7 @@ HTSEXT_API T_SOC catch_url_init(int* port,char* adr) {
SOCaddr_initport(server, *port);
if ( bind(soc,(struct sockaddr*) &server,server_size) == 0 ) {
SOCaddr server2;
- int len;
+ SOClen len;
len=sizeof(server2);
// effacer structure
memset(&server2, 0, sizeof(server2));
@@ -172,8 +172,7 @@ HTSEXT_API int catch_url(T_SOC soc,char* url,char* method,char* data) {
/* INFOS */
{
SOCaddr server2;
- int len;
- len=sizeof(server2);
+ SOClen len = sizeof(server2);
// effacer structure
memset(&server2, 0, sizeof(server2));
if (getpeername(soc,(struct sockaddr*) &server2,&len) == 0) {
diff --git a/src/htscharset.c b/src/htscharset.c
index 88d1ea1..26f8d7a 100644
--- a/src/htscharset.c
+++ b/src/htscharset.c
@@ -36,7 +36,7 @@ Please visit our Website: http://www.httrack.com
#include "htscharset.h"
-int hts_isStringAscii(const char *s, size_t size) {
+static int hts_isStringAscii(const char *s, size_t size) {
size_t i;
for(i = 0 ; i < size ; i++) {
const unsigned char c = (const unsigned char) s[i];
@@ -354,7 +354,7 @@ char *hts_convertStringSystemToUTF8(const char *s, size_t size) {
#include <errno.h>
#include <iconv.h>
-char *hts_convertStringToUTF8_(const char *s, size_t size, const char *to, const char *from) {
+static char *hts_convertStringToUTF8_(const char *s, size_t size, const char *to, const char *from) {
/* Empty string ? */
if (size == 0) {
return strdup("");
@@ -454,7 +454,7 @@ char *hts_convertStringFromUTF8(const char *s, size_t size, const char *charset)
#endif
-char* hts_getCharsetFromContentType(const char *mime) {
+static char* hts_getCharsetFromContentType(const char *mime) {
/* text/html; charset=utf-8 */
const char *const charset = "charset";
char *pos = strstr(mime, charset);
diff --git a/src/htscore.c b/src/htscore.c
index be715ad..bbd0335 100644
--- a/src/htscore.c
+++ b/src/htscore.c
@@ -2862,7 +2862,7 @@ void usercommand_exe(const char* cmd,const char* file) {
static void postprocess_file(httrackp* opt,const char* save, const char* adr, const char* fil) {
- int first = 0;
+ //int first = 0;
/* MIME-html archive to build */
if (opt != NULL && opt->mimehtml) {
if (adr != NULL && strcmp(adr, "primary") == 0) {
@@ -2879,7 +2879,7 @@ static void postprocess_file(httrackp* opt,const char* save, const char* adr, co
}
if (!opt->state.mimehtml_created) {
- first = 1;
+ //first = 1;
opt->state.mimefp = fopen(fconcat(OPT_GET_BUFF(opt), StringBuff(opt->path_html),"index.mht"), "wb");
if (opt->state.mimefp != NULL) {
char BIGSTK rndtmp[1024], currtime[256];
@@ -3744,7 +3744,7 @@ int htsAddLink(htsmoduleStruct* str, char* link) {
// message copyright interne
void voidf(void) {
- char* a;
+ static const char* a;
a=""CRLF""CRLF;
a="+-----------------------------------------------+"CRLF;
a="|HyperTextTRACKer, Offline Browser Utility |"CRLF;
@@ -3764,6 +3764,7 @@ void voidf(void) {
a="|Use this program at your own risks! |"CRLF;
a="+-----------------------------------------------+"CRLF;
a=""CRLF;
+ (void) a;
}
diff --git a/src/htscoremain.c b/src/htscoremain.c
index 21939a9..0f2da28 100644
--- a/src/htscoremain.c
+++ b/src/htscoremain.c
@@ -129,7 +129,6 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp *opt) {
//char url[65536]; // URLS séparées par un espace
// the parametres
int httrack_logmode=3; // ONE log file
- int recuperer=0; // récupérer un plantage (n'arrive jamais, à supprimer)
#ifndef _WIN32
#ifndef HTS_DO_NOT_USE_UID
int switch_uid=-1,switch_gid=-1; /* setuid/setgid */
@@ -348,7 +347,7 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp *opt) {
htsmain_free();
return -1;
} else {
- int i, j;
+ int i /*, j*/;
int inQuote;
String *path;
int noDbl = 0;
@@ -359,7 +358,7 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp *opt) {
na++;
StringClear(opt->path_html);
StringClear(opt->path_log);
- for(i = 0, j = 0, inQuote = 0, path = &opt->path_html ; argv[na][i] != 0 ; i++) {
+ for(i = 0/*, j = 0*/, inQuote = 0, path = &opt->path_html ; argv[na][i] != 0 ; i++) {
if (argv[na][i] == '"') {
if (inQuote)
inQuote = 0;
@@ -367,7 +366,7 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp *opt) {
inQuote = 1;
} else if (!inQuote && !noDbl && argv[na][i] == ',') {
//StringAddchar(path, '\0');
- j = 0;
+ //j = 0;
path = &opt->path_log;
} else {
StringAddchar(*path, argv[na][i]);
@@ -720,7 +719,6 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp *opt) {
// établir mode - mode cache: 1 (cache valide) 2 (cache à vérifier)
if (fexist(fconcat(OPT_GET_BUFF(opt), StringBuff(opt->path_log),"hts-in_progress.lock"))) { // cache prioritaire
m=1;
- recuperer=1;
} else {
m=2;
}
diff --git a/src/htsfilters.c b/src/htsfilters.c
index 84591e6..68d66f5 100644
--- a/src/htsfilters.c
+++ b/src/htsfilters.c
@@ -105,7 +105,7 @@ int fa_strjoker(int type,char** filters,int nfil,char* nom,LLint* size,int* size
// * = toute lettre
// --?-- : spécifique à HTTrack et aux ?
HTS_INLINE char* strjoker(char* chaine,char* joker,LLint* size,int* size_flag) {
- int err=0;
+ //int err=0;
if (strnotempty(joker)==0) { // fin de chaine joker
if (strnotempty(chaine)==0) // fin aussi pour la chaine: ok
return chaine;
@@ -214,7 +214,8 @@ HTS_INLINE char* strjoker(char* chaine,char* joker,LLint* size,int* size_flag) {
for(j=(int) (unsigned char) joker[i];j<=(int) (unsigned char) joker[i+2];j++)
pass[j]=1;
- } else err=1;
+ }
+ // else err=1;
i+=3;
} else { // 1 car, ex: *[ ]
if (joker[i+2]=='\\' && joker[i+3] != 0) { // escaped char, such as *[\[] or *[\]]
diff --git a/src/htsftp.c b/src/htsftp.c
index 487cbea..6e1d1f0 100644
--- a/src/htsftp.c
+++ b/src/htsftp.c
@@ -844,7 +844,7 @@ T_SOC get_datasocket(char* to_send) {
if ( bind(soc,(struct sockaddr*) &server, server_size) == 0 ) {
SOCaddr server2;
- int len;
+ SOClen len;
len=sizeof(server2);
// effacer structure
memset(&server2, 0, sizeof(server2));
diff --git a/src/htshash.c b/src/htshash.c
index 840f257..f4c6ffd 100644
--- a/src/htshash.c
+++ b/src/htshash.c
@@ -63,11 +63,11 @@ Please visit our Website: http://www.httrack.com
// type: numero enregistrement - 0 est case insensitive (sav) 1 (adr+fil) 2 (former_adr+former_fil)
// recherche dans la table selon nom1,nom2 et le no d'enregistrement
// retour: position ou -1 si non trouvé
-int hash_read(const hash_struct* hash,char* nom1,char* nom2,int type,int normalized) {
+int hash_read(const hash_struct* hash,const char* nom1,const char* nom2,int type,int normalized) {
char BIGSTK normfil_[HTS_URLMAXSIZE*2];
char catbuff[CATBUFF_SIZE];
- char* normfil;
- char* normadr;
+ const char* normfil;
+ const char* normadr;
unsigned int cle;
int pos;
// calculer la clé de recherche, non modulée
@@ -203,7 +203,7 @@ int hash_read(const hash_struct* hash,char* nom1,char* nom2,int type,int normali
void hash_write(hash_struct* hash,int lpos,int normalized) {
char BIGSTK normfil_[HTS_URLMAXSIZE*2];
char catbuff[CATBUFF_SIZE];
- char* normfil;
+ const char* normfil;
unsigned int cle;
int pos;
int* ptr;
@@ -271,7 +271,7 @@ void hash_write(hash_struct* hash,int lpos,int normalized) {
// calcul clé
// il n'y a pas de formule de hashage universelle, celle-ci semble acceptable..
-unsigned long int hash_cle(char* nom1,char* nom2) {
+unsigned long int hash_cle(const char* nom1, const char* nom2) {
/*
unsigned int sum=0;
int i=0;
diff --git a/src/htshash.h b/src/htshash.h
index 75a1a5d..20399e6 100644
--- a/src/htshash.h
+++ b/src/htshash.h
@@ -50,10 +50,10 @@ typedef struct hash_struct hash_struct;
#endif
// tables de hachage
-int hash_read(const hash_struct* hash,char* nom1,char* nom2,int type,int normalized);
+int hash_read(const hash_struct* hash,const char* nom1,const char* nom2,int type,int normalized);
void hash_write(hash_struct* hash,int lpos,int normalized);
int* hash_calc_chaine(hash_struct* hash,int type,int pos);
-unsigned long int hash_cle(char* nom1,char* nom2);
+unsigned long int hash_cle(const char* nom1,const char* nom2);
#endif
#endif
diff --git a/src/htsjava.c b/src/htsjava.c
index e3af5ea..89bc74f 100644
--- a/src/htsjava.c
+++ b/src/htsjava.c
@@ -236,11 +236,11 @@ static int hts_parse_java(t_hts_callbackarg *carg, httrackp *opt,
printf("addfiles\n");
#endif
{
- unsigned int acess;
+ //unsigned int acess;
unsigned int Class;
unsigned int SClass;
int i;
- acess = readshort(fpout);
+ //acess = readshort(fpout);
Class = readshort(fpout);
SClass = readshort(fpout);
diff --git a/src/htslib.c b/src/htslib.c
index 1105900..fbb46bf 100644
--- a/src/htslib.c
+++ b/src/htslib.c
@@ -3052,7 +3052,8 @@ typedef struct {
// 0 : no
// 1 : yes
// -1: don't know
-int is_unicode_utf8(const unsigned char* buffer, size_t size) {
+int is_unicode_utf8(const char* buffer_, size_t size) {
+ const unsigned char* buffer = (const unsigned char*) buffer_;
t_auto_seq seq;
size_t i;
int is_utf = -1;
@@ -3794,8 +3795,8 @@ HTSEXT_API void escape_remove_control(char* s) {
while(*ss) {
if (*ss < 32) { /* CONTROL characters go away! */
char BIGSTK tmp[HTS_URLMAXSIZE*2];
- strcpybuff(tmp, ss+1);
- strcpybuff(ss, tmp);
+ strcpybuff(tmp, (char*) ss+1);
+ strcpybuff((char*) ss, tmp);
} else {
ss++;
}
@@ -5113,7 +5114,7 @@ HTSEXT_API int hts_init(void) {
/* MD5 Auto-test */
{
char digest[32 + 2];
- const unsigned char* atest = (const unsigned char*)"MD5 Checksum Autotest";
+ const char* atest = "MD5 Checksum Autotest";
digest[0] = '\0';
domd5mem(atest, strlen(atest), digest, 1); /* a42ec44369da07ace5ec1d660ba4a69a */
if (strcmp(digest, "a42ec44369da07ace5ec1d660ba4a69a") != 0) {
diff --git a/src/htslib.h b/src/htslib.h
index d59ee6d..be921bc 100644
--- a/src/htslib.h
+++ b/src/htslib.h
@@ -90,7 +90,7 @@ typedef struct t_dnscache t_dnscache;
#else
#define MSVC2003INLINEBUG
#endif
-MSVC2003INLINEBUG static char* getHtsOptBuff_(httrackp *opt) {
+MSVC2003INLINEBUG HTS_STATIC char* getHtsOptBuff_(httrackp *opt) {
opt->state.concat.index = ( opt->state.concat.index + 1 ) % 16;
return opt->state.concat.buff[opt->state.concat.index];
}
@@ -339,7 +339,7 @@ void rawlinput(FILE* fp,char* s,int max);
char* strstrcase(char *s,char *o);
int ident_url_absolute(const char* url,char* adr,char* fil);
void fil_simplifie(char* f);
-int is_unicode_utf8(const unsigned char* buffer, size_t size);
+int is_unicode_utf8(const char* buffer, size_t size);
void map_characters(unsigned char* buffer, unsigned int size, unsigned int* map);
int ishtml(httrackp *opt,const char* urlfil);
int ishtml_ext(const char* a);
diff --git a/src/htsmd5.c b/src/htsmd5.c
index 907734c..c26a11c 100644
--- a/src/htsmd5.c
+++ b/src/htsmd5.c
@@ -48,14 +48,13 @@ Please visit our Website: http://www.httrack.com
#include "htsmd5.h"
#include "md5.h"
-int domd5mem(const unsigned char * buf, size_t len,
- unsigned char * digest, int asAscii) {
+int domd5mem(const char * buf, size_t len, char * digest, int asAscii) {
int endian = 1;
unsigned char bindigest[16];
MD5_CTX ctx;
MD5Init(&ctx, * ( (char*) &endian));
- MD5Update(&ctx, buf, (unsigned int) len);
+ MD5Update(&ctx, (const unsigned char*) buf, (unsigned int) len);
MD5Final(bindigest, &ctx);
if (!asAscii) {
@@ -73,7 +72,10 @@ int domd5mem(const unsigned char * buf, size_t len,
}
unsigned long int md5sum32(const char* buff) {
- unsigned char md5digest[16];
- domd5mem(buff,(int)strlen(buff),md5digest,0);
- return *( (long int*)(char*)md5digest );
+ union {
+ char md5digest[16];
+ unsigned long int hash;
+ } u;
+ domd5mem(buff, strlen(buff), u.md5digest, 0);
+ return u.hash;
}
diff --git a/src/htsmd5.h b/src/htsmd5.h
index 9bd83d7..872699d 100644
--- a/src/htsmd5.h
+++ b/src/htsmd5.h
@@ -44,8 +44,7 @@ Please visit our Website: http://www.httrack.com
/* Library internal definictions */
#ifdef HTS_INTERNAL_BYTECODE
-int domd5mem(const unsigned char * buf, size_t len,
- unsigned char * digest, int asAscii);
+int domd5mem(const char * buf, size_t len, char * digest, int asAscii);
unsigned long int md5sum32(const char* buff);
#endif
diff --git a/src/htsname.c b/src/htsname.c
index e0ad2f9..06a04a0 100644
--- a/src/htsname.c
+++ b/src/htsname.c
@@ -1559,9 +1559,9 @@ void url_savename_refname(const char *adr, const char *fil, char *filename) {
unsigned char bindigest[16];
MD5_CTX ctx;
MD5Init(&ctx, 0);
- MD5Update(&ctx, adr, (unsigned int) strlen(adr));
- MD5Update(&ctx, ",", 1);
- MD5Update(&ctx, fil, (unsigned int) strlen(fil));
+ MD5Update(&ctx, (const unsigned char*) adr, strlen(adr));
+ MD5Update(&ctx, (const unsigned char*) ",", 1);
+ MD5Update(&ctx, (const unsigned char*) fil, strlen(fil));
MD5Final(bindigest, &ctx);
sprintf(filename, CACHE_REFNAME "/"
"%02x%02x%02x%02x%02x%02x%02x%02x"
diff --git a/src/htsnet.h b/src/htsnet.h
index e982f43..2243611 100644
--- a/src/htsnet.h
+++ b/src/htsnet.h
@@ -247,6 +247,9 @@ getnameinfo((struct sockaddr *)&(ss), sslen, \
#endif
+/* Socket length type */
+typedef socklen_t SOClen;
+
/* Buffer structure to copy various hostent structures */
#ifndef HTS_DEF_FWSTRUCT_t_fullhostent
#define HTS_DEF_FWSTRUCT_t_fullhostent
diff --git a/src/htsparse.c b/src/htsparse.c
index 7e1f6f2..b718655 100644
--- a/src/htsparse.c
+++ b/src/htsparse.c
@@ -88,9 +88,9 @@ Please visit our Website: http://www.httrack.com
ht_size=(A)+ht_len+REALLOC_SIZE; \
ht_buff=(char*) realloct(ht_buff,ht_size); \
if (ht_buff==NULL) { \
- printf("PANIC! : Not enough memory [%d]\n",__LINE__); \
+ printf("PANIC! : Not enough memory [%d]\n", __LINE__); \
XH_uninit; \
- abortLogFmt("not enough memory for current html document in HT_ADD_CHK : realloct(%d) failed" _ ht_size); \
+ abortLogFmt("not enough memory for current html document in HT_ADD_CHK : realloct("LLintP") failed" _ ht_size); \
abort(); \
} \
} \
@@ -143,7 +143,7 @@ Please visit our Website: http://www.httrack.com
if (ht_buff==NULL) { \
printf("PANIC! : Not enough memory [%d]\n",__LINE__); \
XH_uninit; \
- abortLogFmt("not enough memory for current html document in HT_ADD_START : malloct(%d) failed" _ (int) ht_size); \
+ abortLogFmt("not enough memory for current html document in HT_ADD_START : malloct("LLintP") failed" _ ht_size); \
abort(); \
} \
ht_buff[0]='\0'; \
@@ -329,7 +329,7 @@ Please visit our Website: http://www.httrack.com
const char * const template_body HTS_UNUSED = stre->template_body_; \
const char * const template_footer HTS_UNUSED = stre->template_footer_; \
/* */ \
- char* const makeindex_firstlink = stre->makeindex_firstlink_; \
+ HTS_UNUSED char* const makeindex_firstlink = stre->makeindex_firstlink_; \
/* */ \
/* */ \
int error = * stre->error_; \
@@ -341,8 +341,8 @@ Please visit our Website: http://www.httrack.com
int makeindex_links = *stre->makeindex_links_; \
/* */ \
LLint stat_fragment = *stre->stat_fragment_; \
- TStamp makestat_time = stre->makestat_time; \
- FILE* makestat_fp = stre->makestat_fp
+ HTS_UNUSED TStamp makestat_time = stre->makestat_time; \
+ HTS_UNUSED FILE* makestat_fp = stre->makestat_fp
#define ENGINE_SET_CONTEXT() \
ENGINE_SET_CONTEXT_BASE(); \
@@ -595,7 +595,7 @@ int htsparse(htsmoduleStruct* str, htsmoduleStructExtended* stre) {
}
// Detect UTF8 format
- //if (is_unicode_utf8((unsigned char*) r->adr, (unsigned int) r->size) == 1) {
+ //if (is_unicode_utf8(r->adr, (unsigned int) r->size) == 1) {
// no_esc_utf=1;
//} else {
// no_esc_utf=0;
@@ -1562,9 +1562,9 @@ int htsparse(htsmoduleStruct* str, htsmoduleStructExtended* stre) {
// ok chaine terminée par " ou '
if ((*a == stop) && (count<HTS_URLMAXSIZE) && (count>0)) {
char c;
- char* aend;
+ //char* aend;
//
- aend=a; // sauver début
+ //aend=a; // sauver début
a++;
while(is_taborspace(*a)) a++;
c=*a;
@@ -1717,7 +1717,7 @@ int htsparse(htsmoduleStruct* str, htsmoduleStructExtended* stre) {
if ((p>0) || (valid_p)) { // on a repéré un lien
//int lien_valide=0;
char* eadr=NULL; /* fin de l'URL */
- char* quote_adr=NULL; /* adresse du ? dans l'adresse */
+ //char* quote_adr=NULL; /* adresse du ? dans l'adresse */
int ok=1;
char quote='\0';
int quoteinscript=0;
@@ -1865,7 +1865,7 @@ int htsparse(htsmoduleStruct* str, htsmoduleStructExtended* stre) {
break;
// case '?': non!
case '\\': if (inscript) ok=0; break; // \" ou \' point d'arrêt
- case '?': quote_adr=adr; break; // noter position query
+ case '?': /*quote_adr=adr;*/ break; // noter position query
}
}
//}
@@ -4347,7 +4347,6 @@ int hts_wait_delayed(htsmoduleStruct* str,
ENGINE_LOAD_CONTEXT_BASE();
hash_struct* const hash = hashptr;
- int r_sv=0;
int in_error = 0;
LLint in_error_size = 0;
char in_error_msg[32];
@@ -4388,7 +4387,7 @@ int hts_wait_delayed(htsmoduleStruct* str,
/* Recompute filename with MIME type */
save[0] = '\0';
- r_sv=url_savename2(adr,fil,save,former_adr,former_fil,liens[ptr]->adr,liens[ptr]->fil,opt,liens,lien_tot,sback,cache,hash,ptr,numero_passe,&back,str->page_charset_);
+ url_savename2(adr,fil,save,former_adr,former_fil,liens[ptr]->adr,liens[ptr]->fil,opt,liens,lien_tot,sback,cache,hash,ptr,numero_passe,&back,str->page_charset_);
/* Recompute authorization with MIME type */
{
@@ -4456,7 +4455,7 @@ int hts_wait_delayed(htsmoduleStruct* str,
/* Recompute filename with MIME type */
save[0] = '\0';
- r_sv=url_savename2(adr,fil,save,former_adr,former_fil,liens[ptr]->adr,liens[ptr]->fil,opt,liens,lien_tot,sback,cache,hash,ptr,numero_passe,&delayed_back,str->page_charset_);
+ url_savename2(adr,fil,save,former_adr,former_fil,liens[ptr]->adr,liens[ptr]->fil,opt,liens,lien_tot,sback,cache,hash,ptr,numero_passe,&delayed_back,str->page_charset_);
/* Recompute authorization with MIME type */
{
@@ -4645,7 +4644,7 @@ int hts_wait_delayed(htsmoduleStruct* str,
/* Recompute filename for hash lookup */
save[0] = '\0';
- r_sv=url_savename2(adr,fil,save,former_adr,former_fil,liens[ptr]->adr,liens[ptr]->fil,opt,liens,lien_tot,sback,cache,hash,ptr,numero_passe,&delayed_back,str->page_charset_);
+ url_savename2(adr,fil,save,former_adr,former_fil,liens[ptr]->adr,liens[ptr]->fil,opt,liens,lien_tot,sback,cache,hash,ptr,numero_passe,&delayed_back,str->page_charset_);
} else {
if ( opt->log!=NULL ) {
HTS_LOG(opt,LOG_WARNING); fprintf(opt->log,"Unable to test %s%s (loop to same filename)"LF,adr,fil);
@@ -4664,7 +4663,7 @@ int hts_wait_delayed(htsmoduleStruct* str,
if (!continue_loop) {
/* Recompute filename with MIME type */
save[0] = '\0';
- r_sv=url_savename(adr,fil,save,former_adr,former_fil,liens[ptr]->adr,liens[ptr]->fil,opt,liens,lien_tot,sback,cache,hash,ptr,numero_passe,&delayed_back);
+ url_savename(adr,fil,save,former_adr,former_fil,liens[ptr]->adr,liens[ptr]->fil,opt,liens,lien_tot,sback,cache,hash,ptr,numero_passe,&delayed_back);
/* Recompute authorization with MIME type */
{
diff --git a/src/htsserver.c b/src/htsserver.c
index 9289af1..609fd41 100644
--- a/src/htsserver.c
+++ b/src/htsserver.c
@@ -189,7 +189,7 @@ T_SOC smallserver_init(int* port,char* adr) {
if ( (soc = (T_SOC) socket(SOCaddr_sinfamily(server), SOCK_STREAM, 0)) != INVALID_SOCKET) {
SOCaddr_initport(server, *port);
if ( bind(soc,(struct sockaddr*) &server, server_size) == 0 ) {
- /*int len;
+ /*SOClen len;
SOCaddr server2;
len=sizeof(server2);*/
// effacer structure
@@ -438,13 +438,11 @@ int smallserver(T_SOC soc,char* url,char* method,char* data, char* path) {
strcatbuff(buffer, "&");
while( s && (e = strchr(s, '=')) && (f = strchr(s, '&')) ) {
char* ua;
- int len;
String sua = STRING_EMPTY;
*e = *f = '\0';
ua = e + 1;
if (strfield2(ua, "on")) /* hack : "on" == 1 */
ua = "1";
- len = (int) strlen(ua);
unescapehttp(ua, &sua);
inthash_write(NewLangList, s, (intptr_t)StringAcquire(&sua));
s = f + 1;
diff --git a/src/htstools.c b/src/htstools.c
index 049fc3c..65e5f1f 100644
--- a/src/htstools.c
+++ b/src/htstools.c
@@ -314,11 +314,11 @@ int lienrelatif(char* s,const char* link,const char* curr_fil) {
// sauter ce qui est commun aux 2 chemins
{
- const char *l,*c;
+ const char *l;
if (*link=='/') link++; // sauter slash
if (*curr=='/') curr++;
l=link;
- c=curr;
+ //c=curr;
// couper ce qui est commun
while ((streql(*link,*curr)) && (*link!=0)) {link++; curr++; }
// mais on veut un répertoirer entier!
diff --git a/src/httrack.c b/src/httrack.c
index ef34f44..ac62ebf 100644
--- a/src/httrack.c
+++ b/src/httrack.c
@@ -100,7 +100,6 @@ static int __cdecl htsshow_savename(t_hts_callbackarg *carg, httrackp *opt, co
static int __cdecl htsshow_sendheader(t_hts_callbackarg *carg, httrackp *opt, char* buff, const char* adr, const char* fil, const char* referer_adr, const char* referer_fil, htsblk* outgoing);
static int __cdecl htsshow_receiveheader(t_hts_callbackarg *carg, httrackp *opt, char* buff, const char* adr, const char* fil, const char* referer_adr, const char* referer_fil, htsblk* incoming);
-static void vt_color(int text,int back);
static void vt_clear(void);
static void vt_home(void);
@@ -163,7 +162,6 @@ static int use_show;
static httrackp *global_opt = NULL;
static void signal_handlers(void);
-static void signal_restore_ctl_z(void);
int main(int argc, char **argv) {
int ret = 0;
@@ -687,7 +685,9 @@ static void sig_finish( int code ) { // finir et quitter
}
fprintf(stderr,"\nExit requested to engine (signal %d)\n",code);
}
+
#ifdef _WIN32
+#if 0
static void sig_ask( int code ) { // demander
char s[256];
signal(code,sig_term); // quitter si encore
@@ -704,6 +704,7 @@ static void sig_ask( int code ) { // demander
}
signal(code,sig_ask); // remettre signal
}
+#endif
#else
static void sig_doback(int blind);
static void sig_back( int code ) { // ignorer et mettre en backing
@@ -717,6 +718,7 @@ static void sig_back( int code ) { // ignorer et mettre en backing
sig_doback(0);
}
}
+#if 0
static void sig_ask( int code ) { // demander
char s[256];
signal(code,sig_term); // quitter si encore
@@ -742,6 +744,7 @@ static void sig_ask( int code ) { // demander
signal(code,sig_ask); // remettre signal
}
}
+#endif
static void sig_brpipe( int code ) { // treat if necessary
signal(code, sig_brpipe);
}
@@ -816,10 +819,4 @@ static void signal_handlers(void) {
#endif
}
-static void signal_restore_ctl_z(void) {
-#ifndef _WIN32
- signal( SIGTSTP , SIG_DFL); // ^Z
-#endif
-}
-
// fin routines de détournement de SIGHUP & co
diff --git a/src/proxy/proxytrack.c b/src/proxy/proxytrack.c
index 74013a1..6de5f40 100644
--- a/src/proxy/proxytrack.c
+++ b/src/proxy/proxytrack.c
@@ -496,7 +496,7 @@ static void proxytrack_add_DAV_Item(String *item, String *buff,
}
/* Convert a RFC822 time to time_t */
-time_t get_time_rfc822(const char* s) {
+static time_t get_time_rfc822(const char* s) {
struct tm result;
/* */
char months[]="jan feb mar apr may jun jul aug sep oct nov dec";
@@ -1239,7 +1239,7 @@ static void proxytrack_process_HTTP(PT_Indexes indexes, T_SOC soc_c) {
/* */
String ip = STRING_EMPTY;
SOCaddr serverClient;
- int lenServerClient = (int) sizeof(serverClient);
+ SOClen lenServerClient = (int) sizeof(serverClient);
memset(&serverClient, 0, sizeof(serverClient));
if (getsockname(soc_c, (struct sockaddr*) &serverClient, &lenServerClient) == 0) {
ip = getip(&serverClient, lenServerClient);
@@ -1461,7 +1461,7 @@ static int proxytrack_start_ICP(PT_Indexes indexes, T_SOC soc) {
}
while(soc != INVALID_SOCKET) {
struct sockaddr clientAddr;
- int clientAddrLen = sizeof(struct sockaddr);
+ SOClen clientAddrLen = sizeof(struct sockaddr);
int n;
memset(&clientAddr, 0, sizeof(clientAddr));
n = recvfrom(soc, (char*)buffer, bufferSize, 0, &clientAddr, &clientAddrLen);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 05:47:24 +0000