Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gcc 4 compilation fixes. Patch by Jerome Duval. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20543 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Hugo Santos 2007-04-03 18:50:27 +00:00
parent 52e75b6236
commit ecde9adfaf
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/bin/strace/NetworkTypes.cpp
View File

@ -91,7 +91,7 @@ read_fdset(Context &context, void *data)
template<> template<>
string string
TypeHandlerImpl<struct fd_set *>::GetParameterValue(Context &context, Parameter *, TypeHandlerImpl<fd_set *>::GetParameterValue(Context &context, Parameter *,
const void *address) const void *address)
{ {
void *data = *(void **)address; void *data = *(void **)address;
@ -102,7 +102,7 @@ TypeHandlerImpl<struct fd_set *>::GetParameterValue(Context &context, Parameter
template<> template<>
string string
TypeHandlerImpl<struct fd_set *>::GetReturnValue(Context &context, uint64 value) TypeHandlerImpl<fd_set *>::GetReturnValue(Context &context, uint64 value)
{ {
return context.FormatPointer((void *)value); return context.FormatPointer((void *)value);
} }
@ -120,7 +120,7 @@ format_pointer_value(Context &context, void *address)
} }
static string static string
get_ipv4_address(struct in_addr *addr) get_ipv4_address(in_addr *addr)
{ {
char tmp[32]; char tmp[32];
snprintf(tmp, sizeof(tmp), "%u.%u.%u.%u", snprintf(tmp, sizeof(tmp), "%u.%u.%u.%u",
@ -196,7 +196,7 @@ format_pointer(Context &context, sockaddr *saddr)
{ {
string r; string r;
struct sockaddr_in *sin = (struct sockaddr_in *)saddr; sockaddr_in *sin = (sockaddr_in *)saddr;
r = format_socket_family(context, saddr->sa_family) + ", "; r = format_socket_family(context, saddr->sa_family) + ", ";
@ -220,7 +220,7 @@ format_pointer(Context &context, sockaddr_args *args)
{ {
string r; string r;
r = "addr = " + format_pointer_value<struct sockaddr>(context, args->address); r = "addr = " + format_pointer_value<sockaddr>(context, args->address);
r += ", len = " + context.FormatUnsigned(args->address_length); r += ", len = " + context.FormatUnsigned(args->address_length);
return r; return r;
@ -234,7 +234,7 @@ format_pointer(Context &context, transfer_args *args)
r = "data = " + context.FormatPointer(args->data); r = "data = " + context.FormatPointer(args->data);
r += ", len = " + context.FormatUnsigned(args->data_length); r += ", len = " + context.FormatUnsigned(args->data_length);
r += ", flags = " + context.FormatFlags(args->flags); r += ", flags = " + context.FormatFlags(args->flags);
r += ", addr = " + format_pointer_value<struct sockaddr>(context, args->address); r += ", addr = " + format_pointer_value<sockaddr>(context, args->address);
return r; return r;
} }
@ -370,7 +370,7 @@ format_pointer(Context &context, socket_args *args)
} }
static string static string
get_iovec(Context &context, struct iovec *iov, int iovlen) get_iovec(Context &context, iovec *iov, int iovlen)
{ {
string r = "{"; string r = "{";
r += context.FormatPointer(iov); r += context.FormatPointer(iov);
@ -383,7 +383,7 @@ format_pointer(Context &context, msghdr *h)
{ {
string r; string r;
r = "name = " + format_pointer_value<struct sockaddr>(context, h->msg_name); r = "name = " + format_pointer_value<sockaddr>(context, h->msg_name);
r += ", name_len = " + context.FormatUnsigned(h->msg_namelen); r += ", name_len = " + context.FormatUnsigned(h->msg_namelen);
r += ", iov = " + get_iovec(context, h->msg_iov, h->msg_iovlen); r += ", iov = " + get_iovec(context, h->msg_iov, h->msg_iovlen);
r += ", control = " + context.FormatPointer(h->msg_control); r += ", control = " + context.FormatPointer(h->msg_control);
@ -473,11 +473,11 @@ class SpecializedPointerTypeHandler : public TypeHandler {
return new SpecializedPointerTypeHandler<type>(); \ return new SpecializedPointerTypeHandler<type>(); \
} }
DEFINE_TYPE(fdset_ptr, struct fd_set *); DEFINE_TYPE(fdset_ptr, fd_set *);
POINTER_TYPE(sockaddr_args_ptr, struct sockaddr_args); POINTER_TYPE(sockaddr_args_ptr, sockaddr_args);
POINTER_TYPE(transfer_args_ptr, struct transfer_args); POINTER_TYPE(transfer_args_ptr, transfer_args);
POINTER_TYPE(sockopt_args_ptr, struct sockopt_args); POINTER_TYPE(sockopt_args_ptr, sockopt_args);
POINTER_TYPE(socket_args_ptr, struct socket_args); POINTER_TYPE(socket_args_ptr, socket_args);
POINTER_TYPE(msghdr_ptr, struct msghdr); POINTER_TYPE(msghdr_ptr, msghdr);
POINTER_TYPE(ifreq_ptr, struct ifreq); POINTER_TYPE(ifreq_ptr, ifreq);
POINTER_TYPE(ifconf_ptr, struct ifconf); POINTER_TYPE(ifconf_ptr, ifconf);

22
src/bin/strace/TypeHandler.h
View File

@ -97,13 +97,21 @@ struct TypeHandlerFactory<const char*> {
} \ } \
} \ } \
DEFINE_FACTORY(fdset_ptr, struct fd_set *); struct fd_set;
DEFINE_FACTORY(sockaddr_args_ptr, struct sockaddr_args *); struct ifconf;
DEFINE_FACTORY(transfer_args_ptr, struct transfer_args *); struct ifreq;
DEFINE_FACTORY(sockopt_args_ptr, struct sockopt_args *); struct sockaddr_args;
DEFINE_FACTORY(socket_args_ptr, struct socket_args *); struct socket_args;
DEFINE_FACTORY(ifreq_ptr, struct ifreq *); struct sockopt_args;
DEFINE_FACTORY(ifconf_ptr, struct ifconf *); struct transfer_args;
DEFINE_FACTORY(fdset_ptr, fd_set *);
DEFINE_FACTORY(sockaddr_args_ptr, sockaddr_args *);
DEFINE_FACTORY(transfer_args_ptr, transfer_args *);
DEFINE_FACTORY(sockopt_args_ptr, sockopt_args *);
DEFINE_FACTORY(socket_args_ptr, socket_args *);
DEFINE_FACTORY(ifreq_ptr, ifreq *);
DEFINE_FACTORY(ifconf_ptr, ifconf *);
DEFINE_FACTORY(int_ptr, int *); DEFINE_FACTORY(int_ptr, int *);
DEFINE_FACTORY(long_ptr, long *); DEFINE_FACTORY(long_ptr, long *);