diff options
| author | Xavier Roche <xroche@users.noreply.github.com> | 2014-05-02 17:44:51 +0000 |
|---|---|---|
| committer | Xavier Roche <xroche@users.noreply.github.com> | 2014-05-02 17:44:51 +0000 |
| commit | c7edfe0f5f34fca20bfc13fbcd5c64d4d4951108 (patch) | |
| tree | 1a80d0a084d860f9f9f0c6b7b385a7f581b58e2a | |
| parent | 381eebc05697ce57b4c2941a879bcdde792e1a06 (diff) | |
Fixes.
| -rw-r--r-- | src/htsback.c | 2 | ||||
| -rw-r--r-- | src/htscoremain.c | 2 | ||||
| -rw-r--r-- | src/htstools.c | 2 | ||||
| -rw-r--r-- | src/htswrap.h | 4 | ||||
| -rw-r--r-- | src/httrack-library.h | 3 |
5 files changed, 7 insertions, 6 deletions
diff --git a/src/htsback.c b/src/htsback.c index 2eab7d9..a7234d2 100644 --- a/src/htsback.c +++ b/src/htsback.c @@ -989,7 +989,7 @@ int back_serialize_ref(httrackp * opt, const lien_back * src) { == 0) #else if (mkdir - (fconcat(OPT_GET_BUFF(opt), StringBuff(opt->path_log), CACHE_REFNAME), + (fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), CACHE_REFNAME), S_IRWXU | S_IRWXG | S_IRWXO) == 0) #endif { diff --git a/src/htscoremain.c b/src/htscoremain.c index 38a4112..82af9e0 100644 --- a/src/htscoremain.c +++ b/src/htscoremain.c @@ -2994,7 +2994,7 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp * opt) { (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-cache")); #else mkdir(fconcat - (OPT_GET_BUFF(opt), StringBuff(opt->path_log), "hts-cache"), + (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-cache"), HTS_PROTECT_FOLDER); #endif fp = diff --git a/src/htstools.c b/src/htstools.c index c176d26..78fb827 100644 --- a/src/htstools.c +++ b/src/htstools.c @@ -1110,7 +1110,7 @@ HTSEXT_API int hts_findnext(find_handle find) { if ((find->dirp = readdir(find->hdir))) if (find->dirp->d_name) if (!STAT - (concat(catbuff, find->path, find->dirp->d_name), &find->filestat)) + (concat(catbuff, sizeof(catbuff), find->path, find->dirp->d_name), &find->filestat)) return 1; #endif } diff --git a/src/htswrap.h b/src/htswrap.h index d6dfe92..e87ddf6 100644 --- a/src/htswrap.h +++ b/src/htswrap.h @@ -49,8 +49,8 @@ typedef struct httrackp httrackp; HTSEXT_API int htswrap_init(void); // LEGACY HTSEXT_API int htswrap_free(void); // LEGACY -HTSEXT_API int htswrap_add(httrackp * opt, const char *name, void *fct); -HTSEXT_API uintptr_t htswrap_read(httrackp * opt, const char *name); +//HTSEXT_API int htswrap_add(httrackp * opt, const char *name, void *fct); +//HTSEXT_API uintptr_t htswrap_read(httrackp * opt, const char *name); #endif diff --git a/src/httrack-library.h b/src/httrack-library.h index c32a84f..66a7974 100644 --- a/src/httrack-library.h +++ b/src/httrack-library.h @@ -34,6 +34,7 @@ Please visit our Website: http://www.httrack.com #define HTTRACK_DEFLIB #include "htsglobal.h" +#include <inttypes.h> #ifndef HTS_DEF_FWSTRUCT_httrackp #define HTS_DEF_FWSTRUCT_httrackp @@ -300,7 +301,7 @@ typedef struct utimbuf STRUCT_UTIMBUF; /** Macro aimed to break at build-time if a size is not a sizeof() strictly * greater than sizeof(char*). **/ #undef COMPILE_TIME_CHECK_SIZE -#define COMPILE_TIME_CHECK_SIZE(A) ((void (*)(char[A - sizeof(char*) - 1])) NULL) +#define COMPILE_TIME_CHECK_SIZE(A) (void) ((void (*)(char[A - sizeof(char*) - 1])) NULL) /** Macro aimed to break at compile-time if a size is not a sizeof() strictly * greater than sizeof(char*). **/ |