Skip to content

Fix casts with const pointers #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simonwagner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix casts with const pointers #3

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
2 changes: 1 addition & 1 deletion hellow_minimal_irt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static void __libnacl_mandatory_irt_query(const char *interface,
sizeof(__libnacl_irt_##name))

void _start(uint32_t *info) {
Elf32_auxv_t *auxv = nacl_startup_auxv(info);
const Elf32_auxv_t *auxv = nacl_startup_auxv(info);
grok_auxv(auxv);
DO_QUERY(NACL_IRT_BASIC_v0_1, basic);
DO_QUERY(NACL_IRT_FDIO_v0_1, fdio);
Expand Down
12 changes: 6 additions & 6 deletions nacl_irt_interfaces.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,21 +100,21 @@ static inline int nacl_startup_argc(const uint32_t info[]) {
return info[NACL_STARTUP_ARGC];
}

static inline char **nacl_startup_argv(const uint32_t *info) {
return (char **) &info[NACL_STARTUP_ARGV];
static inline char* const *nacl_startup_argv(const uint32_t *info) {
return (char* const*) &info[NACL_STARTUP_ARGV];
}

static inline int nacl_startup_envc(const uint32_t info[]) {
return info[NACL_STARTUP_ENVC];
}

static inline char **nacl_startup_envp(const uint32_t *info) {
static inline char* const *nacl_startup_envp(const uint32_t *info) {
return &nacl_startup_argv(info)[nacl_startup_argc(info) + 1];
}

static inline Elf32_auxv_t *nacl_startup_auxv(const uint32_t *info) {
char **envend = &nacl_startup_envp(info)[nacl_startup_envc(info) + 1];
return (Elf32_auxv_t *) envend;
static inline const Elf32_auxv_t *nacl_startup_auxv(const uint32_t *info) {
char* const* envend = &nacl_startup_envp(info)[nacl_startup_envc(info) + 1];
return (const Elf32_auxv_t *) envend;
}

#endif