diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 6 | ||||
-rw-r--r-- | src/Makefile.in | 48 | ||||
-rw-r--r-- | src/coucal.c (renamed from src/htsinthash.c) | 0 | ||||
-rw-r--r-- | src/coucal.h (renamed from src/htsinthash.h) | 0 | ||||
-rw-r--r-- | src/htscore.h | 2 | ||||
-rw-r--r-- | src/htshash.c | 2 | ||||
-rw-r--r-- | src/htsindex.c | 2 | ||||
-rw-r--r-- | src/htsserver.c | 2 | ||||
-rw-r--r-- | src/htsweb.c | 2 | ||||
-rw-r--r-- | src/htswrap.c | 2 | ||||
-rw-r--r-- | src/htswrap.h | 2 |
11 files changed, 34 insertions, 34 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f242109..476d137 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,14 +37,14 @@ lib_LTLIBRARIES = libhttrack.la libhtsjava.la htsserver_SOURCES = htsserver.c htsserver.h htsweb.c htsweb.h proxytrack_SOURCES = proxy/main.c \ proxy/proxytrack.c proxy/store.c \ - htsinthash.c htsmd5.c md5.c \ + coucal.c htsmd5.c md5.c \ minizip/ioapi.c minizip/mztools.c minizip/unzip.c minizip/zip.c whttrackrundir = $(bindir) whttrackrun_SCRIPTS = webhttrack libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \ - htscatchurl.c htsfilters.c htsftp.c htshash.c htsinthash.c \ + htscatchurl.c htsfilters.c htsftp.c htshash.c coucal.c \ htshelp.c htslib.c htscoremain.c \ htsname.c htsrobots.c htstools.c htswizard.c \ htsalias.c htsthread.c htsindex.c htsbauth.c \ @@ -55,7 +55,7 @@ libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \ hts-indextmpl.h htsalias.h htsback.h htsbase.h htssafe.h \ htsbasenet.h htsbauth.h htscache.h htscatchurl.h \ htsconfig.h htscore.h htsparse.h htscoremain.h htsdefines.h \ - htsfilters.h htsftp.h htsglobal.h htshash.h htsinthash.h \ + htsfilters.h htsftp.h htsglobal.h htshash.h coucal.h \ htshelp.h htsindex.h htslib.h htsmd5.h \ htsmodules.h htsname.h htsnet.h \ htsopt.h htsrobots.h htsthread.h \ diff --git a/src/Makefile.in b/src/Makefile.in index 74188ab..8f1860b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -115,7 +115,7 @@ am_libhttrack_la_OBJECTS = libhttrack_la-htscore.lo \ libhttrack_la-htsparse.lo libhttrack_la-htsback.lo \ libhttrack_la-htscache.lo libhttrack_la-htscatchurl.lo \ libhttrack_la-htsfilters.lo libhttrack_la-htsftp.lo \ - libhttrack_la-htshash.lo libhttrack_la-htsinthash.lo \ + libhttrack_la-htshash.lo libhttrack_la-coucal.lo \ libhttrack_la-htshelp.lo libhttrack_la-htslib.lo \ libhttrack_la-htscoremain.lo libhttrack_la-htsname.lo \ libhttrack_la-htsrobots.lo libhttrack_la-htstools.lo \ @@ -143,9 +143,9 @@ httrack_OBJECTS = httrack.$(OBJEXT) httrack_DEPENDENCIES = $(am__DEPENDENCIES_1) libhttrack.la am_proxytrack_OBJECTS = proxy/proxytrack-main.$(OBJEXT) \ proxy/proxytrack-proxytrack.$(OBJEXT) \ - proxy/proxytrack-store.$(OBJEXT) \ - proxytrack-htsinthash.$(OBJEXT) proxytrack-htsmd5.$(OBJEXT) \ - proxytrack-md5.$(OBJEXT) minizip/proxytrack-ioapi.$(OBJEXT) \ + proxy/proxytrack-store.$(OBJEXT) proxytrack-coucal.$(OBJEXT) \ + proxytrack-htsmd5.$(OBJEXT) proxytrack-md5.$(OBJEXT) \ + minizip/proxytrack-ioapi.$(OBJEXT) \ minizip/proxytrack-mztools.$(OBJEXT) \ minizip/proxytrack-unzip.$(OBJEXT) \ minizip/proxytrack-zip.$(OBJEXT) @@ -348,13 +348,13 @@ lib_LTLIBRARIES = libhttrack.la libhtsjava.la htsserver_SOURCES = htsserver.c htsserver.h htsweb.c htsweb.h proxytrack_SOURCES = proxy/main.c \ proxy/proxytrack.c proxy/store.c \ - htsinthash.c htsmd5.c md5.c \ + coucal.c htsmd5.c md5.c \ minizip/ioapi.c minizip/mztools.c minizip/unzip.c minizip/zip.c whttrackrundir = $(bindir) whttrackrun_SCRIPTS = webhttrack libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \ - htscatchurl.c htsfilters.c htsftp.c htshash.c htsinthash.c \ + htscatchurl.c htsfilters.c htsftp.c htshash.c coucal.c \ htshelp.c htslib.c htscoremain.c \ htsname.c htsrobots.c htstools.c htswizard.c \ htsalias.c htsthread.c htsindex.c htsbauth.c \ @@ -365,7 +365,7 @@ libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \ hts-indextmpl.h htsalias.h htsback.h htsbase.h htssafe.h \ htsbasenet.h htsbauth.h htscache.h htscatchurl.h \ htsconfig.h htscore.h htsparse.h htscoremain.h htsdefines.h \ - htsfilters.h htsftp.h htsglobal.h htshash.h htsinthash.h \ + htsfilters.h htsftp.h htsglobal.h htshash.h coucal.h \ htshelp.h htsindex.h htslib.h htsmd5.h \ htsmodules.h htsname.h htsnet.h \ htsopt.h htsrobots.h htsthread.h \ @@ -625,6 +625,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htsserver.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htsweb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httrack.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-coucal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsalias.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsback.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsbauth.Plo@am__quote@ @@ -640,7 +641,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htshash.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htshelp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsindex.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsinthash.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htslib.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsmd5.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htsmodules.Plo@am__quote@ @@ -654,7 +654,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htszlib.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-md5.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-punycode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-htsinthash.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-coucal.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-htsmd5.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-md5.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-ioapi.Plo@am__quote@ @@ -749,12 +749,12 @@ libhttrack_la-htshash.lo: htshash.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -c -o libhttrack_la-htshash.lo `test -f 'htshash.c' || echo '$(srcdir)/'`htshash.c -libhttrack_la-htsinthash.lo: htsinthash.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -MT libhttrack_la-htsinthash.lo -MD -MP -MF $(DEPDIR)/libhttrack_la-htsinthash.Tpo -c -o libhttrack_la-htsinthash.lo `test -f 'htsinthash.c' || echo '$(srcdir)/'`htsinthash.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libhttrack_la-htsinthash.Tpo $(DEPDIR)/libhttrack_la-htsinthash.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='htsinthash.c' object='libhttrack_la-htsinthash.lo' libtool=yes @AMDEPBACKSLASH@ +libhttrack_la-coucal.lo: coucal.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -MT libhttrack_la-coucal.lo -MD -MP -MF $(DEPDIR)/libhttrack_la-coucal.Tpo -c -o libhttrack_la-coucal.lo `test -f 'coucal.c' || echo '$(srcdir)/'`coucal.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libhttrack_la-coucal.Tpo $(DEPDIR)/libhttrack_la-coucal.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coucal.c' object='libhttrack_la-coucal.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -c -o libhttrack_la-htsinthash.lo `test -f 'htsinthash.c' || echo '$(srcdir)/'`htsinthash.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -c -o libhttrack_la-coucal.lo `test -f 'coucal.c' || echo '$(srcdir)/'`coucal.c libhttrack_la-htshelp.lo: htshelp.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -MT libhttrack_la-htshelp.lo -MD -MP -MF $(DEPDIR)/libhttrack_la-htshelp.Tpo -c -o libhttrack_la-htshelp.lo `test -f 'htshelp.c' || echo '$(srcdir)/'`htshelp.c @@ -966,19 +966,19 @@ proxy/proxytrack-store.obj: proxy/store.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxy/proxytrack-store.obj `if test -f 'proxy/store.c'; then $(CYGPATH_W) 'proxy/store.c'; else $(CYGPATH_W) '$(srcdir)/proxy/store.c'; fi` -proxytrack-htsinthash.o: htsinthash.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-htsinthash.o -MD -MP -MF $(DEPDIR)/proxytrack-htsinthash.Tpo -c -o proxytrack-htsinthash.o `test -f 'htsinthash.c' || echo '$(srcdir)/'`htsinthash.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-htsinthash.Tpo $(DEPDIR)/proxytrack-htsinthash.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='htsinthash.c' object='proxytrack-htsinthash.o' libtool=no @AMDEPBACKSLASH@ +proxytrack-coucal.o: coucal.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-coucal.o -MD -MP -MF $(DEPDIR)/proxytrack-coucal.Tpo -c -o proxytrack-coucal.o `test -f 'coucal.c' || echo '$(srcdir)/'`coucal.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-coucal.Tpo $(DEPDIR)/proxytrack-coucal.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coucal.c' object='proxytrack-coucal.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-htsinthash.o `test -f 'htsinthash.c' || echo '$(srcdir)/'`htsinthash.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-coucal.o `test -f 'coucal.c' || echo '$(srcdir)/'`coucal.c -proxytrack-htsinthash.obj: htsinthash.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-htsinthash.obj -MD -MP -MF $(DEPDIR)/proxytrack-htsinthash.Tpo -c -o proxytrack-htsinthash.obj `if test -f 'htsinthash.c'; then $(CYGPATH_W) 'htsinthash.c'; else $(CYGPATH_W) '$(srcdir)/htsinthash.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-htsinthash.Tpo $(DEPDIR)/proxytrack-htsinthash.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='htsinthash.c' object='proxytrack-htsinthash.obj' libtool=no @AMDEPBACKSLASH@ +proxytrack-coucal.obj: coucal.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-coucal.obj -MD -MP -MF $(DEPDIR)/proxytrack-coucal.Tpo -c -o proxytrack-coucal.obj `if test -f 'coucal.c'; then $(CYGPATH_W) 'coucal.c'; else $(CYGPATH_W) '$(srcdir)/coucal.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-coucal.Tpo $(DEPDIR)/proxytrack-coucal.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coucal.c' object='proxytrack-coucal.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-htsinthash.obj `if test -f 'htsinthash.c'; then $(CYGPATH_W) 'htsinthash.c'; else $(CYGPATH_W) '$(srcdir)/htsinthash.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-coucal.obj `if test -f 'coucal.c'; then $(CYGPATH_W) 'coucal.c'; else $(CYGPATH_W) '$(srcdir)/coucal.c'; fi` proxytrack-htsmd5.o: htsmd5.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-htsmd5.o -MD -MP -MF $(DEPDIR)/proxytrack-htsmd5.Tpo -c -o proxytrack-htsmd5.o `test -f 'htsmd5.c' || echo '$(srcdir)/'`htsmd5.c diff --git a/src/htsinthash.c b/src/coucal.c index 593bf94..593bf94 100644 --- a/src/htsinthash.c +++ b/src/coucal.c diff --git a/src/htsinthash.h b/src/coucal.h index fb62767..fb62767 100644 --- a/src/htsinthash.h +++ b/src/coucal.h diff --git a/src/htscore.h b/src/htscore.h index c3572cb..7f96039 100644 --- a/src/htscore.h +++ b/src/htscore.h @@ -123,7 +123,7 @@ typedef struct filecreate_params filecreate_params; // gestion hashage #include "htshash.h" -#include "htsinthash.h" +#include "coucal.h" #include "htsdefines.h" diff --git a/src/htshash.c b/src/htshash.c index 9cf4b66..5bdeb3e 100644 --- a/src/htshash.c +++ b/src/htshash.c @@ -42,7 +42,7 @@ Please visit our Website: http://www.httrack.com #include "htsglobal.h" #include "htsmd5.h" #include "htscore.h" -#include "htsinthash.h" +#include "coucal.h" /* END specific definitions */ /* Specific macros */ diff --git a/src/htsindex.c b/src/htsindex.c index 3c4c9da..8414d4b 100644 --- a/src/htsindex.c +++ b/src/htsindex.c @@ -40,7 +40,7 @@ Please visit our Website: http://www.httrack.com #if HTS_MAKE_KEYWORD_INDEX #include "htshash.h" -#include "htsinthash.h" +#include "coucal.h" /* Keyword Indexer Parameters */ diff --git a/src/htsserver.c b/src/htsserver.c index 401f131..e9f426c 100644 --- a/src/htsserver.c +++ b/src/htsserver.c @@ -67,7 +67,7 @@ Please visit our Website: http://www.httrack.com /* Bypass internal definition protection */ #define HTS_INTERNAL_BYTECODE -#include "htsinthash.h" +#include "coucal.h" #undef HTS_INTERNAL_BYTECODE int NewLangStrSz = 1024; diff --git a/src/htsweb.c b/src/htsweb.c index 6e3f4a5..c695f3a 100644 --- a/src/htsweb.c +++ b/src/htsweb.c @@ -58,7 +58,7 @@ Please visit our Website: http://www.httrack.com #include "htsthread.h" /* External modules */ -#include "htsinthash.c" +#include "coucal.c" #include "htsmd5.c" #include "md5.c" diff --git a/src/htswrap.c b/src/htswrap.c index 345f84a..7683034 100644 --- a/src/htswrap.c +++ b/src/htswrap.c @@ -36,7 +36,7 @@ Please visit our Website: http://www.httrack.com #include "htswrap.h" #include "htshash.h" -#include "htsinthash.h" +#include "coucal.h" #include "htslib.h" HTSEXT_API int htswrap_init(void) { // LEGACY diff --git a/src/htswrap.h b/src/htswrap.h index eb010d3..443abda 100644 --- a/src/htswrap.h +++ b/src/htswrap.h @@ -38,7 +38,7 @@ Please visit our Website: http://www.httrack.com #ifdef HTS_INTERNAL_BYTECODE #include "htsglobal.h" -#include "htsinthash.h" +#include "coucal.h" /* Forward definitions */ #ifndef HTS_DEF_FWSTRUCT_httrackp |