sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-04-16 03:00:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

[x86_64] Fix assorted 64-bit compilation errors and warnings

Browse Source 
Remove various 32-bit assumptions scattered throughout the codebase.
The code is still not necessarily 64-bit clean, but will at least
compile.
This commit is contained in:
Michael Brown
2008-11-19 19:33:05 +00:00
parent 7d36a1b7b0
commit 0ebbbb95fa
16 changed files with 88 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/tcp.c
+6 -5
View File
@@ -483,7 +483,7 @@ static int tcp_xmit ( struct tcp_connection *tcp, int force_send ) {
tcphdr->csum = tcpip_chksum ( iobuf->data, iob_len ( iobuf ) );
/* Dump header */
DBGC ( tcp, "TCP %p TX %d->%d %08x..%08x %08x %4zd",
DBGC ( tcp, "TCP %p TX %d->%d %08x..%08zx %08x %4zd",
tcp, ntohs ( tcphdr->src ), ntohs ( tcphdr->dest ),
ntohl ( tcphdr->seq ), ( ntohl ( tcphdr->seq ) + seq_len ),
ntohl ( tcphdr->ack ), len );
@@ -702,7 +702,7 @@ static int tcp_rx_ack ( struct tcp_connection *tcp, uint32_t ack,
/* Ignore duplicate or out-of-range ACK */
if ( ack_len > tcp->snd_sent ) {
DBGC ( tcp, "TCP %p received ACK for [%08x,%08x), "
DBGC ( tcp, "TCP %p received ACK for [%08x,%08zx), "
"sent only [%08x,%08x)\n", tcp, tcp->snd_seq,
( tcp->snd_seq + ack_len ), tcp->snd_seq,
( tcp->snd_seq + tcp->snd_sent ) );
@@ -894,7 +894,7 @@ static int tcp_rx ( struct io_buffer *iobuf,
len = iob_len ( iobuf );
/* Dump header */
DBGC ( tcp, "TCP %p RX %d<-%d %08x %08x..%08x %4zd",
DBGC ( tcp, "TCP %p RX %d<-%d %08x %08x..%08zx %4zd",
tcp, ntohs ( tcphdr->dest ), ntohs ( tcphdr->src ),
ntohl ( tcphdr->ack ), ntohl ( tcphdr->seq ),
( ntohl ( tcphdr->seq ) + len +
@@ -1070,12 +1070,13 @@ static struct xfer_interface_operations tcp_xfer_operations = {
/** TCP socket opener */
struct socket_opener tcp_socket_opener __socket_opener = {
.semantics = SOCK_STREAM,
.semantics = TCP_SOCK_STREAM,
.family = AF_INET,
.open = tcp_open,
};
char TCP_SOCK_STREAM[1];
/** Linkage hack */
int tcp_sock_stream = TCP_SOCK_STREAM;
/**
* Open TCP URI
src/net/udp.c
+3 -2
View File
@@ -438,12 +438,13 @@ static struct xfer_interface_operations udp_xfer_operations = {
/** UDP socket opener */
struct socket_opener udp_socket_opener __socket_opener = {
.semantics = SOCK_DGRAM,
.semantics = UDP_SOCK_DGRAM,
.family = AF_INET,
.open = udp_open,
};
char UDP_SOCK_DGRAM[1];
/** Linkage hack */
int udp_sock_dgram = UDP_SOCK_DGRAM;
/**
* Open UDP URI
src/net/udp/slam.c
+2 -2
View File
@@ -219,7 +219,7 @@ static int slam_put_value ( struct slam_request *slam,
*/
len = ( ( flsl ( value ) + 10 ) / 8 );
if ( len >= iob_tailroom ( iobuf ) ) {
DBGC2 ( slam, "SLAM %p cannot add %d-byte value\n",
DBGC2 ( slam, "SLAM %p cannot add %zd-byte value\n",
slam, len );
return -ENOBUFS;
}
@@ -380,7 +380,7 @@ static int slam_pull_value ( struct slam_request *slam,
len = ( *data >> 5 );
if ( ( len == 0 ) ||
( value && ( len > sizeof ( *value ) ) ) ) {
DBGC ( slam, "SLAM %p invalid value length %d bytes\n",
DBGC ( slam, "SLAM %p invalid value length %zd bytes\n",
slam, len );
return -EINVAL;
}