Mercurial > hg > octave-lojdl > gnulib-hg
changeset 7666:337f51b0a896
Revert Jim's 2006-10-23 patch.
| author | Simon Josefsson <simon@josefsson.org> |
|---|---|
| date | Fri, 17 Nov 2006 13:47:43 +0000 |
| parents | cba4ea357bca |
| children | ba4b073eae89 |
| files | ChangeLog lib/getaddrinfo.c modules/getaddrinfo |
| diffstat | 3 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-11-16 Paul Eggert <eggert@cs.ucla.edu> + + * modules/getaddinfo (Depends-on): Remove inttostr; add snprintf. + * lib/getaddrinfo.c: Include snprintf.h rather than intprops.h + and inttostr.h. Use snprintf rather than uinttostr, so that + LGPLed code doesn't depend on GPLed. + 2006-11-17 Paul Eggert <eggert@cs.ucla.edu> * modules/inline (License): Change from GPL to LGPL.
--- a/lib/getaddrinfo.c +++ b/lib/getaddrinfo.c @@ -38,8 +38,7 @@ #define N_(String) String #include "inet_ntop.h" -#include "intprops.h" -#include "inttostr.h" +#include "snprintf.h" #include "strdup.h" /* BeOS has AF_INET, but not PF_INET. */ @@ -408,11 +407,8 @@ { unsigned short int port = ntohs (((const struct sockaddr_in *) sa)->sin_port); - char buf[INT_BUFSIZE_BOUND (port)]; - char const *s = uinttostr (port, buf); - if (strlen (s) + 1 > servicelen) + if (servicelen <= snprintf (service, servicelen, "%u", port)) return EAI_OVERFLOW; - memcpy (service, s, strlen (s) + 1); } break; }