Skip to content

Fix #1566, correct const pointer returns #1567

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
jphickey wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix #1566, correct const pointer returns #1567

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 src/os/shared/src/osapi-filesys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ int32 OS_TranslatePath(const char *VirtualPath, char *LocalPath)
OS_object_token_t token;
int32 return_code;
const char *name_ptr;
char *result;
const char *result;
OS_filesys_internal_record_t *filesys;
size_t SysMountPointLen;
size_t VirtPathLen;
Expand Down
28 changes: 14 additions & 14 deletions src/unit-test-coverage/ut-stubs/inc/OCS_string.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@
/* prototypes normally declared in string.h */
/* ----------------------------------------- */

extern void *OCS_memchr(const void *s, int c, size_t n);
extern void *OCS_memcpy(void *dest, const void *src, size_t n);
extern void *OCS_memset(void *s, int c, size_t n);
extern int OCS_strcmp(const char *s1, const char *s2);
extern char *OCS_strcpy(char *dest, const char *src);
extern size_t OCS_strlen(const char *s);
extern int OCS_strncmp(const char *s1, const char *s2, size_t n);
extern char *OCS_strncpy(char *dest, const char *src, size_t n);
extern char *OCS_strchr(const char *s, int c);
extern char *OCS_strrchr(const char *s, int c);
extern char *OCS_strstr(const char *haystack, const char *needle);
extern char *OCS_strcat(char *dest, const char *src);
extern char *OCS_strncat(char *dest, const char *src, size_t n);
extern char *OCS_strerror(int errnum);
extern const void *OCS_memchr(const void *s, int c, size_t n);
extern void *OCS_memcpy(void *dest, const void *src, size_t n);
extern void *OCS_memset(void *s, int c, size_t n);
extern int OCS_strcmp(const char *s1, const char *s2);
extern char *OCS_strcpy(char *dest, const char *src);
extern size_t OCS_strlen(const char *s);
extern int OCS_strncmp(const char *s1, const char *s2, size_t n);
extern char *OCS_strncpy(char *dest, const char *src, size_t n);
extern const char *OCS_strchr(const char *s, int c);
extern const char *OCS_strstr(const char *haystack, const char *needle);
extern const char *OCS_strrchr(const char *s, int c);
extern char *OCS_strcat(char *dest, const char *src);
extern char *OCS_strncat(char *dest, const char *src, size_t n);
extern char *OCS_strerror(int errnum);

#endif /* OCS_STRING_H */
14 changes: 7 additions & 7 deletions src/unit-test-coverage/ut-stubs/src/libc-string-stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ void *OCS_memset(void *s, int c, size_t n)
return Result;
}

void *OCS_memchr(const void *s, int c, size_t n)
const void *OCS_memchr(const void *s, int c, size_t n)
{
int32 Status;
void *Result;
int32 Status;
const void *Result;

Status = UT_DEFAULT_IMPL(OCS_memchr);
if (Status == 0)
Expand Down Expand Up @@ -80,7 +80,7 @@ void *OCS_memcpy(void *dest, const void *src, size_t n)
return Result;
}

char *OCS_strchr(const char *s, int c)
const char *OCS_strchr(const char *s, int c)
{
int32 Status;

Expand All @@ -99,7 +99,7 @@ char *OCS_strchr(const char *s, int c)
return (char *)&s[Status - 1];
}

char *OCS_strrchr(const char *s, int c)
const char *OCS_strrchr(const char *s, int c)
{
int32 Status;

Expand All @@ -115,10 +115,10 @@ char *OCS_strrchr(const char *s, int c)
return (char *)0;
}

return (char *)&s[Status - 1];
return (const char *)&s[Status - 1];
}

char *OCS_strstr(const char *haystack, const char *needle)
const char *OCS_strstr(const char *haystack, const char *needle)
{
int32 Status;

Expand Down
Loading