Skip to content

Commit 360878a

Browse files
committed
The field 'sa_family' usually comes before 'sa_data' for struct sockaddr
* So list it in that order.
1 parent 654041a commit 360878a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

lib/truffle/socket/truffle/foreign/sockaddr.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module Truffle
2828
module Socket
2929
module Foreign
3030
class Sockaddr < Truffle::FFI::Struct
31-
config('platform.sockaddr', :sa_data, :sa_family)
31+
config('platform.sockaddr', :sa_family, :sa_data)
3232

3333
SA_FAMILY_T = Truffle::Config['platform.typedef.sa_family_t'].to_sym
3434
SA_FAMILY_OFFSET = Truffle::Config['platform.sockaddr.sa_family.offset']
@@ -44,14 +44,14 @@ def self.family_of_string(str)
4444
end
4545
end
4646

47-
def data
48-
self[:sa_data]
49-
end
50-
5147
def family
5248
self[:sa_family]
5349
end
5450

51+
def data
52+
self[:sa_data]
53+
end
54+
5555
def to_s
5656
pointer.read_string(self.class.size)
5757
end

tool/generate-native-config.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,8 +454,8 @@ def constants(name)
454454

455455
struct 'sockaddr' do |s|
456456
s.include 'sys/socket.h'
457-
s.field :sa_data, :char_array
458457
s.field :sa_family, :sa_family_t
458+
s.field :sa_data, :char_array
459459
end
460460

461461
struct 'sockaddr_in' do |s|

0 commit comments

Comments
 (0)