Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.
/ druntime Public archive

Replace in with const scope for src/core/sys/posix/arpa|net|netinet #2698

Merged
dlang-bot merged 1 commit into from
Jul 26, 2019
Merged

Replace in with const scope for src/core/sys/posix/arpa|net|netinet #2698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions src/core/sys/posix/arpa/inet.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ uint16_t htons(uint16_t);
uint32_t ntohl(uint32_t);
uint16_t ntohs(uint16_t);

in_addr_t inet_addr(in char*);
in_addr_t inet_addr(const scope char*);
char* inet_ntoa(in_addr);
// per spec: const char* inet_ntop(int, const void*, char*, socklen_t);
char* inet_ntop(int, in void*, char*, socklen_t);
int inet_pton(int, in char*, void*);
char* inet_ntop(int, const scope void*, char*, socklen_t);
int inet_pton(int, const scope char*, void*);
*/

version (CRuntime_Glibc)
Expand All @@ -78,10 +78,10 @@ version (CRuntime_Glibc)
uint16_t ntohs(uint16_t);
}

in_addr_t inet_addr(in char*);
in_addr_t inet_addr(const scope char*);
char* inet_ntoa(in_addr);
const(char)* inet_ntop(int, in void*, char*, socklen_t);
int inet_pton(int, in char*, void*);
const(char)* inet_ntop(int, const scope void*, char*, socklen_t);
int inet_pton(int, const scope char*, void*);
}
else version (Darwin)
{
Expand All @@ -103,10 +103,10 @@ else version (Darwin)
uint16_t ntohs(uint16_t);
}

in_addr_t inet_addr(in char*);
in_addr_t inet_addr(const scope char*);
char* inet_ntoa(in_addr);
const(char)* inet_ntop(int, in void*, char*, socklen_t);
int inet_pton(int, in char*, void*);
const(char)* inet_ntop(int, const scope void*, char*, socklen_t);
int inet_pton(int, const scope char*, void*);
}
else version (FreeBSD)
{
Expand All @@ -128,10 +128,10 @@ else version (FreeBSD)
uint16_t ntohs(uint16_t);
}

in_addr_t inet_addr(in char*);
in_addr_t inet_addr(const scope char*);
char* inet_ntoa(in_addr);
const(char)* inet_ntop(int, in void*, char*, socklen_t);
int inet_pton(int, in char*, void*);
const(char)* inet_ntop(int, const scope void*, char*, socklen_t);
int inet_pton(int, const scope char*, void*);
}
else version (NetBSD)
{
Expand All @@ -153,10 +153,10 @@ else version (NetBSD)
uint16_t ntohs(uint16_t);
}

in_addr_t inet_addr(in char*);
in_addr_t inet_addr(const scope char*);
char* inet_ntoa(in_addr);
const(char)* inet_ntop(int, in void*, char*, socklen_t);
int inet_pton(int, in char*, void*);
const(char)* inet_ntop(int, const scope void*, char*, socklen_t);
int inet_pton(int, const scope char*, void*);
}
else version (OpenBSD)
{
Expand Down Expand Up @@ -194,10 +194,10 @@ else version (OpenBSD)
uint16_t ntohs(uint16_t x) { return __swap16(x); }
}

in_addr_t inet_addr(in char*);
in_addr_t inet_addr(const scope char*);
char* inet_ntoa(in_addr);
const(char)* inet_ntop(int, in void*, char*, socklen_t);
int inet_pton(int, in char*, void*);
const(char)* inet_ntop(int, const scope void*, char*, socklen_t);
int inet_pton(int, const scope char*, void*);
}
else version (DragonFlyBSD)
{
Expand All @@ -219,10 +219,10 @@ else version (DragonFlyBSD)
uint16_t ntohs(uint16_t);
}

in_addr_t inet_addr(in char*);
in_addr_t inet_addr(const scope char*);
char* inet_ntoa(in_addr);
const(char)* inet_ntop(int, in void*, char*, socklen_t);
int inet_pton(int, in char*, void*);
const(char)* inet_ntop(int, const scope void*, char*, socklen_t);
int inet_pton(int, const scope char*, void*);
}
else version (Solaris)
{
Expand All @@ -243,10 +243,10 @@ else version (Solaris)
uint16_t ntohs(uint16_t);
}

in_addr_t inet_addr(in char*);
in_addr_t inet_addr(const scope char*);
char* inet_ntoa(in_addr);
const(char)* inet_ntop(int, in void*, char*, socklen_t);
int inet_pton(int, in char*, void*);
const(char)* inet_ntop(int, const scope void*, char*, socklen_t);
int inet_pton(int, const scope char*, void*);
}
else version (CRuntime_Bionic)
{
Expand Down Expand Up @@ -283,10 +283,10 @@ else version (CRuntime_Bionic)
uint16_t ntohs(uint16_t x) { return __swap16(x); }
}

