projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Improved on the error messages in the parser.
[awesomized/libmemcached]
/
libmemcached
/
sasl.c
diff --git
a/libmemcached/sasl.c
b/libmemcached/sasl.c
index bdec4272546a0e10423790d29735bee0102a5ec6..0dedb52db45fb3cc8e593ad602d927ccd44d18b3 100644
(file)
--- a/
libmemcached/sasl.c
+++ b/
libmemcached/sasl.c
@@
-30,7
+30,7
@@
const sasl_callback_t *memcached_get_sasl_callbacks(memcached_st *ptr)
* @param raddr remote address (out)
* @return true on success false otherwise (errno contains more info)
*/
* @param raddr remote address (out)
* @return true on success false otherwise (errno contains more info)
*/
-static bool resolve_names(int fd, char *laddr,
char *raddr
)
+static bool resolve_names(int fd, char *laddr,
size_t laddr_length, char *raddr, size_t raddr_length
)
{
char host[NI_MAXHOST];
char port[NI_MAXSERV];
{
char host[NI_MAXHOST];
char port[NI_MAXSERV];
@@
-44,7
+44,7
@@
static bool resolve_names(int fd, char *laddr, char *raddr)
return false;
}
return false;
}
- (void)s
printf(laddr
, "%s;%s", host, port);
+ (void)s
nprintf(laddr, laddr_length
, "%s;%s", host, port);
salen= sizeof(saddr);
if ((getpeername(fd, (struct sockaddr *)&saddr, &salen) < 0) ||
salen= sizeof(saddr);
if ((getpeername(fd, (struct sockaddr *)&saddr, &salen) < 0) ||
@@
-54,7
+54,7
@@
static bool resolve_names(int fd, char *laddr, char *raddr)
return false;
}
return false;
}
- (void)s
printf(raddr
, "%s;%s", host, port);
+ (void)s
nprintf(raddr, raddr_length
, "%s;%s", host, port);
return true;
}
return true;
}
@@
-108,7
+108,7
@@
memcached_return_t memcached_sasl_authenticate_connection(memcached_server_st *s
char laddr[NI_MAXHOST + NI_MAXSERV];
char raddr[NI_MAXHOST + NI_MAXSERV];
char laddr[NI_MAXHOST + NI_MAXSERV];
char raddr[NI_MAXHOST + NI_MAXSERV];
- unlikely (!resolve_names(server->fd, laddr,
raddr
))
+ unlikely (!resolve_names(server->fd, laddr,
sizeof(laddr), raddr, sizeof(raddr)
))
{
server->cached_errno= errno;
return MEMCACHED_ERRNO;
{
server->cached_errno= errno;
return MEMCACHED_ERRNO;
@@
-141,7
+141,7
@@
memcached_return_t memcached_sasl_authenticate_connection(memcached_server_st *s
do {
/* send the packet */
do {
/* send the packet */
- struct
__write
_vector_st vector[]=
+ struct
libmemcached_io
_vector_st vector[]=
{
{ .length= sizeof(request.bytes), .buffer= request.bytes },
{ .length= keylen, .buffer= chosenmech },
{
{ .length= sizeof(request.bytes), .buffer= request.bytes },
{ .length= keylen, .buffer= chosenmech },