diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2004-01-25 02:09:48 -0500 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2004-01-25 02:09:48 -0500 |
| commit | a667eb0b51f7cb224924921194b4dfadfded3095 (patch) | |
| tree | e3c6800a040d21880b2cb54db6a97f76049dc487 /WWW/Library/Implementation | |
| parent | 264781cf73284efb1e6eb24c3c71d46ce36685aa (diff) | |
| download | lynx-snapshots-a667eb0b51f7cb224924921194b4dfadfded3095.tar.gz | |
snapshot of project "lynx", label v2-8-5pre_3
Diffstat (limited to 'WWW/Library/Implementation')
| -rw-r--r-- | WWW/Library/Implementation/HTTCP.c | 8 | ||||
| -rw-r--r-- | WWW/Library/Implementation/UCMap.h | 4 | ||||
| -rw-r--r-- | WWW/Library/Implementation/makefile.in | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c index 6591f3cb..658d2040 100644 --- a/WWW/Library/Implementation/HTTCP.c +++ b/WWW/Library/Implementation/HTTCP.c @@ -1524,7 +1524,7 @@ PUBLIC int HTDoConnect ARGS4( char *at_sign = NULL; char *host = NULL; #ifdef INET6 - struct addrinfo *res, *res0; + struct addrinfo *res = 0, *res0 = 0; #else struct sockaddr_in soc_address; struct sockaddr_in *soc_in = &soc_address; @@ -1703,7 +1703,8 @@ PUBLIC int HTDoConnect ARGS4( HTAlert(gettext("Connection failed (too many retries).")); #ifdef INET6 FREE(line); - freeaddrinfo(res0); + if (res0) + freeaddrinfo(res0); #endif /* INET6 */ return HT_NO_DATA; } @@ -1900,7 +1901,8 @@ PUBLIC int HTDoConnect ARGS4( #ifdef INET6 FREE(line); - freeaddrinfo(res0); + if (res0) + freeaddrinfo(res0); #endif /* INET6 */ return status; } diff --git a/WWW/Library/Implementation/UCMap.h b/WWW/Library/Implementation/UCMap.h index 5472ad41..5c096141 100644 --- a/WWW/Library/Implementation/UCMap.h +++ b/WWW/Library/Implementation/UCMap.h @@ -41,6 +41,10 @@ extern int UCGetLYhndl_byMIME PARAMS(( extern int safeUCGetLYhndl_byMIME PARAMS(( CONST char * p)); /* returns LATIN1 if name not recognized */ +#ifdef EXP_LOCALE_CHARSET +extern void LYFindLocaleCharset NOPARAMS; +#endif + extern int UCLYhndl_for_unspec; extern int UCLYhndl_for_unrec; extern int UCLYhndl_HTFile_for_unspec; diff --git a/WWW/Library/Implementation/makefile.in b/WWW/Library/Implementation/makefile.in index c6af29c1..e3d47eab 100644 --- a/WWW/Library/Implementation/makefile.in +++ b/WWW/Library/Implementation/makefile.in @@ -167,7 +167,7 @@ depend : # On SGI, ranlib is unnecessary and does not exist so we ignore errors # for that step $(LOB)/libwww.a : $(COMMON) - ar r $(LOB)/libwww.a $(COMMON) + @AR@ @AR_OPTS@ $(LOB)/libwww.a $(COMMON) -$(RANLIB) $(LOB)/libwww.a # Clean up everything generatable except final products |