Skip to content

Commit

Permalink
net.conv: rename functions to match other langs, making them easier t… (
Browse files Browse the repository at this point in the history 
vlang#18937)
  • Loading branch information
@JalonSolov
JalonSolov authored Jul 22, 2023
1 parent bf00ac6 commit c3ff4b2
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 59 deletions.
12 changes: 6 additions & 6 deletions vlib/db/pg/orm.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,21 +112,21 @@ fn pg_stmt_match(mut types []u32, mut vals []&char, mut lens []int, mut formats
}
u16 {
types << u32(Oid.t_int2)
num := conv.htn16(data)
num := conv.hton16(data)
vals << &char(&num)
lens << int(sizeof(u16))
formats << 1
}
u32 {
types << u32(Oid.t_int4)
num := conv.htn32(data)
num := conv.hton32(data)
vals << &char(&num)
lens << int(sizeof(u32))
formats << 1
}
u64 {
types << u32(Oid.t_int8)
num := conv.htn64(data)
num := conv.hton64(data)
vals << &char(&num)
lens << int(sizeof(u64))
formats << 1
Expand All @@ -139,21 +139,21 @@ fn pg_stmt_match(mut types []u32, mut vals []&char, mut lens []int, mut formats
}
i16 {
types << u32(Oid.t_int2)
num := conv.htn16(u16(data))
num := conv.hton16(u16(data))
vals << &char(&num)
lens << int(sizeof(i16))
formats << 1
}
int {
types << u32(Oid.t_int4)
num := conv.htn32(u32(data))
num := conv.hton32(u32(data))
vals << &char(&num)
lens << int(sizeof(int))
formats << 1
}
i64 {
types << u32(Oid.t_int8)
num := conv.htn64(u64(data))
num := conv.hton64(u64(data))
vals << &char(&num)
lens << int(sizeof(i64))
formats << 1
Expand Down
94 changes: 65 additions & 29 deletions vlib/net/conv/conv.v
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,102 @@
module conv

// htn64 converts a the 64 bit value `host` to the net format (htonll)
// htn64 - DON'T USE, use hton64 instead
[deprecated: 'use hton64() instead']
[deprecated_after: '2023-12-31']
pub fn htn64(host u64) u64 {
return hton64(host)
}

// hton64 converts the 64 bit value `host` to the net format (htonll)
pub fn hton64(host u64) u64 {
$if little_endian {
// vfmt off
return (
((host >> 56) & 0x00000000_000000FF) |
((host >> 40) & 0x00000000_0000FF00) |
((host >> 24) & 0x00000000_00FF0000) |
((host >> 8) & 0x00000000_FF000000) |
((host << 8) & 0x000000FF_00000000) |
((host << 24) & 0x0000FF00_00000000) |
((host << 40) & 0x00FF0000_00000000) |
((host << 56) & 0xFF000000_00000000)
)
return ((host >> 56) & 0x00000000_000000FF) |
((host >> 40) & 0x00000000_0000FF00) |
((host >> 24) & 0x00000000_00FF0000) |
((host >> 8) & 0x00000000_FF000000) |
((host << 8) & 0x000000FF_00000000) |
((host << 24) & 0x0000FF00_00000000) |
((host << 40) & 0x00FF0000_00000000) |
((host << 56) & 0xFF000000_00000000)
// vfmt on
} $else {
return host
}
}

// htn32 converts the 32 bit value `host` to the net format (htonl)
// htn32 - DON'T USE, use hton32 instead
[deprecated: 'use hton32() instead']
[deprecated_after: '2023-12-31']
pub fn htn32(host u32) u32 {
return hton32(host)
}

// hton32 converts the 32 bit value `host` to the net format (htonl)
pub fn hton32(host u32) u32 {
$if little_endian {
// vfmt off
return (
((host >> 24) & 0x0000_00FF) |
((host >> 8) & 0x0000_FF00) |
((host << 8) & 0x00FF_0000) |
((host << 24) & 0xFF00_0000)
)
return ((host >> 24) & 0x0000_00FF) |
((host >> 8) & 0x0000_FF00) |
((host << 8) & 0x00FF_0000) |
((host << 24) & 0xFF00_0000)
// vfmt on
} $else {
return host
}
}

// htn16 converts the 16 bit value `host` to the net format (htons)
// htn16 - DON'T USE, use hton16 instead
[deprecated: 'use hton16() instead']
[deprecated_after: '2023-12-31']
pub fn htn16(host u16) u16 {
return hton16(host)
}

// hton16 converts the 16 bit value `host` to the net format (htons)
pub fn hton16(host u16) u16 {
$if little_endian {
// vfmt off
return (
((host >> 8) & 0x00FF) |
((host << 8) & 0xFF00)
)
return ((host >> 8) & 0x00FF) |
((host << 8) & 0xFF00)
// vfmt on
} $else {
return host
}
}

// nth64 converts the 64 bit value `net` to the host format (ntohll)
// nth64 - DON'T USE, use ntoh64 instead
[deprecated: 'use ntoh64() instead']
[deprecated_after: '2023-12-31']
pub fn nth64(net u64) u64 {
return htn64(net)
return ntoh64(net)
}

// nth32 converts the 32 bit value `net` to the host format (ntohl)
// ntoh64 converts the 64 bit value `net` to the host format (ntohll)
pub fn ntoh64(net u64) u64 {
return hton64(net)
}

// nth32 - DON'T USE, use ntoh32 instead
[deprecated: 'use ntoh32() instead']
[deprecated_after: '2023-12-31']
pub fn nth32(net u32) u32 {
return htn32(net)
return ntoh32(net)
}

// ntoh32 converts the 32 bit value `net` to the host format (ntohl)
pub fn ntoh32(net u32) u32 {
return hton32(net)
}

// nth16 converts the 16 bit value `net` to the host format (ntohs)
// nth16 - DON'T USE, use ntoh16 instead
[deprecated: 'use ntoh16() instead']
[deprecated_after: '2023-12-31']
pub fn nth16(net u16) u16 {
return htn16(net)
return ntoh16(net)
}

// ntoh16 converts the 16 bit value `net` to the host format (ntohs)
pub fn ntoh16(net u16) u16 {
return hton16(net)
}
36 changes: 18 additions & 18 deletions vlib/net/conv/conv_test.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,32 @@ fn check[T](f fn (a T) T, finv fn (b T) T, x T) {
}
}

fn test_htn64_nth64() {
assert 0 == conv.htn64(0)
assert 0 == conv.nth64(0)
assert 0xFFFF_FFFF_FFFF_FFFF == conv.nth64(0xFFFF_FFFF_FFFF_FFFF)
assert 0xFFFF_FFFF_FFFF_FFFF == conv.htn64(0xFFFF_FFFF_FFFF_FFFF)
fn test_hton64_ntoh64() {
assert 0 == conv.hton64(0)
assert 0 == conv.ntoh64(0)
assert 0xFFFF_FFFF_FFFF_FFFF == conv.ntoh64(0xFFFF_FFFF_FFFF_FFFF)
assert 0xFFFF_FFFF_FFFF_FFFF == conv.hton64(0xFFFF_FFFF_FFFF_FFFF)
for x in [u64(1), 2, 128, 65536, 2147483648] {
check(conv.htn64, conv.nth64, x)
check(conv.hton64, conv.ntoh64, x)
}
}

fn test_htn32_nth32() {
assert 0 == conv.htn32(0)
assert 0 == conv.nth32(0)
assert 0xFFFF_FFFF == conv.nth32(0xFFFF_FFFF)
assert 0x0101_0101 == conv.htn32(0x0101_0101)
fn test_hton32_ntoh32() {
assert 0 == conv.hton32(0)
assert 0 == conv.ntoh32(0)
assert 0xFFFF_FFFF == conv.ntoh32(0xFFFF_FFFF)
assert 0x0101_0101 == conv.hton32(0x0101_0101)
for x in [u32(1), 2, 128, 65536, 2147483648] {
check(conv.htn32, conv.nth32, x)
check(conv.hton32, conv.ntoh32, x)
}
}

fn test_htn16_nth16() {
assert 0 == conv.htn16(0)
assert 0 == conv.nth16(0)
assert 0xFFFF == conv.nth16(0xFFFF)
assert 0x0101 == conv.htn16(0x0101)
fn test_hton16_ntoh16() {
assert 0 == conv.hton16(0)
assert 0 == conv.ntoh16(0)
assert 0xFFFF == conv.ntoh16(0xFFFF)
assert 0x0101 == conv.hton16(0x0101)
for x in [u16(1), 2, 128, 65534] {
check(conv.htn16, conv.nth16, x)
check(conv.hton16, conv.ntoh16, x)
}
}
12 changes: 6 additions & 6 deletions vlib/pg/orm.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,21 +105,21 @@ fn pg_stmt_match(mut types []u32, mut vals []&char, mut lens []int, mut formats
}
u16 {
types << u32(Oid.t_int2)
num := conv.htn16(data)
num := conv.hton16(data)
vals << &char(&num)
lens << int(sizeof(u16))
formats << 1
}
u32 {
types << u32(Oid.t_int4)
num := conv.htn32(data)
num := conv.hton32(data)
vals << &char(&num)
lens << int(sizeof(u32))
formats << 1
}
u64 {
types << u32(Oid.t_int8)
num := conv.htn64(data)
num := conv.hton64(data)
vals << &char(&num)
lens << int(sizeof(u64))
formats << 1
Expand All @@ -132,21 +132,21 @@ fn pg_stmt_match(mut types []u32, mut vals []&char, mut lens []int, mut formats
}
i16 {
types << u32(Oid.t_int2)
num := conv.htn16(u16(data))
num := conv.hton16(u16(data))
vals << &char(&num)
lens << int(sizeof(i16))
formats << 1
}
int {
types << u32(Oid.t_int4)
num := conv.htn32(u32(data))
num := conv.hton32(u32(data))
vals << &char(&num)
lens << int(sizeof(int))
formats << 1
}
i64 {
types << u32(Oid.t_int8)
num := conv.htn64(u64(data))
num := conv.hton64(u64(data))
vals << &char(&num)
lens << int(sizeof(i64))
formats << 1
Expand Down

0 comments on commit c3ff4b2

Please sign in to comment.