version 1.48, 2010/02/02 22:49:34 |
version 1.50, 2010/08/31 09:58:37 |
|
|
|
|
if (buffer_get_ret(buffer, (char *) buf, 4) == -1) |
if (buffer_get_ret(buffer, (char *) buf, 4) == -1) |
return (-1); |
return (-1); |
*ret = get_u32(buf); |
if (ret != NULL) |
|
*ret = get_u32(buf); |
return (0); |
return (0); |
} |
} |
|
|
|
|
|
|
if (buffer_get_ret(buffer, (char *) buf, 8) == -1) |
if (buffer_get_ret(buffer, (char *) buf, 8) == -1) |
return (-1); |
return (-1); |
*ret = get_u64(buf); |
if (ret != NULL) |
|
*ret = get_u64(buf); |
return (0); |
return (0); |
} |
} |
|
|
|
|
if ((ret = buffer_get_string_ret(buffer, length_ptr)) == NULL) |
if ((ret = buffer_get_string_ret(buffer, length_ptr)) == NULL) |
fatal("buffer_get_string: buffer error"); |
fatal("buffer_get_string: buffer error"); |
return (ret); |
return (ret); |
|
} |
|
|
|
char * |
|
buffer_get_cstring_ret(Buffer *buffer, u_int *length_ptr) |
|
{ |
|
u_int length; |
|
char *cp, *ret = buffer_get_string_ret(buffer, &length); |
|
|
|
if (ret == NULL) |
|
return NULL; |
|
if ((cp = memchr(ret, '\0', length)) != NULL) { |
|
/* XXX allow \0 at end-of-string for a while, remove later */ |
|
if (cp == ret + length - 1) |
|
error("buffer_get_cstring_ret: string contains \\0"); |
|
else { |
|
bzero(ret, length); |
|
xfree(ret); |
|
return NULL; |
|
} |
|
} |
|
if (length_ptr != NULL) |
|
*length_ptr = length; |
|
return ret; |
|
} |
|
|
|
char * |
|
buffer_get_cstring(Buffer *buffer, u_int *length_ptr) |
|
{ |
|
char *ret; |
|
|
|
if ((ret = buffer_get_cstring_ret(buffer, length_ptr)) == NULL) |
|
fatal("buffer_get_cstring: buffer error"); |
|
return ret; |
} |
} |
|
|
void * |
void * |