lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

Got an OSF/1 bug report fixing related problems:

Browse Source 
- xmlversion.h.in nanoftp.c nanohttp.c: traying to work out the
  problem of socklen_t being undefined on a number of platforms
- debugXML.c: fixed a compilation problem when without snprintf
Daniel
This commit is contained in:
Daniel Veillard
2000-09-24 08:12:14 +00:00
parent 8ddb5a7aef
commit 281f8ff431
6 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sun Sep 24 10:00:49 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
* xmlversion.h.in nanoftp.c nanohttp.c: traying to work out the
problem of socklen_t being undefined on a number of platforms
* debugXML.c: fixed a compilation problem when without snprintf
Sat Sep 23 12:19:45 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org> Sat Sep 23 12:19:45 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
* HTMLparser.c uri.c: Another patch from Wayne Davison, correcting * HTMLparser.c uri.c: Another patch from Wayne Davison, correcting

2
debugXML.c
View File

@ -1596,7 +1596,7 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input,
#ifdef HAVE_SNPRINTF #ifdef HAVE_SNPRINTF
snprintf(prompt, sizeof(prompt), "%s > ", ctxt->node->name); snprintf(prompt, sizeof(prompt), "%s > ", ctxt->node->name);
#else #else
sprintf(buf, "%s > ", ctxt->node->name); sprintf(prompt, "%s > ", ctxt->node->name);
#endif #endif
else else
sprintf(prompt, "? > "); sprintf(prompt, "? > ");

10
include/libxml/xmlversion.h.in
View File

@ -22,6 +22,16 @@ extern void xmlCheckVersion(int version);
#define LIBXML_VERSION_STRING "@LIBXML_VERSION_NUMBER@" #define LIBXML_VERSION_STRING "@LIBXML_VERSION_NUMBER@"
#define LIBXML_TEST_VERSION xmlCheckVersion(@LIBXML_VERSION_NUMBER@); #define LIBXML_TEST_VERSION xmlCheckVersion(@LIBXML_VERSION_NUMBER@);
/*
* a few extra config stuff which may not be handled easily in configure
*/
#ifndef HAVE_SOCKLEN_T
#if defined(__osf__) || defined(__Linux__)
#define HAVE_SOCKLEN_T
#endif
#endif
/* /*
* Whether the FTP support is configured in * Whether the FTP support is configured in
*/ */

6
nanoftp.c
View File

@ -1244,7 +1244,11 @@ xmlNanoFTPGetConnection(void *ctx) {
unsigned char ad[6], *adp, *portp; unsigned char ad[6], *adp, *portp;
unsigned int temp[6]; unsigned int temp[6];
struct sockaddr_in dataAddr; struct sockaddr_in dataAddr;
size_t dataAddrLen; #ifdef HAVE_SOCKLEN_T
socklen_t dataAddrLen;
#else
unsigned int dataAddrLen;
#endif
ctxt->dataFd = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); ctxt->dataFd = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (ctxt->dataFd < 0) { if (ctxt->dataFd < 0) {

6
nanohttp.c
View File

@ -644,7 +644,11 @@ xmlNanoHTTPConnectAttempt(struct in_addr ia, int port)
} }
if ( FD_ISSET(s, &wfd) ) { if ( FD_ISSET(s, &wfd) ) {
unsigned int len; /* was socklen_t barfed on some systems :-( */ #ifdef HAVE_SOCKLEN_T
socklen_t len;
#else
unsigned int len;
#endif
len = sizeof(status); len = sizeof(status);
if (getsockopt(s, SOL_SOCKET, SO_ERROR, &status, &len) < 0 ) { if (getsockopt(s, SOL_SOCKET, SO_ERROR, &status, &len) < 0 ) {
/* Solaris error code */ /* Solaris error code */

10
xmlversion.h.in
View File

@ -22,6 +22,16 @@ extern void xmlCheckVersion(int version);
#define LIBXML_VERSION_STRING "@LIBXML_VERSION_NUMBER@" #define LIBXML_VERSION_STRING "@LIBXML_VERSION_NUMBER@"
#define LIBXML_TEST_VERSION xmlCheckVersion(@LIBXML_VERSION_NUMBER@); #define LIBXML_TEST_VERSION xmlCheckVersion(@LIBXML_VERSION_NUMBER@);
/*
* a few extra config stuff which may not be handled easily in configure
*/
#ifndef HAVE_SOCKLEN_T
#if defined(__osf__) || defined(__Linux__)
#define HAVE_SOCKLEN_T
#endif
#endif
/* /*
* Whether the FTP support is configured in * Whether the FTP support is configured in
*/ */