diff options
Diffstat (limited to 'WWW')
| -rw-r--r-- | WWW/Library/Implementation/HTAAProt.c | 10 | ||||
| -rw-r--r-- | WWW/Library/Implementation/HTFile.c | 6 | ||||
| -rw-r--r-- | WWW/Library/Implementation/HTRules.c | 8 | ||||
| -rw-r--r-- | WWW/Library/Implementation/HTTP.c | 17 |
4 files changed, 14 insertions, 27 deletions
diff --git a/WWW/Library/Implementation/HTAAProt.c b/WWW/Library/Implementation/HTAAProt.c index 2f0ca7ca..263b4a2c 100644 --- a/WWW/Library/Implementation/HTAAProt.c +++ b/WWW/Library/Implementation/HTAAProt.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTAAProt.c,v 1.29 2009/01/03 02:00:14 tom Exp $ + * $LynxId: HTAAProt.c,v 1.30 2009/02/01 21:19:48 tom Exp $ * * MODULE HTAAProt.c * PROTECTION FILE PARSING MODULE @@ -648,7 +648,7 @@ static void save_uid_info(const char *name, int user) * ON EXIT: * returns the user name, or an empty string if not found. */ -const char *HTAA_UidToName(int uid) +const char *HTAA_UidToName(int uid GCC_UNUSED) { #ifndef NOUSERS struct passwd *pw; @@ -682,7 +682,7 @@ const char *HTAA_UidToName(int uid) * ON EXIT: * returns the user id, or NONESUCH if not found. */ -int HTAA_NameToUid(const char *name) +int HTAA_NameToUid(const char *name GCC_UNUSED) { #ifndef NOUSERS struct passwd *pw; @@ -715,7 +715,7 @@ int HTAA_NameToUid(const char *name) * ON EXIT: * returns the group name, or an empty string if not found. */ -const char *HTAA_GidToName(int gid) +const char *HTAA_GidToName(int gid GCC_UNUSED) { #ifndef NOUSERS struct group *gr; @@ -749,7 +749,7 @@ const char *HTAA_GidToName(int gid) * ON EXIT: * returns the group id, or NONESUCH if not found. */ -int HTAA_NameToGid(const char *name) +int HTAA_NameToGid(const char *name GCC_UNUSED) { #ifndef NOUSERS struct group *gr; diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c index 53184d47..aa75bc37 100644 --- a/WWW/Library/Implementation/HTFile.c +++ b/WWW/Library/Implementation/HTFile.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTFile.c,v 1.118 2009/01/02 23:03:34 tom Exp $ + * $LynxId: HTFile.c,v 1.119 2009/02/01 21:17:39 tom Exp $ * * File Access HTFile.c * =========== @@ -252,7 +252,7 @@ static void LYListFmtParse(const char *fmtstr, #define PBIT(a, n, s) (s) ? psbits[((a) >> (n)) & 0x7] : \ pbits[((a) >> (n)) & 0x7] #endif -#ifdef S_ISVTX +#if defined(S_ISVTX) && !defined(_WINDOWS) static const char *ptbits[] = {"--T", "--t", "-wT", "-wt", "r-T", "r-t", "rwT", "rwt", 0}; @@ -1390,7 +1390,7 @@ CompressFileType HTContentToCompressType(HTParentAnchor *anchor) * 1. No code for non-unix systems. * 2. Isn't there a quicker way? */ -BOOL HTEditable(const char *filename) +BOOL HTEditable(const char *filename GCC_UNUSED) { #ifndef NO_GROUPS GETGROUPS_T groups[NGROUPS]; diff --git a/WWW/Library/Implementation/HTRules.c b/WWW/Library/Implementation/HTRules.c index d4dd6eed..3f129f16 100644 --- a/WWW/Library/Implementation/HTRules.c +++ b/WWW/Library/Implementation/HTRules.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTRules.c,v 1.37 2009/01/25 22:42:28 tom Exp $ + * $LynxId: HTRules.c,v 1.38 2009/02/01 21:19:02 tom Exp $ * * Configuration manager for Hypertext Daemon HTRules.c * ========================================== @@ -457,7 +457,7 @@ int HTSetConfiguration(char *config) const char *cond_op = NULL; const char *cond = NULL; float quality, secs, secs_per_byte; - off_t maxbytes; + long maxbytes; int status; StrAllocCopy(line, config); @@ -510,7 +510,7 @@ int HTSetConfiguration(char *config) status = 2; if (LYscanFloat2(&temp, &secs_per_byte)) { status = 3; - if (sscanf(temp, "%" SCN_off_t, &maxbytes)) { + if (sscanf(temp, "%ld", &maxbytes)) { status = 4; } } @@ -522,7 +522,7 @@ int HTSetConfiguration(char *config) status >= 1 ? quality : 1.0, status >= 2 ? secs : 0.0, status >= 3 ? secs_per_byte : 0.0, - status >= 4 ? (long) maxbytes : 0, + status >= 4 ? maxbytes : 0, mediaCFG); } else if (0 == strncasecomp(word1, "htbin", 5) || diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c index c13d686d..d1be845d 100644 --- a/WWW/Library/Implementation/HTTP.c +++ b/WWW/Library/Implementation/HTTP.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTTP.c,v 1.104 2009/01/03 01:41:51 tom Exp $ + * $LynxId: HTTP.c,v 1.105 2009/02/01 21:22:22 tom Exp $ * * HyperText Tranfer Protocol - Client implementation HTTP.c * ========================== @@ -42,6 +42,7 @@ #include <LYGlobalDefs.h> #include <GridText.h> #include <LYStrings.h> +#include <LYUtils.h> #include <LYrcFile.h> #include <LYLeaks.h> @@ -218,19 +219,6 @@ static int ws_errno = 0; static DWORD g_total_times = 0; static DWORD g_total_bytes = 0; -char *str_speed(void) -{ - static char buff[32]; - - if (ws_read_per_sec > 1000) - sprintf(buff, "%d.%03dkB", ws_read_per_sec / 1000, - (ws_read_per_sec % 1000)); - else - sprintf(buff, "%3d", ws_read_per_sec); - - return buff; -} - /* The same like read, but takes care of EINTR and uses select to timeout the stale connections. */ @@ -297,7 +285,6 @@ int ws_netread(int fd, char *buf, int len) static recv_data_t para; - extern int win32_check_interrupt(void); /* LYUtil.c */ extern int lynx_timeout; /* LYMain.c */ extern CRITICAL_SECTION critSec_READ; /* LYMain.c */ |