in_addr_t inet_addr(in char*);
in_addr_t inet_addr(const scope char*);
char* inet_ntoa(in_addr);
const(char)* inet_ntop(int, in void*, char*, size_t);
int inet_pton(int, in char*, void*);
const(char)* inet_ntop(int, const scope void*, char*, size_t);
int inet_pton(int, const scope char*, void*);
}
else version (CRuntime_Musl)
{
Expand All @@ -308,10 +308,10 @@ else version (CRuntime_Musl)
uint16_t ntohs(uint16_t);
}

in_addr_t inet_addr(in char*);
in_addr_t inet_addr(const scope char*);
char* inet_ntoa(in_addr);
const(char)* inet_ntop(int, in void*, char*, socklen_t);
int inet_pton(int, in char*, void*);
const(char)* inet_ntop(int, const scope void*, char*, socklen_t);
int inet_pton(int, const scope char*, void*);
}
else version (CRuntime_UClibc)
{
Expand All @@ -333,10 +333,10 @@ else version (CRuntime_UClibc)
uint16_t ntohs(uint16_t);
}

in_addr_t inet_addr(in char*);
in_addr_t inet_addr(const scope char*);
char* inet_ntoa(in_addr);
const(char)* inet_ntop(int, in void*, char*, socklen_t);
int inet_pton(int, in char*, void*);
const(char)* inet_ntop(int, const scope void*, char*, socklen_t);
int inet_pton(int, const scope char*, void*);
}

//
Expand Down
18 changes: 9 additions & 9 deletions src/core/sys/posix/net/if_.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct if_nameindex // renamed to if_nameindex_t

IF_NAMESIZE

uint if_nametoindex(in char*);
uint if_nametoindex(const scope char*);
char* if_indextoname(uint, char*);
if_nameindex_t* if_nameindex();
void if_freenameindex(if_nameindex_t*);
Expand All @@ -56,7 +56,7 @@ version (CRuntime_Glibc)

enum IF_NAMESIZE = 16;

uint if_nametoindex(in char*);
uint if_nametoindex(const scope char*);
char* if_indextoname(uint, char*);
if_nameindex_t* if_nameindex();
void if_freenameindex(if_nameindex_t*);
Expand All @@ -71,7 +71,7 @@ else version (Darwin)

enum IF_NAMESIZE = 16;

uint if_nametoindex(in char*);
uint if_nametoindex(const scope char*);
char* if_indextoname(uint, char*);
if_nameindex_t* if_nameindex();
void if_freenameindex(if_nameindex_t*);
Expand All @@ -86,7 +86,7 @@ else version (FreeBSD)

enum IF_NAMESIZE = 16;

uint if_nametoindex(in char*);
uint if_nametoindex(const scope char*);
char* if_indextoname(uint, char*);
if_nameindex_t* if_nameindex();
void if_freenameindex(if_nameindex_t*);
Expand All @@ -101,7 +101,7 @@ else version (NetBSD)

enum IF_NAMESIZE = 16;

uint if_nametoindex(in char*);
uint if_nametoindex(const scope char*);
char* if_indextoname(uint, char*);
if_nameindex_t* if_nameindex();
void if_freenameindex(if_nameindex_t*);
Expand All @@ -116,7 +116,7 @@ else version (OpenBSD)

enum IF_NAMESIZE = 16;

uint if_nametoindex(in char*);
uint if_nametoindex(const scope char*);
char* if_indextoname(uint, char*);
if_nameindex_t* if_nameindex();
void if_freenameindex(if_nameindex_t*);
Expand All @@ -131,7 +131,7 @@ else version (DragonFlyBSD)

enum IF_NAMESIZE = 16;

uint if_nametoindex(in char*);
uint if_nametoindex(const scope char*);
char* if_indextoname(uint, char*);
if_nameindex_t* if_nameindex();
void if_freenameindex(if_nameindex_t*);
Expand All @@ -140,7 +140,7 @@ else version (CRuntime_Bionic)
{
enum IF_NAMESIZE = 16;

uint if_nametoindex(in char*);
uint if_nametoindex(const scope char*);
char* if_indextoname(uint, char*);
}
else version (CRuntime_UClibc)
Expand All @@ -153,7 +153,7 @@ else version (CRuntime_UClibc)

enum IF_NAMESIZE = 16;

uint if_nametoindex(in char*);
uint if_nametoindex(const scope char*);
char* if_indextoname(uint, char*);
if_nameindex_t* if_nameindex();
void if_freenameindex(if_nameindex_t*);
Expand Down
Loading